Merge branch '87-cli-insecure-configuration-parameter' into 'master'

Allow specifying "insecure" flag in the configuration for a particular Database Lab instance. (#87)

# Examples
```
./bin/dblab config create --url "http://stage.example.com" --token "stage_token" --insecure=true stage
```

See merge request postgres-ai/database-lab!70

Author: agneum

README.md

@@ -70,7 +70,7 @@ For stable Docker images see [postgresai/dblab-server](https://hub.docker.com/re
 
 ## Client CLI
 ### Installation
-Install Database Lab client CLI on a Linux acrhitecture (e.g., Ubuntu):
+Install Database Lab client CLI on a Linux architecture (e.g., Ubuntu):
 ```bash
 curl https://gitlab.com/postgres-ai/database-lab/-/raw/master/cli-install.sh | bash
 ```

cmd/cli/commands/config/command_list.go

@@ -33,6 +33,10 @@ func CommandList() []*cli.Command {
 							Usage:    "verification token of Database Lab instance",
 							Required: true,
 						},
+						&cli.BoolFlag{
+							Name:  "insecure",
+							Usage: "allow insecure server connections when using SSL",
+						},
 					},
 				},
 				{
@@ -49,6 +53,10 @@ func CommandList() []*cli.Command {
 							Name:  "token",
 							Usage: "verification token of Database Lab instance",
 						},
+						&cli.BoolFlag{
+							Name:  "insecure",
+							Usage: "allow insecure server connections when using SSL",
+						},
 					},
 				},
 				{

cmd/cli/commands/config/environment.go

@@ -23,6 +23,7 @@ type Environment struct {
 	EnvironmentID string `yaml:"-" json:"environment_id"`
 	URL           string `yaml:"url" json:"url"`
 	Token         string `yaml:"token" json:"token"`
+	Insecure      bool   `yaml:"insecure" json:"insecure"`
 }
 
 // AddEnvironmentToConfig adds a new environment to CLIConfig.
@@ -36,8 +37,9 @@ func AddEnvironmentToConfig(c *cli.Context, cfg *CLIConfig, environmentID string
 	}
 
 	env := Environment{
-		URL:   c.String(commands.URLKey),
-		Token: c.String(commands.TokenKey),
+		URL:      c.String(commands.URLKey),
+		Token:    c.String(commands.TokenKey),
+		Insecure: c.Bool(commands.InsecureKey),
 	}
 
 	if cfg.Environments == nil {
@@ -67,14 +69,18 @@ func updateEnvironmentInConfig(c *cli.Context, cfg *CLIConfig, environmentID str
 
 	newEnvironment := environment
 
-	if c.String(commands.URLKey) != "" {
+	if c.IsSet(commands.URLKey) {
 		newEnvironment.URL = c.String(commands.URLKey)
 	}
 
-	if c.String(commands.TokenKey) != "" {
+	if c.IsSet(commands.TokenKey) {
 		newEnvironment.Token = c.String(commands.TokenKey)
 	}
 
+	if c.IsSet(commands.InsecureKey) {
+		newEnvironment.Insecure = c.Bool(commands.InsecureKey)
+	}
+
 	if newEnvironment == environment {
 		return errors.New("config unchanged. Set different option values to update.") // nolint
 	}

cmd/cli/main.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"strconv"
 
 	"github.com/urfave/cli/v2"
 
@@ -17,7 +18,7 @@ import (
 )
 
 const (
-	version = "v0.0.1"
+	version = "v0.2.1"
 )
 
 func main() {
@@ -81,17 +82,23 @@ func loadEnvironmentParams(c *cli.Context) error {
 
 	currentEnv := cfg.CurrentEnvironment
 	if env, ok := cfg.Environments[currentEnv]; ok {
-		if c.String(commands.URLKey) == "" {
+		if !c.IsSet(commands.URLKey) {
 			if err := c.Set(commands.URLKey, env.URL); err != nil {
 				return err
 			}
 		}
 
-		if c.String(commands.TokenKey) == "" {
+		if !c.IsSet(commands.TokenKey) {
 			if err := c.Set(commands.TokenKey, env.Token); err != nil {
 				return err
 			}
 		}
+
+		if !c.IsSet(commands.InsecureKey) {
+			if err := c.Set(commands.InsecureKey, strconv.FormatBool(env.Insecure)); err != nil {
+				return err
+			}
+		}
 	}
 
 	return nil