update based on reviews

tests/framework/crossplane.go

@@ -54,20 +54,15 @@ func ValidateNginxFieldExists(conf *Payload, expFieldCfg ExpectedNginxField) err
 				continue
 			}
 
-			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
-						} else if serverDirective.Directive == "location" &&
-							fieldExistsInLocation(serverDirective, expFieldCfg) {
-							return nil
-						}
-					}
-				}
+			err := validateServerBlockDirectives(expFieldCfg, *directive)
+			if err != nil {
+				return err
 			}
 
-			return validateUpstreamDirectives(expFieldCfg, directive)
+			err = validateUpstreamDirectives(expFieldCfg, directive)
+			if err != nil {
+				return err
+			}
 		}
 	}
 
@@ -79,6 +74,22 @@ func ValidateNginxFieldExists(conf *Payload, expFieldCfg ExpectedNginxField) err
 	return fmt.Errorf("field not found; expected: %+v\nNGINX conf: %s", expFieldCfg, string(b))
 }
 
+func validateServerBlockDirectives(expFieldCfg ExpectedNginxField, directive Directive) error {
+	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
+				} else if serverDirective.Directive == "location" &&
+					fieldExistsInLocation(serverDirective, expFieldCfg) {
+					return nil
+				}
+			}
+		}
+	}
+	return fmt.Errorf("field not found; expected: %+v\nNGINX conf: %s", expFieldCfg, directive.Directive)
+}
+
 func validateUpstreamDirectives(expFieldCfg ExpectedNginxField, directive *Directive) error {
 	for _, upstreamName := range expFieldCfg.Upstreams {
 		if directive.Directive == "upstream" && directive.Args[0] == upstreamName {
@@ -89,7 +100,7 @@ func validateUpstreamDirectives(expFieldCfg ExpectedNginxField, directive *Direc
 			}
 		}
 	}
-	return nil
+	return fmt.Errorf("field not found; expected: %+v\nNGINX conf: %s", expFieldCfg, directive.Directive)
 }
 
 func getServerName(serverBlock Directives) string {

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

@@ -1,19 +1,15 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
-  name: gateway-httproute-allowed
+  name: gateway-not-valid
 spec:
   gatewayClassName: nginx
+  addresses: "10.0.0.1"
   listeners:
   - name: http
     port: 80
     protocol: HTTP
     hostname: "soda.example.com"
-    allowedRoutes:
-      namespaces:
-        from: All
-      kinds:
-        kind: GRPCRoute
 ---
 apiVersion: apps/v1
 kind: Deployment

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

@@ -1,13 +1,16 @@
 apiVersion: gateway.nginx.org/v1alpha1
 kind: UpstreamSettingsPolicy
 metadata:
-  name: coffee-svc-usp
+  name: multiple-http-svc-usp
 spec:
   zoneSize: 512k
   targetRefs:
     - group: core
       kind: Service
       name: coffee
+    - group: core
+      kind: Service
+      name: tea
   keepAlive:
     connections: 10
     requests: 3
@@ -16,25 +19,6 @@ spec:
 ---
 apiVersion: gateway.nginx.org/v1alpha1
 kind: UpstreamSettingsPolicy
-metadata:
-  name: tea-multiple-svc-usp
-spec:
-  zoneSize: 128k
-  targetRefs:
-    - group: core
-      kind: Service
-      name: tea
-    - group: core
-      kind: Service
-      name: coffee
-  keepAlive:
-    connections: 12
-    requests: 31
-    time: 20s
-    timeout: 40s
----
-apiVersion: gateway.nginx.org/v1alpha1
-kind: UpstreamSettingsPolicy
 metadata:
   name: grpc-svc-usp
 spec: