Make maxPendingRequests optional and disable preview aws-sdk-go (#383)

* Make maxPendingRequests optional and disable preview aws-sdk-go

* Fix integration test update scenarios race condition

Makefile

@@ -8,7 +8,7 @@ IMAGE ?= $(REPO):$(VERSION)
 CRD_OPTIONS ?= "crd:trivialVersions=true"
 
 # app mesh aws-sdk-go override in case we need to build against a custom version
-APPMESH_SDK_OVERRIDE ?= "y"
+APPMESH_SDK_OVERRIDE ?= "n"
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

apis/appmesh/v1beta2/types.go

@@ -129,7 +129,8 @@ type HTTPConnectionPool struct {
 	// Represents the number of overflowing requests after max_connections
 	// that an envoy will queue to an upstream cluster.
 	// +kubebuilder:validation:Minimum=1
-	MaxPendingRequests int64 `json:"maxPendingRequests"`
+	// +optional
+	MaxPendingRequests *int64 `json:"maxPendingRequests,omitempty"`
 }
 
 type HTTP2ConnectionPool struct {

config/crd/bases/appmesh.k8s.aws_virtualgateways.yaml

@@ -167,7 +167,6 @@ spec:
                             type: integer
                         required:
                         - maxConnections
-                        - maxPendingRequests
                         type: object
                       http2:
                         description: Specifies http2 connection pool settings for

config/crd/bases/appmesh.k8s.aws_virtualnodes.yaml

@@ -274,7 +274,6 @@ spec:
                             type: integer
                         required:
                         - maxConnections
-                        - maxPendingRequests
                         type: object
                       http2:
                         description: Specifies http2 connection pool settings for

go.mod

@@ -3,7 +3,7 @@ module github.com/aws/aws-app-mesh-controller-for-k8s
 go 1.13
 
 require (
-	github.com/aws/aws-sdk-go v1.33.5
+	github.com/aws/aws-sdk-go v1.35.22
 	github.com/evanphx/json-patch v4.5.0+incompatible
 	github.com/go-logr/logr v0.1.0
 	github.com/golang/mock v1.4.3

go.sum

@@ -57,9 +57,10 @@ github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:l
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 h1:zV3ejI06GQ59hwDQAvmK1qxOQGB3WuVTRoY0okPTAv0=
 github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
+github.com/aws/aws-sdk-go v1.15.11 h1:m45+Ru/wA+73cOZXiEGLDH2d9uLN3iHqMc0/z4noDXE=
 github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
-github.com/aws/aws-sdk-go v1.33.5 h1:p2fr1ryvNTU6avUWLI+/H7FGv0TBIjzVM5WDgXBBv4U=
-github.com/aws/aws-sdk-go v1.33.5/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
+github.com/aws/aws-sdk-go v1.35.22 h1:Do184JJHgque0dK/udq6MC14W4hCEGkjLDtzRjxLKGM=
+github.com/aws/aws-sdk-go v1.35.22/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
 github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
@@ -176,6 +177,7 @@ github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-ini/ini v1.25.4 h1:Mujh4R/dH6YL8bxuISne3xX2+qcQ9p0IxKAP6ExWoUo=
 github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -234,8 +236,6 @@ github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85n
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
 github.com/gobuffalo/envy v1.7.1 h1:OQl5ys5MBea7OGCdvPbBJWRgnhC/fGona6QKfvFeau8=
@@ -305,6 +305,7 @@ github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTV
 github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk=
 github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
 github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33 h1:893HsJqtxp9z1SF76gg6hY70hRY1wVlTSnC/h1yUDCo=
 github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
@@ -341,9 +342,12 @@ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7 h1:SMvOWPJCES2GdFracYbBQh93GXac8fq7HeN6JnpduB8=
 github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc=
-github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
+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=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
@@ -354,6 +358,7 @@ github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
 github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
@@ -523,7 +528,9 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=

pkg/conversions/virtualgateway_types_conversion.go

@@ -178,7 +178,7 @@ func Convert_CRD_VirtualGatewayPortMapping_To_SDK_VirtualGatewayPortMapping(crdO
 
 func Convert_CRD_VirtualGatewayHTTPConnectionPool_To_SDK_VirtualGatewayHttpConnectionPool(crdObj *appmesh.HTTPConnectionPool, sdkObj *appmeshsdk.VirtualGatewayHttpConnectionPool, scope conversion.Scope) error {
 	sdkObj.MaxConnections = aws.Int64(crdObj.MaxConnections)
-	sdkObj.MaxPendingRequests = aws.Int64(crdObj.MaxPendingRequests)
+	sdkObj.MaxPendingRequests = crdObj.MaxPendingRequests
 	return nil
 }
 

pkg/conversions/virtualgateway_types_conversion_test.go

@@ -970,7 +970,7 @@ func TestConvert_CRD_VirtualGatewayHTTPConnectionPool_To_SDK_VirtualGatewayHttpC
 			args: args{
 				crdObj: &appmesh.HTTPConnectionPool{
 					MaxConnections:     50,
-					MaxPendingRequests: 20,
+					MaxPendingRequests: aws.Int64(20),
 				},
 				sdkObj: &appmeshsdk.VirtualGatewayHttpConnectionPool{},
 				scope:  nil,
@@ -1090,7 +1090,7 @@ func TestConvert_CRD_VirtualGatewayConnectionPool_To_SDK_VirtualGatewayConnectio
 				crdObj: &appmesh.VirtualGatewayConnectionPool{
 					HTTP: &appmesh.HTTPConnectionPool{
 						MaxConnections:     50,
-						MaxPendingRequests: 40,
+						MaxPendingRequests: aws.Int64(40),
 					},
 				},
 				sdkObj: &appmeshsdk.VirtualGatewayConnectionPool{},
@@ -1185,7 +1185,7 @@ func TestConvert_CRD_VirtualGatewayListener_To_SDK_VirtualGatewayListener(t *tes
 					ConnectionPool: &appmesh.VirtualGatewayConnectionPool{
 						HTTP: &appmesh.HTTPConnectionPool{
 							MaxConnections:     50,
-							MaxPendingRequests: 40,
+							MaxPendingRequests: aws.Int64(40),
 						},
 					},
 					TLS: &appmesh.VirtualGatewayListenerTLS{
@@ -1242,7 +1242,7 @@ func TestConvert_CRD_VirtualGatewayListener_To_SDK_VirtualGatewayListener(t *tes
 					ConnectionPool: &appmesh.VirtualGatewayConnectionPool{
 						HTTP: &appmesh.HTTPConnectionPool{
 							MaxConnections:     50,
-							MaxPendingRequests: 40,
+							MaxPendingRequests: aws.Int64(40),
 						},
 					},
 					TLS: &appmesh.VirtualGatewayListenerTLS{
@@ -1299,7 +1299,7 @@ func TestConvert_CRD_VirtualGatewayListener_To_SDK_VirtualGatewayListener(t *tes
 					ConnectionPool: &appmesh.VirtualGatewayConnectionPool{
 						HTTP: &appmesh.HTTPConnectionPool{
 							MaxConnections:     50,
-							MaxPendingRequests: 40,
+							MaxPendingRequests: aws.Int64(40),
 						},
 					},
 					TLS: nil,

pkg/conversions/virtualnode_types_conversion.go

@@ -252,7 +252,7 @@ func Convert_CRD_VirtualNodeTCPConnectionPool_To_SDK_VirtualNodeTcpConnectionPoo
 
 func Convert_CRD_VirtualNodeHTTPConnectionPool_To_SDK_VirtualNodeHttpConnectionPool(crdObj *appmesh.HTTPConnectionPool, sdkObj *appmeshsdk.VirtualNodeHttpConnectionPool, scope conversion.Scope) error {
 	sdkObj.MaxConnections = aws.Int64(crdObj.MaxConnections)
-	sdkObj.MaxPendingRequests = aws.Int64(crdObj.MaxPendingRequests)
+	sdkObj.MaxPendingRequests = crdObj.MaxPendingRequests
 	return nil
 }
 

pkg/conversions/virtualnode_types_conversion_test.go

@@ -1422,7 +1422,7 @@ func TestConvert_CRD_VirtualNodeHTTPConnectionPool_To_SDK_VirtualNodeHttpConnect
 			args: args{
 				crdObj: &appmesh.HTTPConnectionPool{
 					MaxConnections:     50,
-					MaxPendingRequests: 20,
+					MaxPendingRequests: aws.Int64(20),
 				},
 				sdkObj: &appmeshsdk.VirtualNodeHttpConnectionPool{},
 				scope:  nil,
@@ -1432,6 +1432,33 @@ func TestConvert_CRD_VirtualNodeHTTPConnectionPool_To_SDK_VirtualNodeHttpConnect
 				MaxPendingRequests: aws.Int64(20),
 			},
 		},
+		{
+			name: "base with nil MaxPendingRequests",
+			args: args{
+				crdObj: &appmesh.HTTPConnectionPool{
+					MaxConnections:     50,
+					MaxPendingRequests: nil,
+				},
+				sdkObj: &appmeshsdk.VirtualNodeHttpConnectionPool{},
+				scope:  nil,
+			},
+			wantSDKObj: &appmeshsdk.VirtualNodeHttpConnectionPool{
+				MaxConnections: aws.Int64(50),
+			},
+		},
+		{
+			name: "base with missing MaxPendingRequests",
+			args: args{
+				crdObj: &appmesh.HTTPConnectionPool{
+					MaxConnections: 50,
+				},
+				sdkObj: &appmeshsdk.VirtualNodeHttpConnectionPool{},
+				scope:  nil,
+			},
+			wantSDKObj: &appmeshsdk.VirtualNodeHttpConnectionPool{
+				MaxConnections: aws.Int64(50),
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -1559,7 +1586,7 @@ func TestConvert_CRD_VirtualNodeConnectionPool_To_SDK_VirtualNodeConnectionPool(
 				crdObj: &appmesh.VirtualNodeConnectionPool{
 					HTTP: &appmesh.HTTPConnectionPool{
 						MaxConnections:     50,
-						MaxPendingRequests: 40,
+						MaxPendingRequests: aws.Int64(40),
 					},
 				},
 				sdkObj: &appmeshsdk.VirtualNodeConnectionPool{},
@@ -1666,7 +1693,7 @@ func TestConvert_CRD_Listener_To_SDK_Listener(t *testing.T) {
 					ConnectionPool: &appmesh.VirtualNodeConnectionPool{
 						HTTP: &appmesh.HTTPConnectionPool{
 							MaxConnections:     50,
-							MaxPendingRequests: 40,
+							MaxPendingRequests: aws.Int64(40),
 						},
 					},
 					TLS: &appmesh.ListenerTLS{
@@ -1838,7 +1865,7 @@ func TestConvert_CRD_Listener_To_SDK_Listener(t *testing.T) {
 					ConnectionPool: &appmesh.VirtualNodeConnectionPool{
 						HTTP: &appmesh.HTTPConnectionPool{
 							MaxConnections:     50,
-							MaxPendingRequests: 40,
+							MaxPendingRequests: aws.Int64(40),
 						},
 					},
 					TLS: nil,

scripts/test-with-kind.sh

@@ -122,6 +122,8 @@ sleep 15
 
 # Run integration tests
 run_integration_test mesh
+run_integration_test virtualnode
 run_integration_test virtualservice
 run_integration_test virtualrouter
+run_integration_test virtualgateway
 run_integration_test gatewayroute

test/integration/gatewayroute/gatewayroute.go

@@ -35,18 +35,17 @@ func (m *GatewayRouteTest) Create(ctx context.Context, f *framework.Framework, g
 	return nil
 }
 
-func (m *GatewayRouteTest) Update(ctx context.Context, f *framework.Framework, newGR *appmesh.GatewayRoute, gr *appmesh.GatewayRoute) (*appmesh.GatewayRoute, error) {
+func (m *GatewayRouteTest) Update(ctx context.Context, f *framework.Framework, newGR *appmesh.GatewayRoute, gr *appmesh.GatewayRoute) error {
 	err := f.K8sClient.Patch(ctx, newGR, client.MergeFrom(gr))
 	if err != nil {
-		return nil, err
+		return err
 	}
-	updatedGR, err := f.GRManager.WaitUntilGatewayRouteActive(ctx, newGR)
+	_, err = f.GRManager.WaitUntilGatewayRouteActive(ctx, newGR)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	m.GatewayRoutes[gr.Name] = updatedGR
-	return updatedGR, nil
+	return nil
 }
 
 func (m *GatewayRouteTest) Cleanup(ctx context.Context, f *framework.Framework) {

test/integration/gatewayroute/gatewayroute_test.go

@@ -295,10 +295,10 @@ var _ = Describe("GatewayRoute", func() {
 				newHTTPRoute := grBuilder.BuildHTTPRoute("newprefix", vsName, grTest.Namespace.Name)
 
 				grTest.GatewayRoutes[gr.Name].Spec.HTTPRoute = newHTTPRoute
-				updatedGR, err := grTest.Update(ctx, f, grTest.GatewayRoutes[gr.Name], oldGR)
+				err := grTest.Update(ctx, f, grTest.GatewayRoutes[gr.Name], oldGR)
 				Expect(err).NotTo(HaveOccurred())
 
-				err = grTest.CheckInAWS(ctx, f, mesh, vg, updatedGR)
+				err = grTest.CheckInAWS(ctx, f, mesh, vg, grTest.GatewayRoutes[gr.Name])
 				Expect(err).NotTo(HaveOccurred())
 
 			})
@@ -309,10 +309,10 @@ var _ = Describe("GatewayRoute", func() {
 
 				grTest.GatewayRoutes[gr.Name].Spec.HTTPRoute = nil
 				grTest.GatewayRoutes[gr.Name].Spec.GRPCRoute = GRPCRoute
-				updatedGR, err := grTest.Update(ctx, f, grTest.GatewayRoutes[gr.Name], oldGR)
+				err := grTest.Update(ctx, f, grTest.GatewayRoutes[gr.Name], oldGR)
 				Expect(err).NotTo(HaveOccurred())
 
-				err = grTest.CheckInAWS(ctx, f, mesh, vg, updatedGR)
+				err = grTest.CheckInAWS(ctx, f, mesh, vg, grTest.GatewayRoutes[gr.Name])
 				Expect(err).NotTo(HaveOccurred())
 
 			})
@@ -324,10 +324,10 @@ var _ = Describe("GatewayRoute", func() {
 				grTest.GatewayRoutes[gr.Name].Spec.HTTPRoute = nil
 				grTest.GatewayRoutes[gr.Name].Spec.GRPCRoute = nil
 				grTest.GatewayRoutes[gr.Name].Spec.HTTP2Route = HTTP2Route
-				updatedGR, err := grTest.Update(ctx, f, grTest.GatewayRoutes[gr.Name], oldGR)
+				err := grTest.Update(ctx, f, grTest.GatewayRoutes[gr.Name], oldGR)
 				Expect(err).NotTo(HaveOccurred())
 
-				err = grTest.CheckInAWS(ctx, f, mesh, vg, updatedGR)
+				err = grTest.CheckInAWS(ctx, f, mesh, vg, grTest.GatewayRoutes[gr.Name])
 				Expect(err).NotTo(HaveOccurred())
 
 			})
@@ -336,7 +336,7 @@ var _ = Describe("GatewayRoute", func() {
 				oldGR := grTest.GatewayRoutes[gr.Name].DeepCopy()
 				grTest.GatewayRoutes[gr.Name].Spec.AWSName = aws.String("newGatewayRouteAWSName")
 
-				_, err := grTest.Update(ctx, f, grTest.GatewayRoutes[gr.Name], oldGR)
+				err := grTest.Update(ctx, f, grTest.GatewayRoutes[gr.Name], oldGR)
 				Expect(err).To(HaveOccurred())
 			})
 

test/integration/mesh/mesh.go

@@ -67,18 +67,17 @@ func (m *MeshTest) WaitForDeletionTimestamp(ctx context.Context, f *framework.Fr
 	return false
 }
 
-func (m *MeshTest) Update(ctx context.Context, f *framework.Framework, newMesh *appmesh.Mesh, mesh *appmesh.Mesh) (*appmesh.Mesh, error) {
+func (m *MeshTest) Update(ctx context.Context, f *framework.Framework, newMesh *appmesh.Mesh, mesh *appmesh.Mesh) error {
 	err := f.K8sClient.Patch(ctx, newMesh, client.MergeFrom(mesh))
 	if err != nil {
-		return nil, err
+		return err
 	}
-	updatedMesh, err := f.MeshManager.WaitUntilMeshActive(ctx, newMesh)
+	_, err = f.MeshManager.WaitUntilMeshActive(ctx, newMesh)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	m.Meshes[mesh.Name] = updatedMesh
-	return updatedMesh, nil
+	return nil
 }
 
 func (m *MeshTest) Cleanup(ctx context.Context, f *framework.Framework) {