Merge pull request #2 from b4b4r07/create-config

By default, won't let it create the config

Author: b4b4r07

config.go

@@ -21,17 +21,20 @@ const (
 	envCurlCommand = "IAP_CURL_BIN"
 )
 
+// Config represents
 type Config struct {
 	Services []Service `json:"services"`
 
 	path string
 }
 
+// Service is the URL and its Env pair
 type Service struct {
 	URL string `json:"url"`
 	Env Env    `json:"env"`
 }
 
+// Env represents the environment variables needed to request to IAP-protected app
 type Env struct {
 	Credentials string `json:"GOOGLE_APPLICATION_CREDENTIALS"`
 	ClientID    string `json:"IAP_CLIENT_ID"`
@@ -60,21 +63,16 @@ func configDir() (string, error) {
 	return dir, nil
 }
 
-func (cfg *Config) LoadFile(file string) error {
-	cfg.path = file
-	_, err := os.Stat(file)
+// Create creates config file if it doesn't exist
+func (cfg *Config) Create() error {
+	_, err := os.Stat(cfg.path)
 	if err == nil {
-		raw, _ := ioutil.ReadFile(file)
-		if err := json.Unmarshal(raw, cfg); err != nil {
-			return err
-		}
 		return nil
 	}
-
 	if !os.IsNotExist(err) {
 		return err
 	}
-	f, err := os.Create(file)
+	f, err := os.Create(cfg.path)
 	if err != nil {
 		return err
 	}
@@ -91,7 +89,22 @@ func (cfg *Config) LoadFile(file string) error {
 		}}
 	}
 
-	return json.NewEncoder(f).Encode(cfg)
+	enc := json.NewEncoder(f)
+	enc.SetIndent("", "  ")
+	return enc.Encode(cfg)
+}
+
+// Load loads config file to struct
+func (cfg *Config) Load() error {
+	dir, _ := configDir()
+	file := filepath.Join(dir, "config.json")
+	cfg.path = file
+	_, err := os.Stat(cfg.path)
+	if err != nil {
+		return err
+	}
+	raw, _ := ioutil.ReadFile(cfg.path)
+	return json.Unmarshal(raw, cfg)
 }
 
 func (cfg *Config) getEnvFromFile(url string) (env Env, err error) {
@@ -106,6 +119,7 @@ func (cfg *Config) getEnvFromFile(url string) (env Env, err error) {
 	return
 }
 
+// GetEnv returns Env includes url
 func (cfg *Config) GetEnv(url string) (env Env, err error) {
 	env, _ = cfg.getEnvFromFile(url)
 	credentials := os.Getenv(envCredentials)
@@ -136,21 +150,25 @@ func (cfg *Config) GetEnv(url string) (env Env, err error) {
 	}, nil
 }
 
+// GetURLs returns URLs described in config file
 func (cfg *Config) GetURLs() (list []string) {
 	for _, service := range cfg.Services {
 		list = append(list, service.URL)
 	}
 	return
 }
 
+// Edit edits config file
+// If it doesn't exist, it will be automatically created
 func (cfg *Config) Edit() error {
-	dir, _ := configDir()
-	json := filepath.Join(dir, "config.json")
+	if err := cfg.Create(); err != nil {
+		return err
+	}
 	editor := os.Getenv("EDITOR")
 	if editor == "" {
 		editor = "vim"
 	}
-	command := fmt.Sprintf("%s %s", editor, json)
+	command := fmt.Sprintf("%s %s", editor, cfg.path)
 	var cmd *exec.Cmd
 	if runtime.GOOS == "windows" {
 		cmd = exec.Command("cmd", "/c", command)
@@ -163,6 +181,7 @@ func (cfg *Config) Edit() error {
 	return cmd.Run()
 }
 
+// Registered returns true if url exists in config file
 func (cfg *Config) Registered(url string) bool {
 	u1, _ := neturl.Parse(url)
 	for _, service := range cfg.Services {
@@ -174,6 +193,7 @@ func (cfg *Config) Registered(url string) bool {
 	return false
 }
 
+// Register registers service to config file
 func (cfg *Config) Register(s Service) error {
 	cfg.Services = append(cfg.Services, s)
 	b, err := json.Marshal(cfg)
@@ -184,7 +204,10 @@ func (cfg *Config) Register(s Service) error {
 	if err := json.Indent(&out, b, "", "  "); err != nil {
 		return err
 	}
-	file, _ := os.OpenFile(cfg.path, os.O_WRONLY, 0644)
+	file, err := os.OpenFile(cfg.path, os.O_WRONLY, 0644)
+	if err != nil {
+		return err
+	}
 	w := bufio.NewWriter(file)
 	w.Write(out.Bytes())
 	return w.Flush()

main.go

@@ -7,7 +7,6 @@ import (
 	"net/url"
 	"os"
 	"os/exec"
-	"path/filepath"
 	"runtime"
 	"strings"
 )
@@ -41,40 +40,37 @@ type CLI struct {
 }
 
 type option struct {
-	list bool
-	edit bool
-
-	help    bool
 	version bool
+	help    bool
+	list    bool
+	edit    bool
 }
 
 func main() {
-	cli, err := newCLI(os.Args[1:])
-	if err != nil {
-		panic(err)
-	}
-	os.Exit(cli.run())
+	os.Exit(newCLI(os.Args[1:]).run())
 }
 
-func newCLI(args []string) (CLI, error) {
+func newCLI(args []string) CLI {
 	var c CLI
 
-	// TODO: make it customizable
 	c.stdout = os.Stdout
 	c.stderr = os.Stderr
 
+	// Do not handle error
+	c.cfg.Load()
+
 	for _, arg := range args {
 		switch arg {
+		case "--help":
+			c.opt.help = true
+		case "--version":
+			c.opt.version = true
 		case "--list", "--list-urls":
 			c.opt.list = true
 		case "--edit", "--edit-config":
 			c.opt.edit = true
-		case "--version":
-			c.opt.version = true
-		case "--help":
-			c.opt.help = true
 		default:
-			u, err := url.Parse(arg)
+			u, err := url.ParseRequestURI(arg)
 			if err == nil {
 				c.urls = append(c.urls, *u)
 			} else {
@@ -83,27 +79,21 @@ func newCLI(args []string) (CLI, error) {
 		}
 	}
 
-	dir, _ := configDir()
-	json := filepath.Join(dir, "config.json")
-	if err := c.cfg.LoadFile(json); err != nil {
-		return c, err
-	}
-
-	return c, nil
+	return c
 }
 
 func (c CLI) exit(msg interface{}) int {
 	switch m := msg.(type) {
+	case int:
+		return m
+	case nil:
+		return 0
 	case string:
 		fmt.Fprintf(c.stdout, "%s\n", m)
 		return 0
 	case error:
 		fmt.Fprintf(c.stderr, "[ERROR] %s: %s\n", app, m.Error())
 		return 1
-	case int:
-		return m
-	case nil:
-		return 0
 	default:
 		panic(msg)
 	}
@@ -154,8 +144,8 @@ func (c CLI) run() int {
 
 	authHeader := fmt.Sprintf("'Authorization: Bearer %s'", token)
 	args := append(
-		[]string{"-H", authHeader}, // For IAP header
-		c.args..., // Original args
+		[]string{"-H", authHeader}, // For IAP
+		c.args...,
 	)
 	args = append(args, url)