Loose http_proxy and https_proxy check

vmware · Jul 31, 2018 · ffa39e2 · ffa39e2
1 parent e56c686
commit ffa39e2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 26 deletions.
diff --git a/cmd/vic-machine/common/proxy.go b/cmd/vic-machine/common/proxy.go
@@ -52,19 +52,25 @@ func (p *Proxies) ProcessProxies() (hproxy, sproxy *url.URL, err error) {
 		p.IsSet = true
 	}
 	if p.HTTPProxy != nil && *p.HTTPProxy != "" {
-		hproxy, err = url.Parse(*p.HTTPProxy)
-		if err != nil || hproxy.Host == "" || hproxy.Scheme != "http" {
-			err = cli.NewExitError(fmt.Sprintf("Could not parse HTTP proxy - expected format http://fqnd_or_ip:port: %s", *p.HTTPProxy), 1)
+		hproxy, err = p.validate(*p.HTTPProxy)
+		if err != nil {
 			return
 		}
 	}
 
 	if p.HTTPSProxy != nil && *p.HTTPSProxy != "" {
-		sproxy, err = url.Parse(*p.HTTPSProxy)
-		if err != nil || sproxy.Host == "" || sproxy.Scheme != "https" {
-			err = cli.NewExitError(fmt.Sprintf("Could not parse HTTPS proxy - expected format https://fqnd_or_ip:port: %s", *p.HTTPSProxy), 1)
-			return
-		}
+		sproxy, err = p.validate(*p.HTTPSProxy)
+	}
+	return
+}
+
+func (p *Proxies) validate(ref string) (proxy *url.URL, err error) {
+	proxy, err = url.Parse(ref)
+	if err != nil {
+		return
+	}
+	if proxy.Host == "" || (proxy.Scheme != "http" && proxy.Scheme != "https") {
+		err = cli.NewExitError(fmt.Sprintf("Could not parse HTTP(S) proxy - expected format http(s)://fqnd_or_ip:port: %s", ref), 1)
 	}
 	return
 }
diff --git a/tests/test-cases/Group23-VIC-Machine-Service/23-03-VCH-Create.robot b/tests/test-cases/Group23-VIC-Machine-Service/23-03-VCH-Create.robot
@@ -418,24 +418,6 @@ Fail to create a VCH specifying an ID
 #    Delete Path Under Target    vch/${id}
 
 
-Fail to create VCH where http != https (on http key/pair) in image_fetch_proxy - registry settings
-    Create VCH    '{"name":"%{VCH-NAME}-invalid_registry","compute":{"resource":{"name":"%{TEST_RESOURCE}"}},"storage":{"image_stores":["ds://%{TEST_DATASTORE}"]},"network":{"bridge":{"ip_range":"172.16.0.0/12","port_group":{"name":"%{BRIDGE_NETWORK}"}},"public":{"port_group":{"name":"${PUBLIC_NETWORK}"}}},"registry":{"image_fetch_proxy":{"http":"https://example.com","https":"https://example.com"},"insecure":["https://insecure.example.com"],"whitelist":["10.0.0.0/8"]},"auth":{"server":{"generate":{"cname":"vch.example.com","organization":["VMware, Inc."],"size":{"value":2048,"units":"bits"}}},"client":{"no_tls_verify": true}}}'
-
-    Verify Return Code
-    Verify Status Bad Request
-
-    Output Should Contain    error processing proxies: Could not parse HTTP proxy
-
-
-Fail to create VCH where https != http (on https key/pair) in image_fetch_proxy - registry settings
-    Create VCH    '{"name":"%{VCH-NAME}-invalid_registry","compute":{"resource":{"name":"%{TEST_RESOURCE}"}},"storage":{"image_stores":["ds://%{TEST_DATASTORE}"]},"network":{"bridge":{"ip_range":"172.16.0.0/12","port_group":{"name":"%{BRIDGE_NETWORK}"}},"public":{"port_group":{"name":"${PUBLIC_NETWORK}"}}},"registry":{"image_fetch_proxy":{"http":"http://example.com","https":"http://example.com"},"insecure":["https://insecure.example.com"],"whitelist":["10.0.0.0/8"]},"auth":{"server":{"generate":{"cname":"vch.example.com","organization":["VMware, Inc."],"size":{"value":2048,"units":"bits"}}},"client":{"no_tls_verify": true}}}'
-
-    Verify Return Code
-    Verify Status Bad Request
-
-    Output Should Contain    error processing proxies: Could not parse HTTPS proxy
-
-
 Fail to create VCH where whitelist contains an int and not string - registry settings
     Create VCH    '{"name":"%{VCH-NAME}-invalid_registry","compute":{"resource":{"name":"%{TEST_RESOURCE}"}},"storage":{"image_stores":["ds://%{TEST_DATASTORE}"]},"network":{"bridge":{"ip_range":"172.16.0.0/12","port_group":{"name":"%{BRIDGE_NETWORK}"}},"public":{"port_group":{"name":"${PUBLIC_NETWORK}"}}},"registry":{"image_fetch_proxy":{"http":"http://example.com","https":"https://example.com"},"insecure":["https://insecure.example.com"],"whitelist":[100008]},"auth":{"server":{"generate":{"cname":"vch.example.com","organization":["VMware, Inc."],"size":{"value":2048,"units":"bits"}}},"client":{"no_tls_verify": true}}}'