use os.OpenFile over os.Stat to create config if not exist. fix creating global config entry

Author: nkubala

cmd/skaffold/app/cmd/config/config.go

@@ -17,7 +17,7 @@ limitations under the License.
 package config
 
 type Config struct {
-	Global         *ContextConfig
+	Global         *ContextConfig   `yaml:"global,omitempty"`
 	ContextConfigs []*ContextConfig `yaml:"kubeContexts"`
 }
 

cmd/skaffold/app/cmd/config/util.go

@@ -67,13 +67,8 @@ func resolveConfigFile() error {
 		}
 		configFile = filepath.Join(home, defaultConfigLocation)
 	}
-	_, err = os.Stat(configFile)
-	// TODO(nkubala): create default config?
-	if err != nil {
-		return err
-	}
-
-	return nil
+	_, err = os.OpenFile(configFile, os.O_RDWR|os.O_CREATE, 0644)
+	return err
 }
 
 func ReadConfigForFile(filename string) (*Config, error) {
@@ -120,6 +115,13 @@ func getOrCreateConfigForKubectx() (*ContextConfig, error) {
 		return nil, err
 	}
 	if global {
+		if cfg.Global == nil {
+			newCfg := &ContextConfig{}
+			cfg.Global = newCfg
+			if err := writeFullConfig(cfg); err != nil {
+				return nil, err
+			}
+		}
 		return cfg.Global, nil
 	}
 	for _, contextCfg := range cfg.ContextConfigs {

integration/run_test.go

@@ -1,5 +1,3 @@
-// +build integration
-
 /*
 Copyright 2018 The Skaffold Authors
 
@@ -22,7 +20,6 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"math/rand"
 	"os"
 	"os/exec"
 	"strings"
@@ -246,7 +243,7 @@ func TestListConfig(t *testing.T) {
 		},
 		ContextConfigs: []*config.ContextConfig{
 			{
-				Kubectx:     "test-context",
+				Kubecontext: "test-context",
 				DefaultRepo: "context-local-repository",
 			},
 		},
@@ -273,7 +270,7 @@ func TestListConfig(t *testing.T) {
 			expectedOutput: []string{
 				"global:",
 				"default-repo: global-repository",
-				"kubectx: test-context",
+				"kube-context: test-context",
 				"default-repo: context-local-repository",
 			},
 		},
@@ -309,7 +306,7 @@ func TestSetConfig(t *testing.T) {
 		},
 		ContextConfigs: []*config.ContextConfig{
 			{
-				Kubectx:     "test-context",
+				Kubecontext: "test-context",
 				DefaultRepo: "context-local-repository",
 			},
 		},
@@ -345,7 +342,7 @@ func TestSetConfig(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.description, func(t *testing.T) {
-			value := randomString()
+			value := util.RandomID()
 			args := []string{"config", "set", test.key, value}
 			args = append(args, "-c", cfg)
 			if test.kubectx != "" {
@@ -379,12 +376,3 @@ func TestSetConfig(t *testing.T) {
 		})
 	}
 }
-
-func randomString() string {
-	var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-	b := make([]rune, 16)
-	for i := range b {
-		b[i] = letters[rand.Intn(len(letters))]
-	}
-	return string(b)
-}