Add converter pkg to house type conversion helpers

apis/v1alpha2/validation/util/utils.go → apis/v1alpha2/converter/httproute.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Kubernetes Authors.
+Copyright 2022 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,20 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package utils
+package converter
 
 import (
 	gatewayv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 )
 
-// PathMatchTypePtr translates a string to *PathMatchType
-func PathMatchTypePtr(s string) *gatewayv1a2.PathMatchType {
-	result := gatewayv1a2.PathMatchType(s)
+// HeaderMatchTypePtr translates a string to *PathMatchType
+func HeaderMatchTypePtr(s string) *gatewayv1a2.HeaderMatchType {
+	result := gatewayv1a2.HeaderMatchType(s)
 	return &result
 }
 
-// PortNumberPtr translates an int to a *PortNumber
-func PortNumberPtr(p int) *gatewayv1a2.PortNumber {
-	result := gatewayv1a2.PortNumber(p)
+// PathMatchTypePtr translates a string to *PathMatchType
+func PathMatchTypePtr(s string) *gatewayv1a2.PathMatchType {
+	result := gatewayv1a2.PathMatchType(s)
 	return &result
 }

apis/v1alpha2/converter/httproute_test.go

@@ -0,0 +1,61 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package converter
+
+import (
+	"testing"
+
+	gatewayv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
+)
+
+func Test_PathMatchTypePtr(t *testing.T) {
+	pathMatchTypePtrTests := []struct {
+		name         string
+		pathType     string
+		expectedPath gatewayv1a2.PathMatchType
+	}{
+		{
+			name:         "valid path exact match",
+			pathType:     "Exact",
+			expectedPath: gatewayv1a2.PathMatchExact,
+		},
+		{
+			name:         "valid path exact match using constant",
+			pathType:     string(gatewayv1a2.PathMatchExact),
+			expectedPath: gatewayv1a2.PathMatchExact,
+		},
+		{
+			name:         "valid path prefix match",
+			pathType:     "PathPrefix",
+			expectedPath: gatewayv1a2.PathMatchPathPrefix,
+		},
+		{
+			name:         "valid path regular expression match",
+			pathType:     "RegularExpression",
+			expectedPath: gatewayv1a2.PathMatchRegularExpression,
+		},
+	}
+
+	for _, tc := range pathMatchTypePtrTests {
+		t.Run(tc.name, func(t *testing.T) {
+			path := PathMatchTypePtr(tc.pathType)
+			if *path != tc.expectedPath {
+				t.Errorf("Expected path %s, got %s", tc.expectedPath, *path)
+			}
+		})
+	}
+}

apis/v1alpha2/converter/shared_types.go

@@ -0,0 +1,27 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package converter
+
+import (
+	gatewayv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
+)
+
+// PortNumberPtr translates an int to a *PortNumber
+func PortNumberPtr(p int) *gatewayv1a2.PortNumber {
+	result := gatewayv1a2.PortNumber(p)
+	return &result
+}

apis/v1alpha2/validation/util/utils_test.go → apis/v1alpha2/converter/shared_types_test.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Kubernetes Authors.
+Copyright 2022 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package utils
+package converter
 
 import (
 	"testing"
@@ -68,37 +68,3 @@ func Test_PortNumberPtr(t *testing.T) {
 		})
 	}
 }
-
-func Test_PathMatchTypePtr(t *testing.T) {
-	pathMatchTypePtrTests := []struct {
-		name         string
-		pathType     string
-		expectedPath gatewayv1a2.PathMatchType
-	}{
-		{
-			name:         "valid path exact match",
-			pathType:     "Exact",
-			expectedPath: gatewayv1a2.PathMatchExact,
-		},
-
-		{
-			name:         "valid path prefix match",
-			pathType:     "PathPrefix",
-			expectedPath: gatewayv1a2.PathMatchPathPrefix,
-		},
-		{
-			name:         "valid path regular expression match",
-			pathType:     "RegularExpression",
-			expectedPath: gatewayv1a2.PathMatchRegularExpression,
-		},
-	}
-
-	for _, tc := range pathMatchTypePtrTests {
-		t.Run(tc.name, func(t *testing.T) {
-			path := PathMatchTypePtr(tc.pathType)
-			if *path != tc.expectedPath {
-				t.Errorf("Expected path %s, got %s", tc.expectedPath, *path)
-			}
-		})
-	}
-}