fix: schema validation for registry and mirror URL

Author: supershal

api/v1alpha1/clusterconfig_types.go

@@ -295,6 +295,8 @@ func (GlobalImageRegistryMirror) VariableSchema() clusterv1.VariableSchema {
 				"url": {
 					Description: "Registry mirror URL.",
 					Type:        "string",
+					Format:      "uri",
+					Pattern:     "^https?://",
 				},
 				"credentials": ImageCredentials{}.VariableSchema().OpenAPIV3Schema,
 			},
@@ -320,6 +322,8 @@ func (ImageRegistry) VariableSchema() clusterv1.VariableSchema {
 				"url": {
 					Description: "Registry URL.",
 					Type:        "string",
+					Format:      "uri",
+					Pattern:     "^https?://",
 				},
 				"credentials": ImageCredentials{}.VariableSchema().OpenAPIV3Schema,
 			},

pkg/handlers/generic/mutation/imageregistries/credentials/variables_test.go

@@ -36,7 +36,7 @@ func TestVariableValidation(t *testing.T) {
 			Vals: v1alpha1.GenericClusterConfig{
 				ImageRegistries: []v1alpha1.ImageRegistry{
 					{
-						URL: "http://a.b.c.example.com",
+						URL: "https://a.b.c.example.com/a/b/c",
 						Credentials: &v1alpha1.ImageCredentials{
 							SecretRef: &corev1.ObjectReference{
 								Name: "a.b.c.example.com-creds",
@@ -46,5 +46,27 @@ func TestVariableValidation(t *testing.T) {
 				},
 			},
 		},
+		capitest.VariableTestDef{
+			Name: "invalid registry URL",
+			Vals: v1alpha1.GenericClusterConfig{
+				ImageRegistries: []v1alpha1.ImageRegistry{
+					{
+						URL: "unsupportedformat://a.b.c.example.com",
+					},
+				},
+			},
+			ExpectError: true,
+		},
+		capitest.VariableTestDef{
+			Name: "registry URL without format",
+			Vals: v1alpha1.GenericClusterConfig{
+				ImageRegistries: []v1alpha1.ImageRegistry{
+					{
+						URL: "a.b.c.example.com/a/b/c",
+					},
+				},
+			},
+			ExpectError: true,
+		},
 	)
 }

pkg/handlers/generic/mutation/mirrors/variables_test.go

@@ -42,5 +42,23 @@ func TestVariableValidation(t *testing.T) {
 				},
 			},
 		},
+		capitest.VariableTestDef{
+			Name: "invalid mirror registry URL",
+			Vals: v1alpha1.GenericClusterConfig{
+				GlobalImageRegistryMirror: &v1alpha1.GlobalImageRegistryMirror{
+					URL: "unsupportedformat://a.b.c.example.com",
+				},
+			},
+			ExpectError: true,
+		},
+		capitest.VariableTestDef{
+			Name: "registry URL without http(s) format and path",
+			Vals: v1alpha1.GenericClusterConfig{
+				GlobalImageRegistryMirror: &v1alpha1.GlobalImageRegistryMirror{
+					URL: "a.b.c.example.com/a/b/c",
+				},
+			},
+			ExpectError: true,
+		},
 	)
 }