New package defines .kubernetes_auth format.

Refactored common code to that package.
Subsequent PRs will load and emit these files.

pkg/kubectl/cmd/cmd.go

@@ -175,7 +175,9 @@ func GetKubeConfig(cmd *cobra.Command) *client.Config {
 		// command line). Override them with the command line parameters, if
 		// provided.
 		authPath := GetFlagString(cmd, "auth-path")
-		authInfo, err := kubectl.LoadAuthInfo(authPath, os.Stdin)
+		authInfo, err := kubectl.LoadClientAuthInfoOrPrompt(authPath, os.Stdin)
+		// TODO: handle the case where the file could not be written but
+		// we still got a user/pass from prompting.
 		if err != nil {
 			glog.Fatalf("Error loading auth: %v", err)
 		}

pkg/kubectl/kubectl.go

@@ -28,6 +28,7 @@ import (
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/clientauth"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/version"
@@ -56,16 +57,6 @@ func GetKubeClient(config *client.Config, matchVersion bool) (*client.Client, er
 	return c, nil
 }
 
-type AuthInfo struct {
-	User        string
-	Password    string
-	CAFile      string
-	CertFile    string
-	KeyFile     string
-	BearerToken string
-	Insecure    *bool
-}
-
 type NamespaceInfo struct {
 	Namespace string
 }
@@ -99,9 +90,10 @@ func SaveNamespaceInfo(path string, ns *NamespaceInfo) error {
 	return err
 }
 
-// LoadAuthInfo parses an AuthInfo object from a file path. It prompts user and creates file if it doesn't exist.
-func LoadAuthInfo(path string, r io.Reader) (*AuthInfo, error) {
-	var auth AuthInfo
+// LoadClientAuthInfoOrPrompt parses an AuthInfo object from a file path. It prompts user and creates file if it doesn't exist.
+func LoadClientAuthInfoOrPrompt(path string, r io.Reader) (*clientauth.Info, error) {
+	var auth clientauth.Info
+	// Prompt for user/pass and write a file if none exists.
 	if _, err := os.Stat(path); os.IsNotExist(err) {
 		auth.User = promptForString("Username", r)
 		auth.Password = promptForString("Password", r)
@@ -112,15 +104,11 @@ func LoadAuthInfo(path string, r io.Reader) (*AuthInfo, error) {
 		err = ioutil.WriteFile(path, data, 0600)
 		return &auth, err
 	}
-	data, err := ioutil.ReadFile(path)
+	authPtr, err := clientauth.LoadFromFile(path)
 	if err != nil {
 		return nil, err
 	}
-	err = json.Unmarshal(data, &auth)
-	if err != nil {
-		return nil, err
-	}
-	return &auth, err
+	return authPtr, nil
 }
 
 func promptForString(field string, r io.Reader) string {

pkg/kubectl/kubectl_test.go

@@ -25,6 +25,7 @@ import (
 	"testing"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/clientauth"
 )
 
 func validateAction(expectedAction, actualAction client.FakeAction, t *testing.T) {
@@ -85,15 +86,15 @@ func TestLoadNamespaceInfo(t *testing.T) {
 	}
 }
 
-func TestLoadAuthInfo(t *testing.T) {
+func TestLoadClientAuthInfoOrPrompt(t *testing.T) {
 	loadAuthInfoTests := []struct {
 		authData string
-		authInfo *AuthInfo
+		authInfo *clientauth.Info
 		r        io.Reader
 	}{
 		{
 			`{"user": "user", "password": "pass"}`,
-			&AuthInfo{User: "user", Password: "pass"},
+			&clientauth.Info{User: "user", Password: "pass"},
 			nil,
 		},
 		{
@@ -101,7 +102,7 @@ func TestLoadAuthInfo(t *testing.T) {
 		},
 		{
 			"missing",
-			&AuthInfo{User: "user", Password: "pass"},
+			&clientauth.Info{User: "user", Password: "pass"},
 			bytes.NewBufferString("user\npass"),
 		},
 	}
@@ -122,10 +123,10 @@ func TestLoadAuthInfo(t *testing.T) {
 			aifile.Close()
 			os.Remove(aifile.Name())
 		}
-		authInfo, err := LoadAuthInfo(aifile.Name(), tt.r)
+		authInfo, err := LoadClientAuthInfoOrPrompt(aifile.Name(), tt.r)
 		if len(tt.authData) == 0 && tt.authData != "missing" {
 			if err == nil {
-				t.Error("LoadAuthInfo didn't fail on empty file")
+				t.Error("LoadClientAuthInfoOrPrompt didn't fail on empty file")
 			}
 			continue
 		}
@@ -133,7 +134,7 @@ func TestLoadAuthInfo(t *testing.T) {
 			t.Errorf("Unexpected error: %v", err)
 		}
 		if !reflect.DeepEqual(authInfo, tt.authInfo) {
-			t.Errorf("Expected %v, got %v", tt.authInfo, authInfo)
+			t.Errorf("Expected %#v, got %#v", tt.authInfo, authInfo)
 		}
 	}
 }