github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

don't require config.Version for IsConfigTransportTLS

Browse Source
This commit is contained in:
deads2k 2015-01-08 10:22:09 -05:00
parent 480635bb72
commit 005f2e1bda
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubecfg/kubecfg.go
View File

@ -212,7 +212,7 @@ func main() {
// TODO: don't specify http or https in Host, and infer that from auth options. // TODO: don't specify http or https in Host, and infer that from auth options.
clientConfig.Host = "http://localhost:8080" clientConfig.Host = "http://localhost:8080"
} }
if client.IsConfigTransportTLS(clientConfig) { if client.IsConfigTransportTLS(*clientConfig) {
auth, err := kubecfg.LoadClientAuthInfoOrPrompt(*authConfig, os.Stdin) auth, err := kubecfg.LoadClientAuthInfoOrPrompt(*authConfig, os.Stdin)
if err != nil { if err != nil {
glog.Fatalf("Error loading auth: %v", err) glog.Fatalf("Error loading auth: %v", err)

2
pkg/client/clientcmd/client_config.go
View File

@ -76,7 +76,7 @@ func (config DirectClientConfig) ClientConfig() (*client.Config, error) {
clientConfig.Version = configClusterInfo.APIVersion clientConfig.Version = configClusterInfo.APIVersion
// only try to read the auth information if we are secure // only try to read the auth information if we are secure
if client.IsConfigTransportTLS(&clientConfig) { if client.IsConfigTransportTLS(clientConfig) {
var authInfo *clientauth.Info var authInfo *clientauth.Info
var err error var err error
switch { switch {

8
pkg/client/helper.go
View File

@ -272,8 +272,12 @@ func DefaultServerURL(host, prefix, version string, defaultTLS bool) (*url.URL,
// //
// Note: the Insecure flag is ignored when testing for this value, so MITM attacks are // Note: the Insecure flag is ignored when testing for this value, so MITM attacks are
// still possible. // still possible.
func IsConfigTransportTLS(config *Config) bool { func IsConfigTransportTLS(config Config) bool {
baseURL, err := defaultServerUrlFor(config) // determination of TLS transport does not logically require a version to be specified
// modify the copy of the config we got to satisfy preconditions for defaultServerUrlFor
config.Version = defaultVersionFor(&config)
baseURL, err := defaultServerUrlFor(&config)
if err != nil { if err != nil {
return false return false
} }

2
pkg/client/helper_test.go
View File

@ -89,7 +89,7 @@ func TestIsConfigTransportTLS(t *testing.T) {
t.Errorf("setting defaults failed for %#v: %v", testCase.Config, err) t.Errorf("setting defaults failed for %#v: %v", testCase.Config, err)
continue continue
} }
useTLS := IsConfigTransportTLS(testCase.Config) useTLS := IsConfigTransportTLS(*testCase.Config)
if testCase.TransportTLS != useTLS { if testCase.TransportTLS != useTLS {
t.Errorf("expected %v for %#v", testCase.TransportTLS, testCase.Config) t.Errorf("expected %v for %#v", testCase.TransportTLS, testCase.Config)
} }