config/types: Add validation for gcs urls

coreos · Jun 16, 2020 · def568e · def568e
1 parent 5d55fc5
commit def568e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 3 deletions.
diff --git a/config/v3_0/types/url.go b/config/v3_0/types/url.go
@@ -30,7 +30,7 @@ func validateURL(s string) error {
 	}
 
 	switch u.Scheme {
-	case "http", "https", "tftp":
+	case "http", "https", "tftp", "gs":
 		return nil
 	case "s3":
 		if v, ok := u.Query()["versionId"]; ok {

diff --git a/config/v3_0/types/url_test.go b/config/v3_0/types/url_test.go
@@ -66,6 +66,10 @@ func TestURLValidate(t *testing.T) {
 			util.StrToPtr("s3://bucket/key?versionId=aVersionHash"),
 			nil,
 		},
+		{
+			util.StrToPtr("gs://bucket/object"),
+			nil,
+		},
 	}
 
 	for i, test := range tests {

diff --git a/config/v3_1/types/url.go b/config/v3_1/types/url.go
@@ -30,7 +30,7 @@ func validateURL(s string) error {
 	}
 
 	switch u.Scheme {
-	case "http", "https", "tftp":
+	case "http", "https", "tftp", "gs":
 		return nil
 	case "s3":
 		if v, ok := u.Query()["versionId"]; ok {

diff --git a/config/v3_1/types/url_test.go b/config/v3_1/types/url_test.go
@@ -66,6 +66,10 @@ func TestURLValidate(t *testing.T) {
 			util.StrToPtr("s3://bucket/key?versionId=aVersionHash"),
 			nil,
 		},
+		{
+			util.StrToPtr("gs://bucket/object"),
+			nil,
+		},
 	}
 
 	for i, test := range tests {

diff --git a/config/v3_2_experimental/types/url.go b/config/v3_2_experimental/types/url.go
@@ -30,7 +30,7 @@ func validateURL(s string) error {
 	}
 
 	switch u.Scheme {
-	case "http", "https", "tftp":
+	case "http", "https", "tftp", "gs":
 		return nil
 	case "s3":
 		if v, ok := u.Query()["versionId"]; ok {

diff --git a/config/v3_2_experimental/types/url_test.go b/config/v3_2_experimental/types/url_test.go
@@ -66,6 +66,10 @@ func TestURLValidate(t *testing.T) {
 			util.StrToPtr("s3://bucket/key?versionId=aVersionHash"),
 			nil,
 		},
+		{
+			util.StrToPtr("gs://bucket/object"),
+			nil,
+		},
 	}
 
 	for i, test := range tests {