update based on reviews

tests/framework/crossplane.go

@@ -30,7 +30,7 @@ type ExpectedNginxField struct {
 	Location string
 	// Servers are the server names that the directive should exist in.
 	Servers []string
-	// Upstream are the upstream names that the directive should exist in.
+	// Upstreams are the upstream names that the directive should exist in.
 	Upstreams []string
 	// ValueSubstringAllowed allows the expected value to be a substring of the real value.
 	// This makes it easier for cases when real values are complex file names or contain things we
@@ -54,13 +54,11 @@ func ValidateNginxFieldExists(conf *Payload, expFieldCfg ExpectedNginxField) err
 				continue
 			}
 
-			err := validateServerBlockDirectives(expFieldCfg, *directive)
-			if err != nil {
+			if err := validateServerBlockDirectives(expFieldCfg, *directive); err != nil {
 				return err
 			}
 
-			err = validateUpstreamDirectives(expFieldCfg, directive)
-			if err != nil {
+			if err := validateUpstreamDirectives(expFieldCfg, directive); err != nil {
 				return err
 			}
 		}
@@ -78,29 +76,29 @@ func validateServerBlockDirectives(expFieldCfg ExpectedNginxField, directive Dir
 	for _, serverName := range expFieldCfg.Servers {
 		if directive.Directive == "server" && getServerName(directive.Block) == serverName {
 			for _, serverDirective := range directive.Block {
-				if expFieldCfg.Location == "" && expFieldCfg.fieldFound(serverDirective) {
-					return nil
+				if expFieldCfg.Location == "" && !expFieldCfg.fieldFound(serverDirective) {
+					return fmt.Errorf("field not found; expected: %+v\nNGINX conf: %s", expFieldCfg, serverDirective.Directive)
 				} else if serverDirective.Directive == "location" &&
-					fieldExistsInLocation(serverDirective, expFieldCfg) {
-					return nil
+					!fieldExistsInLocation(serverDirective, expFieldCfg) {
+					return fmt.Errorf("field not found; expected: %+v\nNGINX conf: %s", expFieldCfg, serverDirective.Directive)
 				}
 			}
 		}
 	}
-	return fmt.Errorf("field not found; expected: %+v\nNGINX conf: %s", expFieldCfg, directive.Directive)
+	return nil
 }
 
 func validateUpstreamDirectives(expFieldCfg ExpectedNginxField, directive *Directive) error {
 	for _, upstreamName := range expFieldCfg.Upstreams {
 		if directive.Directive == "upstream" && directive.Args[0] == upstreamName {
 			for _, upstreamDirective := range directive.Block {
-				if expFieldCfg.fieldFound(upstreamDirective) {
-					return nil
+				if !expFieldCfg.fieldFound(upstreamDirective) {
+					return fmt.Errorf("field not found; expected: %+v\nNGINX conf: %s", expFieldCfg, upstreamDirective.Directive)
 				}
 			}
 		}
 	}
-	return fmt.Errorf("field not found; expected: %+v\nNGINX conf: %s", expFieldCfg, directive.Directive)
+	return nil
 }
 
 func getServerName(serverBlock Directives) string {

tests/suite/manifests/upstream-settings-policy/invalid-svc-usps.yaml

@@ -1,7 +1,7 @@
 apiVersion: gateway.nginx.org/v1alpha1
 kind: UpstreamSettingsPolicy
 metadata:
-  name: latte-svc-usp
+  name: does-not-exist
 spec:
   zoneSize: 512k
   targetRefs:

tests/suite/manifests/upstream-settings-policy/valid-merge-usps.yaml

@@ -3,7 +3,7 @@ kind: UpstreamSettingsPolicy
 metadata:
   name: coffee-svc-usp-1
 spec:
-  zoneSize: 64k
+  zoneSize: 1g
   targetRefs:
     - group: core
       kind: Service

tests/suite/manifests/upstream-settings-policy/valid-usps-first-wins.yaml

@@ -1,7 +1,7 @@
 apiVersion: gateway.nginx.org/v1alpha1
 kind: UpstreamSettingsPolicy
 metadata:
-  name: coffee-svc-usp-1
+  name: z-coffee-svc-usp
 spec:
   zoneSize: 64k
   targetRefs:
@@ -12,7 +12,7 @@ spec:
 apiVersion: gateway.nginx.org/v1alpha1
 kind: UpstreamSettingsPolicy
 metadata:
-  name: coffee-svc-usp-2
+  name: a-coffee-svc-usp
 spec:
   zoneSize: 128k
   targetRefs:

tests/suite/manifests/upstream-settings-policy/valid-usps.yaml

@@ -3,7 +3,6 @@ kind: UpstreamSettingsPolicy
 metadata:
   name: multiple-http-svc-usp
 spec:
-  zoneSize: 512k
   targetRefs:
     - group: core
       kind: Service
@@ -26,8 +25,9 @@ spec:
     group: core
     kind: Service
     name: grpc-backend
+  zoneSize: 64k
   keepAlive:
-    connections: 10
-    requests: 3
-    time: 10s
-    timeout: 50s
+    connections: 100
+    requests: 45
+    time: 1m
+    timeout: 5h