Add support for multiple gateways

internal/mode/static/handler_test.go

@@ -184,7 +184,6 @@ var _ = Describe("eventHandler", func() {
 				expectReconfig(dcfg, fakeCfgFiles)
 				Expect(helpers.Diff(handler.GetLatestConfiguration(), &dcfg)).To(BeEmpty())
 			})
-
 			It("should process Delete", func() {
 				e := &events.DeleteEvent{
 					Type:           &gatewayv1.HTTPRoute{},
@@ -218,6 +217,46 @@ var _ = Describe("eventHandler", func() {
 						return fakeStatusUpdater.UpdateGroupCallCount()
 					}).Should(Equal(1))
 			})
+			It("should not build anything if graph is nil", func() {
+				fakeProcessor.ProcessReturns(state.ClusterStateChange, nil)
+
+				e := &events.UpsertEvent{Resource: &gatewayv1.HTTPRoute{}}
+				batch := []interface{}{e}
+
+				handler.HandleEventBatch(context.Background(), logr.Discard(), batch)
+
+				checkUpsertEventExpectations(e)
+				Expect(fakeProvisioner.RegisterGatewayCallCount()).Should(Equal(0))
+				Expect(fakeGenerator.GenerateCallCount()).Should(Equal(0))
+				// status update for GatewayClass should not occur
+				Eventually(
+					func() int {
+						return fakeStatusUpdater.UpdateGroupCallCount()
+					}).Should(Equal(0))
+			})
+			It("should update gateway class even if gateway is invalid", func() {
+				fakeProcessor.ProcessReturns(state.ClusterStateChange, &graph.Graph{
+					Gateways: map[types.NamespacedName]*graph.Gateway{
+						{Namespace: "test", Name: "gateway"}: {
+							Valid: false,
+						},
+					},
+				})
+
+				e := &events.UpsertEvent{Resource: &gatewayv1.HTTPRoute{}}
+				batch := []interface{}{e}
+
+				handler.HandleEventBatch(context.Background(), logr.Discard(), batch)
+
+				checkUpsertEventExpectations(e)
+				Expect(fakeProvisioner.RegisterGatewayCallCount()).Should(Equal(0))
+				Expect(fakeGenerator.GenerateCallCount()).Should(Equal(0))
+				// status update should still occur for GatewayClasses
+				Eventually(
+					func() int {
+						return fakeStatusUpdater.UpdateGroupCallCount()
+					}).Should(Equal(1))
+			})
 		})
 
 		When("a batch has multiple events", func() {

internal/mode/static/nginx/config/policies/validator_test.go

@@ -27,6 +27,13 @@ var _ = Describe("Policy CompositeValidator", func() {
 		},
 	}
 
+	bananaGVK := schema.GroupVersionKind{Group: "fruit", Version: "1", Kind: "banana"}
+	bananaPolicy := &policiesfakes.FakePolicy{
+		GetNameStub: func() string {
+			return "banana"
+		},
+	}
+
 	mustExtractGVK := func(object client.Object) schema.GroupVersionKind {
 		switch object.GetName() {
 		case "apple":
@@ -64,6 +71,10 @@ var _ = Describe("Policy CompositeValidator", func() {
 			},
 			GVK: orangeGVK,
 		},
+		policies.ManagerConfig{
+			Validator: &policiesfakes.FakeValidator{},
+			GVK:       bananaGVK,
+		},
 	)
 
 	Context("Validation", func() {
@@ -105,6 +116,13 @@ var _ = Describe("Policy CompositeValidator", func() {
 					_ = mgr.Conflicts(&policiesfakes.FakePolicy{}, &policiesfakes.FakePolicy{})
 				}
 
+				Expect(conflict).To(Panic())
+			})
+			It("panics on call to conflicts when no validator is registered for policy", func() {
+				conflict := func() {
+					_ = mgr.Conflicts(bananaPolicy, bananaPolicy)
+				}
+
 				Expect(conflict).To(Panic())
 			})
 		})

internal/mode/static/state/graph/backend_tls_policy_test.go

@@ -95,6 +95,15 @@ func TestValidateBackendTLSPolicy(t *testing.T) {
 		},
 	}
 
+	targetRefInvalidKind := []v1alpha2.LocalPolicyTargetReferenceWithSectionName{
+		{
+			LocalPolicyTargetReference: v1alpha2.LocalPolicyTargetReference{
+				Kind: "Invalid",
+				Name: "service1",
+			},
+		},
+	}
+
 	localObjectRefNormalCase := []gatewayv1.LocalObjectReference{
 		{
 			Kind:  "ConfigMap",
@@ -301,7 +310,7 @@ func TestValidateBackendTLSPolicy(t *testing.T) {
 					Namespace: "test",
 				},
 				Spec: v1alpha3.BackendTLSPolicySpec{
-					TargetRefs: targetRefNormalCase,
+					TargetRefs: targetRefInvalidKind,
 					Validation: v1alpha3.BackendTLSPolicyValidation{
 						CACertificateRefs: localObjectRefInvalidKind,
 						Hostname:          "foo.test.com",

internal/mode/static/state/graph/gateway_test.go

@@ -331,6 +331,10 @@ func TestBuildGateway(t *testing.T) {
 		},
 		Spec: ngfAPIv1alpha2.NginxProxySpec{
 			Logging: &ngfAPIv1alpha2.NginxLogging{ErrorLevel: helpers.GetPointer(ngfAPIv1alpha2.NginxLogLevelError)},
+			Metrics: &ngfAPIv1alpha2.Metrics{
+				Disable: helpers.GetPointer(false),
+				Port:    helpers.GetPointer(int32(90)),
+			},
 		},
 	}
 	validGwNpRef := &v1.LocalParametersReference{
@@ -592,6 +596,10 @@ func TestBuildGateway(t *testing.T) {
 						Logging: &ngfAPIv1alpha2.NginxLogging{
 							ErrorLevel: helpers.GetPointer(ngfAPIv1alpha2.NginxLogLevelError),
 						},
+						Metrics: &ngfAPIv1alpha2.Metrics{
+							Disable: helpers.GetPointer(false),
+							Port:    helpers.GetPointer(int32(90)),
+						},
 					},
 					Conditions: []conditions.Condition{staticConds.NewGatewayResolvedRefs()},
 				},
@@ -634,6 +642,10 @@ func TestBuildGateway(t *testing.T) {
 							ErrorLevel: helpers.GetPointer(ngfAPIv1alpha2.NginxLogLevelError),
 						},
 						IPFamily: helpers.GetPointer(ngfAPIv1alpha2.Dual),
+						Metrics: &ngfAPIv1alpha2.Metrics{
+							Disable: helpers.GetPointer(false),
+							Port:    helpers.GetPointer(int32(90)),
+						},
 					},
 					Conditions: []conditions.Condition{staticConds.NewGatewayResolvedRefs()},
 				},

internal/mode/static/state/graph/graph_test.go

@@ -1747,3 +1747,12 @@ func TestIsNGFPolicyRelevantPanics(t *testing.T) {
 
 	g.Expect(isRelevant).To(Panic())
 }
+
+func TestGatewayExists(t *testing.T) {
+	t.Parallel()
+	g := NewWithT(t)
+	gwNsName := types.NamespacedName{Namespace: "test", Name: "gw"}
+
+	result := gatewayExists(gwNsName, nil)
+	g.Expect(result).To(BeFalse())
+}

internal/mode/static/state/graph/policies_test.go

@@ -787,6 +787,44 @@ func TestAttachPolicyToService(t *testing.T) {
 			expAttached:  false,
 			expAncestors: nil,
 		},
+		{
+			name:   "no attachment; does not belong to gateway",
+			policy: &Policy{Source: &policiesfakes.FakePolicy{}, InvalidForGateways: map[types.NamespacedName]struct{}{}},
+			svc: &ReferencedService{
+				GatewayNsNames: map[types.NamespacedName]struct{}{
+					gw2Nsname: {},
+				},
+			},
+			gws:          getGateway(true /*valid*/),
+			expAttached:  false,
+			expAncestors: nil,
+		},
+		{
+			name: "no attachment; gateway is invalid",
+			policy: &Policy{
+				Source: &policiesfakes.FakePolicy{},
+				InvalidForGateways: map[types.NamespacedName]struct{}{
+					gwNsname: {},
+				},
+				Ancestors: []PolicyAncestor{
+					{
+						Ancestor: getGatewayParentRef(gwNsname),
+					},
+				},
+			},
+			svc: &ReferencedService{
+				GatewayNsNames: map[types.NamespacedName]struct{}{
+					gwNsname: {},
+				},
+			},
+			gws:         getGateway(false),
+			expAttached: false,
+			expAncestors: []PolicyAncestor{
+				{
+					Ancestor: getGatewayParentRef(gwNsname),
+				},
+			},
+		},
 	}
 
 	for _, test := range tests {

internal/mode/static/state/graph/service_test.go

@@ -319,7 +319,9 @@ func TestBuildReferencedServices(t *testing.T) {
 		},
 		{
 			name: "nil gateway",
-			gws:  nil,
+			gws: map[types.NamespacedName]*Gateway{
+				gwNsName: nil,
+			},
 			l7Routes: map[RouteKey]*L7Route{
 				{NamespacedName: types.NamespacedName{Name: "no-service-nsname"}}: validRouteNoServiceNsName,
 			},