fix(spec): Default apiServer URL to https (#289)

Defaults the apiServer URL scheme to `https://` if unset. Also fixes the message printed by `tk init` to include the scheme
grafana · Jun 30, 2020 · a61d852 · a61d852
1 parent 247e2be
commit a61d852
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/cmd/tk/init.go b/cmd/tk/init.go
@@ -60,7 +60,7 @@ func initCmd() *cli.Command {
 			}
 		}
 
-		fmt.Println("Directory structure set up! Remember to configure the API endpoint:\n`tk env set environments/default --server=127.0.0.1:6443`")
+		fmt.Println("Directory structure set up! Remember to configure the API endpoint:\n`tk env set environments/default --server=https://127.0.0.1:6443`")
 		if failed {
 			log.Println("Errors occured while initializing the project. Check the above logs for details.")
 		}

diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go
@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"regexp"
 
 	"github.com/pkg/errors"
 
@@ -55,6 +56,12 @@ func Parse(data []byte, name string) (*v1alpha1.Config, error) {
 	if err := handleDeprecated(config, data); err != nil {
 		return config, err
 	}
+
+	// default apiServer URL to https
+	if !regexp.MustCompile("^.+://").MatchString(config.Spec.APIServer) {
+		config.Spec.APIServer = "https://" + config.Spec.APIServer
+	}
+
 	return config, nil
 }