fix compile/test errors

Signed-off-by: Steve Kriss <stephen.kriss@gmail.com>
projectcontour · Jan 9, 2025 · ff6e1ab · ff6e1ab
1 parent ac5faa2
commit ff6e1ab
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/internal/dag/builder_test.go b/internal/dag/builder_test.go
@@ -5064,7 +5064,7 @@ func TestDAGInsertGatewayAPI(t *testing.T) {
 						Rules: []gatewayapi_v1.GRPCRouteRule{{
 							Matches: []gatewayapi_v1.GRPCRouteMatch{{
 								Method:  gatewayapi.GRPCMethodMatch(gatewayapi_v1.GRPCMethodMatchExact, "io.projectcontour", "Login"),
-								Headers: gatewayapi.GRPCHeaderMatch(gatewayapi_v1.HeaderMatchExact, "version", "2"),
+								Headers: gatewayapi.GRPCHeaderMatch(gatewayapi_v1.GRPCHeaderMatchExact, "version", "2"),
 							}},
 							BackendRefs: gatewayapi.GRPCRouteBackendRef("kuard", 8080, 1),
 						}},
@@ -5106,7 +5106,7 @@ func TestDAGInsertGatewayAPI(t *testing.T) {
 						Rules: []gatewayapi_v1.GRPCRouteRule{{
 							Matches: []gatewayapi_v1.GRPCRouteMatch{{
 								Method:  gatewayapi.GRPCMethodMatch(gatewayapi_v1.GRPCMethodMatchExact, "io.projectcontour", "Login"),
-								Headers: gatewayapi.GRPCHeaderMatch(gatewayapi_v1.HeaderMatchRegularExpression, "version", "2+"),
+								Headers: gatewayapi.GRPCHeaderMatch(gatewayapi_v1.GRPCHeaderMatchRegularExpression, "version", "2+"),
 							}},
 							BackendRefs: gatewayapi.GRPCRouteBackendRef("kuard", 8080, 1),
 						}},
@@ -5147,7 +5147,7 @@ func TestDAGInsertGatewayAPI(t *testing.T) {
 						},
 						Rules: []gatewayapi_v1.GRPCRouteRule{{
 							Matches: []gatewayapi_v1.GRPCRouteMatch{{
-								Headers: gatewayapi.GRPCHeaderMatch(gatewayapi_v1.HeaderMatchExact, "version", "2"),
+								Headers: gatewayapi.GRPCHeaderMatch(gatewayapi_v1.GRPCHeaderMatchExact, "version", "2"),
 							}},
 							BackendRefs: gatewayapi.GRPCRouteBackendRef("kuard", 8080, 1),
 						}},

diff --git a/internal/dag/gatewayapi_processor.go b/internal/dag/gatewayapi_processor.go
@@ -1727,10 +1727,10 @@ func gatewayGRPCHeaderMatchConditions(matches []gatewayapi_v1.GRPCHeaderMatch) (
 	for _, match := range matches {
 		// "Exact" and "RegularExpression" are the only supported match types. If match type is not specified, use "Exact" as default.
 		var matchType string
-		switch ptr.Deref(match.Type, gatewayapi_v1.HeaderMatchExact) {
-		case gatewayapi_v1.HeaderMatchExact:
+		switch ptr.Deref(match.Type, gatewayapi_v1.GRPCHeaderMatchExact) {
+		case gatewayapi_v1.GRPCHeaderMatchExact:
 			matchType = HeaderMatchTypeExact
-		case gatewayapi_v1.HeaderMatchRegularExpression:
+		case gatewayapi_v1.GRPCHeaderMatchRegularExpression:
 			if err := ValidateRegex(match.Value); err != nil {
 				return nil, fmt.Errorf("GRPCRoute.Spec.Rules.Matches.Headers: Invalid value for RegularExpression match type is specified")
 			}

diff --git a/internal/dag/status_test.go b/internal/dag/status_test.go
@@ -10754,7 +10754,7 @@ func TestGatewayAPIGRPCRouteDAGStatus(t *testing.T) {
 							},
 							Headers: []gatewayapi_v1.GRPCHeaderMatch{
 								{
-									Type:  ptr.To(gatewayapi_v1.HeaderMatchType("UNKNOWN")), // <---- unknown type to break the test
+									Type:  ptr.To(gatewayapi_v1.GRPCHeaderMatchType("UNKNOWN")), // <---- unknown type to break the test
 									Name:  gatewayapi_v1.GRPCHeaderName("foo"),
 									Value: "bar",
 								},
@@ -10809,7 +10809,7 @@ func TestGatewayAPIGRPCRouteDAGStatus(t *testing.T) {
 							},
 							Headers: []gatewayapi_v1.GRPCHeaderMatch{
 								{
-									Type:  ptr.To(gatewayapi_v1.HeaderMatchRegularExpression),
+									Type:  ptr.To(gatewayapi_v1.GRPCHeaderMatchRegularExpression),
 									Name:  gatewayapi_v1.GRPCHeaderName("foo"),
 									Value: "invalid(-)regex)",
 								},

diff --git a/internal/gatewayapi/helpers.go b/internal/gatewayapi/helpers.go
@@ -173,7 +173,7 @@ func GRPCMethodMatch(matchType gatewayapi_v1.GRPCMethodMatchType, service, metho
 	}
 }
 
-func GRPCHeaderMatch(matchType gatewayapi_v1.HeaderMatchType, name, value string) []gatewayapi_v1.GRPCHeaderMatch {
+func GRPCHeaderMatch(matchType gatewayapi_v1.GRPCHeaderMatchType, name, value string) []gatewayapi_v1.GRPCHeaderMatch {
 	return []gatewayapi_v1.GRPCHeaderMatch{
 		{
 			Type:  ptr.To(matchType),

diff --git a/internal/provisioner/controller/gateway_test.go b/internal/provisioner/controller/gateway_test.go
@@ -1276,13 +1276,13 @@ func TestGatewayReconcile(t *testing.T) {
 				Spec: gatewayapi_v1.GatewaySpec{
 					GatewayClassName: gatewayapi_v1.ObjectName("gatewayclass-1"),
 					Infrastructure: &gatewayapi_v1.GatewayInfrastructure{
-						Labels: map[gatewayapi_v1.AnnotationKey]gatewayapi_v1.AnnotationValue{
-							gatewayapi_v1.AnnotationKey("projectcontour.io/label-1"): gatewayapi_v1.AnnotationValue("label-value-1"),
-							gatewayapi_v1.AnnotationKey("projectcontour.io/label-2"): gatewayapi_v1.AnnotationValue("label-value-2"),
+						Labels: map[gatewayapi_v1.LabelKey]gatewayapi_v1.LabelValue{
+							"projectcontour.io/label-1": "label-value-1",
+							"projectcontour.io/label-2": "label-value-2",
 						},
 						Annotations: map[gatewayapi_v1.AnnotationKey]gatewayapi_v1.AnnotationValue{
-							gatewayapi_v1.AnnotationKey("projectcontour.io/annotation-1"): gatewayapi_v1.AnnotationValue("annotation-value-1"),
-							gatewayapi_v1.AnnotationKey("projectcontour.io/annotation-2"): gatewayapi_v1.AnnotationValue("annotation-value-2"),
+							"projectcontour.io/annotation-1": "annotation-value-1",
+							"projectcontour.io/annotation-2": "annotation-value-2",
 						},
 					},
 				},