Use https when Insecure is selected.

This commit is contained in:
Eric Tune 2014-11-12 23:54:54 -08:00
parent 9f2750694c
commit dd3c85be09
2 changed files with 8 additions and 1 deletions

View File

@ -231,7 +231,7 @@ func IsConfigTransportSecure(config *Config) bool {
func defaultServerUrlFor(config *Config) (*url.URL, error) { func defaultServerUrlFor(config *Config) (*url.URL, error) {
version := defaultVersionFor(config) version := defaultVersionFor(config)
// TODO: move the default to secure when the apiserver supports TLS by default // TODO: move the default to secure when the apiserver supports TLS by default
defaultSecure := config.CertFile != "" defaultSecure := config.CertFile != "" || config.Insecure
host := config.Host host := config.Host
if host == "" { if host == "" {
host = "localhost" host = "localhost"

View File

@ -76,6 +76,13 @@ func TestIsConfigTransportSecure(t *testing.T) {
}, },
Secure: false, Secure: false,
}, },
{
Config: &Config{
Host: "1.2.3.4:567",
Insecure: true,
},
Secure: true,
},
} }
for _, testCase := range testCases { for _, testCase := range testCases {
secure := IsConfigTransportSecure(testCase.Config) secure := IsConfigTransportSecure(testCase.Config)