fix integration EE tests with Kong 3.11 (#7620)

* fix integration EE tests with Kong 3.11

Signed-off-by: Jintao Zhang <[email protected]>

* chore(deps): update kong/kong-gateway docker tag to v3.11.0.0

---------

Signed-off-by: Jintao Zhang <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Author: tao12345666333

.github/test_dependencies.yaml

@@ -46,17 +46,17 @@ integration:
   # renovate: datasource=docker depName=kong versioning=docker
   kong-oss: '3.9.1'
   # renovate: datasource=docker depName=kong/kong-gateway versioning=docker
-  kong-ee: '3.9.1.2'
+  kong-ee: '3.11.0.0'
 
 kongintegration:
   # renovate: datasource=docker depName=kong versioning=docker
   kong-oss: '3.9.1'
   # renovate: datasource=docker depName=kong/kong-gateway versioning=docker
-  kong-ee: '3.9.1.2'
+  kong-ee: '3.11.0.0'
 
 envtests:
   # renovate: datasource=docker depName=kong/kong-gateway versioning=docker
-  kong-ee: '3.9.1.2'
+  kong-ee: '3.11.0.0'
   # This is a version of Kong Gateway that does not support sticky sessions,
   # all versions >= 3.11.0 support sticky sessions.
   kong-without-sticky-sessions: '3.9.1'

test/kongintegration/inmemory_update_strategy_test.go

@@ -91,9 +91,8 @@ func TestUpdateStrategyInMemory_PropagatesResourcesErrors(t *testing.T) {
 		},
 	}
 	expectedMessage := "invalid path: value must be null"
-	expectedRawErrBody := []byte(`{"code":14,"name":"invalid declarative configuration","fields":{},"message":"declarative config is invalid: {}","flattened_errors":[{"entity_type":"service","entity_name":"test-service","entity_tags":["k8s-name:test-service","k8s-namespace:default","k8s-kind:Service","k8s-uid:a3b8afcc-9f19-42e4-aa8f-5866168c2ad3","k8s-group:","k8s-version:v1"],"errors":[{"type":"field","message":"value must be null","field":"path"},{"type":"entity","message":"failed conditional validation given value of field 'protocol'"}],"entity":{"path":"/test","name":"test-service","protocol":"grpc","tags":["k8s-name:test-service","k8s-namespace:default","k8s-kind:Service","k8s-uid:a3b8afcc-9f19-42e4-aa8f-5866168c2ad3","k8s-group:","k8s-version:v1"],"host":"konghq.com","port":80}}]}`)
-	expectedBody := map[string]any{}
-	require.NoError(t, json.Unmarshal(expectedRawErrBody, &expectedBody))
+	// We don't hardcode the expected response body as it can vary between Kong versions
+	// Instead, we verify the essential structure and fields are present
 
 	require.EventuallyWithT(t, func(t *assert.CollectT) {
 		configSize, err := sut.Update(ctx, faultyConfig)
@@ -131,12 +130,44 @@ func TestUpdateStrategyInMemory_PropagatesResourcesErrors(t *testing.T) {
 		if diff := cmp.Diff(expectedCausingObjects, resourceErr.CausingObjects()); !assert.Empty(t, diff) {
 			return
 		}
+		// Verify essential structure of the response body
 		actualBody := map[string]any{}
 		err = json.Unmarshal(updateError.RawResponseBody(), &actualBody)
 		if !assert.NoError(t, err) {
 			return
 		}
-		if diff := cmp.Diff(expectedBody, actualBody); !assert.Empty(t, diff) {
+
+		// Check for required fields in the error response
+		if !assert.Contains(t, actualBody, "code") {
+			return
+		}
+		if !assert.Contains(t, actualBody, "name") {
+			return
+		}
+		if !assert.Contains(t, actualBody, "flattened_errors") {
+			return
+		}
+
+		// Verify the flattened_errors contains our test service
+		flattenedErrors, ok := actualBody["flattened_errors"].([]any)
+		if !assert.True(t, ok) {
+			return
+		}
+		if !assert.NotEmpty(t, flattenedErrors) {
+			return
+		}
+
+		// Check that at least one error relates to our test service
+		foundServiceError := false
+		for _, errorItem := range flattenedErrors {
+			if errorMap, ok := errorItem.(map[string]any); ok {
+				if entityName, ok := errorMap["entity_name"].(string); ok && entityName == "test-service" {
+					foundServiceError = true
+					break
+				}
+			}
+		}
+		if !assert.True(t, foundServiceError, "Expected to find flattened error for test-service") {
 			return
 		}
 	}, timeout, period)

test/kongintegration/kongupstreampolicy_test.go

@@ -327,6 +327,9 @@ func dropKongDefaults(upstream *kong.Upstream) *kong.Upstream {
 	if upstream.HashOnCookiePath != nil && *upstream.HashOnCookiePath == "/" {
 		upstream.HashOnCookiePath = nil
 	}
+	if upstream.StickySessionsCookiePath != nil && *upstream.StickySessionsCookiePath == "/" {
+		upstream.StickySessionsCookiePath = nil
+	}
 	if upstream.UseSrvName != nil && *upstream.UseSrvName == false {
 		upstream.UseSrvName = nil
 	}