Fix issues after main rebase

Author: ciarams87

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

@@ -240,20 +240,20 @@ func validateGRPCMethodMatch(
 
 func validateGRPCFilter(
 	validator validation.HTTPFieldsValidator,
-	filter v1alpha2.GRPCRouteFilter,
+	filter v1.GRPCRouteFilter,
 	filterPath *field.Path,
 ) field.ErrorList {
 	var allErrs field.ErrorList
 
 	switch filter.Type {
-	case v1alpha2.GRPCRouteFilterRequestHeaderModifier:
+	case v1.GRPCRouteFilterRequestHeaderModifier:
 		return validateFilterHeaderModifier(validator, filter.RequestHeaderModifier, filterPath.Child(string(filter.Type)))
 	default:
 		valErr := field.NotSupported(
 			filterPath.Child("type"),
 			filter.Type,
 			[]string{
-				string(v1alpha2.GRPCRouteFilterRequestHeaderModifier),
+				string(v1.GRPCRouteFilterRequestHeaderModifier),
 			},
 		)
 		allErrs = append(allErrs, valErr)
@@ -263,14 +263,14 @@ func validateGRPCFilter(
 
 // convertGRPCFilters converts GRPCRouteFilters (a subset of HTTPRouteFilter) to HTTPRouteFilters
 // so we can reuse the logic from HTTPRoute filter validation and processing
-func convertGRPCFilters(filters []v1alpha2.GRPCRouteFilter) []v1.HTTPRouteFilter {
+func convertGRPCFilters(filters []v1.GRPCRouteFilter) []v1.HTTPRouteFilter {
 	if len(filters) == 0 {
 		return nil
 	}
 	httpFilters := make([]v1.HTTPRouteFilter, 0, len(filters))
 	for _, filter := range filters {
 		switch filter.Type {
-		case v1alpha2.GRPCRouteFilterRequestHeaderModifier:
+		case v1.GRPCRouteFilterRequestHeaderModifier:
 			httpRequestHeaderFilter := v1.HTTPRouteFilter{
 				Type:                  v1.HTTPRouteFilterRequestHeaderModifier,
 				RequestHeaderModifier: filter.RequestHeaderModifier,

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

@@ -235,7 +235,7 @@ func TestBuildGRPCRoute(t *testing.T) {
 
 	grValidFilterRule := createGRPCMethodMatch("myService", "myMethod", "Exact")
 
-	grValidFilterRule.Filters = []v1alpha2.GRPCRouteFilter{
+	grValidFilterRule.Filters = []v1.GRPCRouteFilter{
 		{
 			Type: "RequestHeaderModifier",
 			RequestHeaderModifier: &v1.HTTPHeaderFilter{
@@ -248,7 +248,7 @@ func TestBuildGRPCRoute(t *testing.T) {
 		"gr",
 		gatewayNsName.Name,
 		"example.com",
-		[]v1alpha2.GRPCRouteRule{grValidFilterRule},
+		[]v1.GRPCRouteRule{grValidFilterRule},
 	)
 
 	convertedFilters := []v1.HTTPRouteFilter{
@@ -680,7 +680,7 @@ func TestConvertGRPCMatches(t *testing.T) {
 
 	tests := []struct {
 		name          string
-		methodMatches []v1alpha2.GRPCRouteMatch
+		methodMatches []v1.GRPCRouteMatch
 		expected      []v1.HTTPRouteMatch
 	}{
 		{
@@ -695,7 +695,7 @@ func TestConvertGRPCMatches(t *testing.T) {
 		},
 		{
 			name:          "empty matches",
-			methodMatches: []v1alpha2.GRPCRouteMatch{},
+			methodMatches: []v1.GRPCRouteMatch{},
 			expected:      expectedEmptyMatches,
 		},
 	}
@@ -711,7 +711,7 @@ func TestConvertGRPCMatches(t *testing.T) {
 }
 
 func TestConvertGRPCFilters(t *testing.T) {
-	grFilters := []v1alpha2.GRPCRouteFilter{
+	grFilters := []v1.GRPCRouteFilter{
 		{
 			Type: "RequestHeaderModifier",
 			RequestHeaderModifier: &v1.HTTPHeaderFilter{

tests/go.mod

@@ -19,13 +19,13 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
-	github.com/go-openapi/jsonpointer v0.20.0 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -34,8 +34,8 @@ require (
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
-	github.com/google/uuid v1.3.1 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/influxdata/tdigest v0.0.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
@@ -54,24 +54,23 @@ require (
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
+	golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
 	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/oauth2 v0.13.0 // indirect
+	golang.org/x/oauth2 v0.19.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
 	golang.org/x/sys v0.19.0 // indirect
 	golang.org/x/term v0.19.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.20.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+	k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 // indirect
+	k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )