Add --osmconfig flag

tamalsaha · tamalsaha · commit 3bbc1ac7adc4 · 2017-07-01T22:55:51.000-07:00
diff --git a/pkg/cmds/config/current.go b/pkg/cmds/config/current.go
@@ -18,14 +18,14 @@ func newCmdCurrent() *cobra.Command {
 				cmd.Help()
 				os.Exit(1)
 			}
-			currentContext()
+			currentContext(otx.GetConfigPath(cmd))
 		},
 	}
 	return setCmd
 }
 
-func currentContext() {
-	config, err := otx.LoadConfig()
+func currentContext(configPath string) {
+	config, err := otx.LoadConfig(configPath)
 	term.ExitOnError(err)
 
 	term.Infoln(config.CurrentContext)
diff --git a/pkg/cmds/config/get.go b/pkg/cmds/config/get.go
@@ -19,14 +19,14 @@ func newCmdGet() *cobra.Command {
 				cmd.Help()
 				os.Exit(1)
 			}
-			getContexts()
+			getContexts(otx.GetConfigPath(cmd))
 		},
 	}
 	return setCmd
 }
 
-func getContexts() {
-	config, err := otx.LoadConfig()
+func getContexts(configPath string) {
+	config, err := otx.LoadConfig(configPath)
 	term.ExitOnError(err)
 
 	table := tablewriter.NewWriter(os.Stdout)
diff --git a/pkg/cmds/config/set.go b/pkg/cmds/config/set.go
@@ -54,7 +54,7 @@ func newCmdSet() *cobra.Command {
 			}
 
 			req.Name = args[0]
-			setContext(req)
+			setContext(req, otx.GetConfigPath(cmd))
 		},
 	}
 	setCmd.Flags().StringVar(&req.Provider, "provider", "", "Cloud storage provider")
@@ -83,7 +83,7 @@ func newCmdSet() *cobra.Command {
 	return setCmd
 }
 
-func setContext(req *setContextRequest) {
+func setContext(req *setContextRequest, configPath string) {
 	nc := &otx.Context{
 		Name:     req.Name,
 		Provider: req.Provider,
@@ -149,7 +149,7 @@ func setContext(req *setContextRequest) {
 		term.Fatalln("Unknown provider:" + req.Provider)
 	}
 
-	config, _ := otx.LoadConfig()
+	config, _ := otx.LoadConfig(configPath)
 	if config == nil {
 		config = &otx.OSMConfig{
 			Contexts: make([]*otx.Context, 0),
@@ -168,6 +168,6 @@ func setContext(req *setContextRequest) {
 		config.Contexts = append(config.Contexts, nc)
 	}
 	config.CurrentContext = req.Name
-	err := config.Save()
+	err := config.Save(configPath)
 	term.ExitOnError(err)
 }
diff --git a/pkg/cmds/config/use.go b/pkg/cmds/config/use.go
@@ -24,14 +24,14 @@ func newCmdUse() *cobra.Command {
 			}
 
 			name := args[0]
-			useContex(name)
+			useContex(name, otx.GetConfigPath(cmd))
 		},
 	}
 	return setCmd
 }
 
-func useContex(name string) {
-	config, err := otx.LoadConfig()
+func useContex(name, configPath string) {
+	config, err := otx.LoadConfig(configPath)
 	term.ExitOnError(err)
 
 	if config.CurrentContext == name {
@@ -50,6 +50,6 @@ func useContex(name string) {
 	}
 
 	config.CurrentContext = name
-	err = config.Save()
+	err = config.Save(configPath)
 	term.ExitOnError(err)
 }
diff --git a/pkg/cmds/config/view.go b/pkg/cmds/config/view.go
@@ -19,14 +19,14 @@ func newCmdView() *cobra.Command {
 				cmd.Help()
 				os.Exit(1)
 			}
-			viewContext()
+			viewContext(otx.GetConfigPath(cmd))
 		},
 	}
 	return setCmd
 }
 
-func viewContext() {
-	config, err := otx.LoadConfig()
+func viewContext(configPath string) {
+	config, err := otx.LoadConfig(configPath)
 	term.ExitOnError(err)
 
 	data, err := yaml.Marshal(config)
diff --git a/pkg/cmds/lc.go b/pkg/cmds/lc.go
@@ -26,16 +26,16 @@ func NewCmdListContainers() *cobra.Command {
 				os.Exit(1)
 			}
 
-			listContainers(req)
+			listContainers(req, otx.GetConfigPath(cmd))
 		},
 	}
 
 	cmd.Flags().StringVarP(&req.context, "context", "", "", "Name of osmconfig context to use")
 	return cmd
 }
 
-func listContainers(req *containerListRequest) {
-	cfg, err := otx.LoadConfig()
+func listContainers(req *containerListRequest, configPath string) {
+	cfg, err := otx.LoadConfig(configPath)
 	term.ExitOnError(err)
 
 	loc, err := cfg.Dial(req.context)
diff --git a/pkg/cmds/ls.go b/pkg/cmds/ls.go
@@ -34,7 +34,7 @@ func NewCmdListIetms() *cobra.Command {
 			}
 
 			req.container = args[0]
-			listItems(req)
+			listItems(req, otx.GetConfigPath(cmd))
 		},
 	}
 
@@ -44,8 +44,8 @@ func NewCmdListIetms() *cobra.Command {
 	return cmd
 }
 
-func listItems(req *itemListRequest) {
-	cfg, err := otx.LoadConfig()
+func listItems(req *itemListRequest, configPath string) {
+	cfg, err := otx.LoadConfig(configPath)
 	term.ExitOnError(err)
 
 	loc, err := cfg.Dial(req.context)
diff --git a/pkg/cmds/mc.go b/pkg/cmds/mc.go
@@ -30,16 +30,16 @@ func NewCmdMakeContainer() *cobra.Command {
 			}
 
 			req.container = args[0]
-			makeContainer(req)
+			makeContainer(req, otx.GetConfigPath(cmd))
 		},
 	}
 
 	cmd.Flags().StringVarP(&req.context, "context", "", "", "Name of osmconfig context to use")
 	return cmd
 }
 
-func makeContainer(req *containerMakeRequest) {
-	cfg, err := otx.LoadConfig()
+func makeContainer(req *containerMakeRequest, configPath string) {
+	cfg, err := otx.LoadConfig(configPath)
 	term.ExitOnError(err)
 
 	loc, err := cfg.Dial(req.context)
diff --git a/pkg/cmds/pull.go b/pkg/cmds/pull.go
@@ -36,7 +36,7 @@ func NewCmdPull() *cobra.Command {
 
 			req.srcID = args[0]
 			req.destPath = args[1]
-			pull(req)
+			pull(req, otx.GetConfigPath(cmd))
 		},
 	}
 
@@ -45,8 +45,8 @@ func NewCmdPull() *cobra.Command {
 	return cmd
 }
 
-func pull(req *itemPullRequest) {
-	cfg, err := otx.LoadConfig()
+func pull(req *itemPullRequest, configPath string) {
+	cfg, err := otx.LoadConfig(configPath)
 	term.ExitOnError(err)
 
 	loc, err := cfg.Dial(req.context)
diff --git a/pkg/cmds/push.go b/pkg/cmds/push.go
@@ -35,7 +35,7 @@ func NewCmdPush() *cobra.Command {
 
 			req.srcPath = args[0]
 			req.destID = args[1]
-			push(req)
+			push(req, otx.GetConfigPath(cmd))
 		},
 	}
 
@@ -44,8 +44,8 @@ func NewCmdPush() *cobra.Command {
 	return cmd
 }
 
-func push(req *itemPushRequest) {
-	cfg, err := otx.LoadConfig()
+func push(req *itemPushRequest, configPath string) {
+	cfg, err := otx.LoadConfig(configPath)
 	term.ExitOnError(err)
 
 	loc, err := cfg.Dial(req.context)
diff --git a/pkg/cmds/rc.go b/pkg/cmds/rc.go
@@ -32,7 +32,7 @@ func NewCmdRemoveContainer() *cobra.Command {
 			}
 
 			req.container = args[0]
-			removeContainer(req)
+			removeContainer(req, otx.GetConfigPath(cmd))
 		},
 	}
 
@@ -41,8 +41,8 @@ func NewCmdRemoveContainer() *cobra.Command {
 	return cmd
 }
 
-func removeContainer(req *containerRemoveRequest) {
-	cfg, err := otx.LoadConfig()
+func removeContainer(req *containerRemoveRequest, configPath string) {
+	cfg, err := otx.LoadConfig(configPath)
 	term.ExitOnError(err)
 
 	loc, err := cfg.Dial(req.context)
diff --git a/pkg/cmds/rm.go b/pkg/cmds/rm.go
@@ -31,7 +31,7 @@ func NewCmdRemove() *cobra.Command {
 			}
 
 			req.itemID = args[0]
-			removeItem(req)
+			removeItem(req, otx.GetConfigPath(cmd))
 		},
 	}
 
@@ -40,8 +40,8 @@ func NewCmdRemove() *cobra.Command {
 	return cmd
 }
 
-func removeItem(req *itemRemoveRequest) {
-	cfg, err := otx.LoadConfig()
+func removeItem(req *itemRemoveRequest, configPath string) {
+	cfg, err := otx.LoadConfig(configPath)
 	term.ExitOnError(err)
 
 	loc, err := cfg.Dial(req.context)
diff --git a/pkg/cmds/root.go b/pkg/cmds/root.go
@@ -5,6 +5,7 @@ import (
 
 	v "github.com/appscode/go/version"
 	cfgCmd "github.com/appscode/osm/pkg/cmds/config"
+	"github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 )
 
@@ -17,6 +18,8 @@ func NewCmdOsm() *cobra.Command {
 		},
 	}
 	rootCmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
+	home, _ := homedir.Dir()
+	rootCmd.PersistentFlags().String("osmconfig", home+"/.osm/config", "Path to osm config")
 
 	rootCmd.AddCommand(cfgCmd.NewCmdConfig())
 
diff --git a/pkg/cmds/stat.go b/pkg/cmds/stat.go
@@ -33,7 +33,7 @@ func NewCmdStat() *cobra.Command {
 			}
 
 			req.itemID = args[0]
-			statItem(req)
+			statItem(req, otx.GetConfigPath(cmd))
 		},
 	}
 
@@ -42,8 +42,8 @@ func NewCmdStat() *cobra.Command {
 	return cmd
 }
 
-func statItem(req *itemStatRequest) {
-	cfg, err := otx.LoadConfig()
+func statItem(req *itemStatRequest, configPath string) {
+	cfg, err := otx.LoadConfig(configPath)
 	term.ExitOnError(err)
 
 	loc, err := cfg.Dial(req.context)
diff --git a/pkg/context/lib.go b/pkg/context/lib.go
@@ -8,14 +8,10 @@ import (
 	"path/filepath"
 
 	yc "github.com/appscode/go/encoding/yaml"
+	"github.com/appscode/log"
 	"github.com/ghodss/yaml"
 	"github.com/graymeta/stow"
-	homeDir "github.com/mitchellh/go-homedir"
-)
-
-var (
-	home, _    = homeDir.Dir()
-	configPath = home + "/.osm/config"
+	"github.com/spf13/cobra"
 )
 
 type Context struct {
@@ -29,7 +25,15 @@ type OSMConfig struct {
 	CurrentContext string     `json:"current-context"`
 }
 
-func LoadConfig() (*OSMConfig, error) {
+func GetConfigPath(cmd *cobra.Command) string {
+	s, err := cmd.Flags().GetString("osmconfig")
+	if err != nil {
+		log.Fatalf("error accessing flag osmconfig for command %s: %v", cmd.Name(), err)
+	}
+	return s
+}
+
+func LoadConfig(configPath string) (*OSMConfig, error) {
 	if _, err := os.Stat(configPath); err != nil {
 		return nil, err
 	}
@@ -48,7 +52,7 @@ func LoadConfig() (*OSMConfig, error) {
 	return config, err
 }
 
-func (config *OSMConfig) Save() error {
+func (config *OSMConfig) Save(configPath string) error {
 	data, err := yaml.Marshal(config)
 	if err != nil {
 		return err

Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,14 @@ func newCmdCurrent() *cobra.Command {`
`18`	`18`	`cmd.Help()`
`19`	`19`	`os.Exit(1)`
`20`	`20`	`}`
`21`		`- currentContext()`
	`21`	`+ currentContext(otx.GetConfigPath(cmd))`
`22`	`22`	`},`
`23`	`23`	`}`
`24`	`24`	`return setCmd`
`25`	`25`	`}`
`26`	`26`
`27`		`-func currentContext() {`
`28`		`- config, err := otx.LoadConfig()`
	`27`	`+func currentContext(configPath string) {`
	`28`	`+ config, err := otx.LoadConfig(configPath)`
`29`	`29`	`term.ExitOnError(err)`
`30`	`30`
`31`	`31`	`term.Infoln(config.CurrentContext)`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@ func newCmdGet() *cobra.Command {`
`19`	`19`	`cmd.Help()`
`20`	`20`	`os.Exit(1)`
`21`	`21`	`}`
`22`		`- getContexts()`
	`22`	`+ getContexts(otx.GetConfigPath(cmd))`
`23`	`23`	`},`
`24`	`24`	`}`
`25`	`25`	`return setCmd`
`26`	`26`	`}`
`27`	`27`
`28`		`-func getContexts() {`
`29`		`- config, err := otx.LoadConfig()`
	`28`	`+func getContexts(configPath string) {`
	`29`	`+ config, err := otx.LoadConfig(configPath)`
`30`	`30`	`term.ExitOnError(err)`
`31`	`31`
`32`	`32`	`table := tablewriter.NewWriter(os.Stdout)`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func newCmdSet() *cobra.Command {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`req.Name = args[0]`
`57`		`- setContext(req)`
	`57`	`+ setContext(req, otx.GetConfigPath(cmd))`
`58`	`58`	`},`
`59`	`59`	`}`
`60`	`60`	`setCmd.Flags().StringVar(&req.Provider, "provider", "", "Cloud storage provider")`
`@@ -83,7 +83,7 @@ func newCmdSet() *cobra.Command {`
`83`	`83`	`return setCmd`
`84`	`84`	`}`
`85`	`85`
`86`		`-func setContext(req *setContextRequest) {`
	`86`	`+func setContext(req *setContextRequest, configPath string) {`
`87`	`87`	`nc := &otx.Context{`
`88`	`88`	`Name: req.Name,`
`89`	`89`	`Provider: req.Provider,`
`@@ -149,7 +149,7 @@ func setContext(req *setContextRequest) {`
`149`	`149`	`term.Fatalln("Unknown provider:" + req.Provider)`
`150`	`150`	`}`
`151`	`151`
`152`		`- config, _ := otx.LoadConfig()`
	`152`	`+ config, _ := otx.LoadConfig(configPath)`
`153`	`153`	`if config == nil {`
`154`	`154`	`config = &otx.OSMConfig{`
`155`	`155`	`Contexts: make([]*otx.Context, 0),`
`@@ -168,6 +168,6 @@ func setContext(req *setContextRequest) {`
`168`	`168`	`config.Contexts = append(config.Contexts, nc)`
`169`	`169`	`}`
`170`	`170`	`config.CurrentContext = req.Name`
`171`		`- err := config.Save()`
	`171`	`+ err := config.Save(configPath)`
`172`	`172`	`term.ExitOnError(err)`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,14 @@ func newCmdUse() *cobra.Command {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`name := args[0]`
`27`		`- useContex(name)`
	`27`	`+ useContex(name, otx.GetConfigPath(cmd))`
`28`	`28`	`},`
`29`	`29`	`}`
`30`	`30`	`return setCmd`
`31`	`31`	`}`
`32`	`32`
`33`		`-func useContex(name string) {`
`34`		`- config, err := otx.LoadConfig()`
	`33`	`+func useContex(name, configPath string) {`
	`34`	`+ config, err := otx.LoadConfig(configPath)`
`35`	`35`	`term.ExitOnError(err)`
`36`	`36`
`37`	`37`	`if config.CurrentContext == name {`
`@@ -50,6 +50,6 @@ func useContex(name string) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`config.CurrentContext = name`
`53`		`- err = config.Save()`
	`53`	`+ err = config.Save(configPath)`
`54`	`54`	`term.ExitOnError(err)`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@ func newCmdView() *cobra.Command {`
`19`	`19`	`cmd.Help()`
`20`	`20`	`os.Exit(1)`
`21`	`21`	`}`
`22`		`- viewContext()`
	`22`	`+ viewContext(otx.GetConfigPath(cmd))`
`23`	`23`	`},`
`24`	`24`	`}`
`25`	`25`	`return setCmd`
`26`	`26`	`}`
`27`	`27`
`28`		`-func viewContext() {`
`29`		`- config, err := otx.LoadConfig()`
	`28`	`+func viewContext(configPath string) {`
	`29`	`+ config, err := otx.LoadConfig(configPath)`
`30`	`30`	`term.ExitOnError(err)`
`31`	`31`
`32`	`32`	`data, err := yaml.Marshal(config)`
Original file line number	Diff line number	Diff line change
`@@ -26,16 +26,16 @@ func NewCmdListContainers() *cobra.Command {`
`26`	`26`	`os.Exit(1)`
`27`	`27`	`}`
`28`	`28`
`29`		`- listContainers(req)`
	`29`	`+ listContainers(req, otx.GetConfigPath(cmd))`
`30`	`30`	`},`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`cmd.Flags().StringVarP(&req.context, "context", "", "", "Name of osmconfig context to use")`
`34`	`34`	`return cmd`
`35`	`35`	`}`
`36`	`36`
`37`		`-func listContainers(req *containerListRequest) {`
`38`		`- cfg, err := otx.LoadConfig()`
	`37`	`+func listContainers(req *containerListRequest, configPath string) {`
	`38`	`+ cfg, err := otx.LoadConfig(configPath)`
`39`	`39`	`term.ExitOnError(err)`
`40`	`40`
`41`	`41`	`loc, err := cfg.Dial(req.context)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func NewCmdListIetms() *cobra.Command {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`req.container = args[0]`
`37`		`- listItems(req)`
	`37`	`+ listItems(req, otx.GetConfigPath(cmd))`
`38`	`38`	`},`
`39`	`39`	`}`
`40`	`40`
`@@ -44,8 +44,8 @@ func NewCmdListIetms() *cobra.Command {`
`44`	`44`	`return cmd`
`45`	`45`	`}`
`46`	`46`
`47`		`-func listItems(req *itemListRequest) {`
`48`		`- cfg, err := otx.LoadConfig()`
	`47`	`+func listItems(req *itemListRequest, configPath string) {`
	`48`	`+ cfg, err := otx.LoadConfig(configPath)`
`49`	`49`	`term.ExitOnError(err)`
`50`	`50`
`51`	`51`	`loc, err := cfg.Dial(req.context)`
Original file line number	Diff line number	Diff line change
`@@ -30,16 +30,16 @@ func NewCmdMakeContainer() *cobra.Command {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`req.container = args[0]`
`33`		`- makeContainer(req)`
	`33`	`+ makeContainer(req, otx.GetConfigPath(cmd))`
`34`	`34`	`},`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`cmd.Flags().StringVarP(&req.context, "context", "", "", "Name of osmconfig context to use")`
`38`	`38`	`return cmd`
`39`	`39`	`}`
`40`	`40`
`41`		`-func makeContainer(req *containerMakeRequest) {`
`42`		`- cfg, err := otx.LoadConfig()`
	`41`	`+func makeContainer(req *containerMakeRequest, configPath string) {`
	`42`	`+ cfg, err := otx.LoadConfig(configPath)`
`43`	`43`	`term.ExitOnError(err)`
`44`	`44`
`45`	`45`	`loc, err := cfg.Dial(req.context)`