update server struct

Co-authored-by: juliens <[email protected]>
traefik · Apr 29, 2024 · e6cfb0e · e6cfb0e
1 parent 27fa94c
commit e6cfb0e
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 11 deletions.
diff --git a/pkg/apis/hub/v1alpha1/api.go b/pkg/apis/hub/v1alpha1/api.go
@@ -91,8 +91,12 @@ type OpenAPISpec struct {
 type Override struct {
 	// +kubebuilder:validation:MaxItems=100
 	// +kubebuilder:validation:MinItems=1
-	// +kubebuilder:validation:XValidation:message="must be a valid URL",rule="self.all(x, isURL(x))"
-	Servers []string `json:"servers"`
+	Servers []Server `json:"servers"`
+}
+
+type Server struct {
+	// +kubebuilder:validation:XValidation:message="must be a valid URL",rule="isURL(self)"
+	URL string `json:"url"`
 }
 
 // OperationSet gives a name to a set of matching OpenAPI operations.

diff --git a/pkg/apis/hub/v1alpha1/crd/hub.traefik.io_apis.yaml b/pkg/apis/hub/v1alpha1/crd/hub.traefik.io_apis.yaml
@@ -113,13 +113,18 @@ spec:
                     properties:
                       servers:
                         items:
-                          type: string
+                          properties:
+                            url:
+                              type: string
+                              x-kubernetes-validations:
+                              - message: must be a valid URL
+                                rule: isURL(self)
+                          required:
+                          - url
+                          type: object
                         maxItems: 100
                         minItems: 1
                         type: array
-                        x-kubernetes-validations:
-                        - message: must be a valid URL
-                          rule: self.all(x, isURL(x))
                     required:
                     - servers
                     type: object

diff --git a/pkg/apis/hub/v1alpha1/crd/hub.traefik.io_apiversions.yaml b/pkg/apis/hub/v1alpha1/crd/hub.traefik.io_apiversions.yaml
@@ -119,13 +119,18 @@ spec:
                     properties:
                       servers:
                         items:
-                          type: string
+                          properties:
+                            url:
+                              type: string
+                              x-kubernetes-validations:
+                              - message: must be a valid URL
+                                rule: isURL(self)
+                          required:
+                          - url
+                          type: object
                         maxItems: 100
                         minItems: 1
                         type: array
-                        x-kubernetes-validations:
-                        - message: must be a valid URL
-                          rule: self.all(x, isURL(x))
                     required:
                     - servers
                     type: object

diff --git a/pkg/apis/hub/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/hub/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/validation/v1alpha1/api_test.go b/pkg/validation/v1alpha1/api_test.go
@@ -164,6 +164,22 @@ spec:
     path: /foo/..`),
 			wantErrs: field.ErrorList{{Type: field.ErrorTypeInvalid, Field: "spec.openApiSpec.path", BadValue: "string", Detail: "cannot contains '../'"}},
 		},
+		{
+			desc: "override server url is broken",
+			manifest: []byte(`
+apiVersion: hub.traefik.io/v1alpha1
+kind: API
+metadata:
+  name: my-api
+  namespace: my-ns
+spec:
+  openApiSpec:
+    path: /foo
+    override:
+      servers:
+      - url: aaa`),
+			wantErrs: field.ErrorList{{Type: field.ErrorTypeInvalid, Field: "spec.openApiSpec.override.servers[0].url", BadValue: "string", Detail: "must be a valid URL"}},
+		},
 		{
 			desc: "valid: openApiSpec path with segment starting with ..",
 			manifest: []byte(`