Merge pull request #485 from jhadvig/cli_regexp

Bug 1764224: Update ConsoleCLIDownloads Href validation regexp
openshift · Oct 22, 2019 · 82b963d · 82b963d
2 parents 7d6a732 + 96f1ce4
commit 82b963d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/console/v1/0000_10_consoleclidownload.crd.yaml b/console/v1/0000_10_consoleclidownload.crd.yaml
@@ -79,7 +79,7 @@ spec:
                     description: href is the absolute secure URL for the link (must
                       use https)
                     type: string
-                    pattern: ^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$
+                    pattern: ^https://
                   text:
                     description: text is the display text for the link
                     type: string
diff --git a/console/v1/0000_10_consolelink.crd.yaml b/console/v1/0000_10_consolelink.crd.yaml
@@ -86,7 +86,7 @@ spec:
               description: href is the absolute secure URL for the link (must use
                 https)
               type: string
-              pattern: ^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$
+              pattern: ^https://
             location:
               description: location determines which location in the console the link
                 will be appended to (ApplicationMenu, HelpMenu, UserMenu, NamespaceDashboard).

diff --git a/console/v1/0000_10_consolenotification.crd.yaml b/console/v1/0000_10_consolenotification.crd.yaml
@@ -76,7 +76,7 @@ spec:
                   description: href is the absolute secure URL for the link (must
                     use https)
                   type: string
-                  pattern: ^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$
+                  pattern: ^https://
                 text:
                   description: text is the display text for the link
                   type: string

diff --git a/console/v1/types.go b/console/v1/types.go
@@ -5,6 +5,6 @@ type Link struct {
 	// text is the display text for the link
 	Text string `json:"text"`
 	// href is the absolute secure URL for the link (must use https)
-	// +kubebuilder:validation:Pattern=`^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$`
+	// +kubebuilder:validation:Pattern=`^https://`
 	Href string `json:"href"`
 }
diff --git a/console/v1/types_console_cli_download.go b/console/v1/types_console_cli_download.go
@@ -29,7 +29,7 @@ type CLIDownloadLink struct {
 	// +optional
 	Text string `json:"text"`
 	// href is the absolute secure URL for the link (must use https)
-	// +kubebuilder:validation:Pattern=`^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$`
+	// +kubebuilder:validation:Pattern=`^https://`
 	Href string `json:"href"`
 }