Merge pull request #77 from containerum/chkit-v3

Chkit v3

Author: MargoTuleninova

Gopkg.lock

@@ -30,12 +30,12 @@
   non-go = true
 
 [[constraint]]
-  version = "~0.9.0"
+  version = "~0.10.0"
   name = "git.containerum.net/ch/kube-client"
 
-[[constraint]]
-  name = "k8s.io/apimachinery"
-  version = "kubernetes-1.9.3"
+#[[constraint]]
+#  name = "k8s.io/apimachinery"
+#  version = "kubernetes-1.9.3"
 
 [[constraint]]
   branch = "master"

Gopkg.toml

@@ -1,9 +1,10 @@
 .PHONY: genkey build test clean release single_release
 
-CMD_DIR:=./cmd/chkit
+CMD_DIR:=cmd/chkit
+CLI_DIR:=pkg/cli
 #get current package, assuming it`s in GOPATH sources
-PACKAGE := $(shell go list -f '{{.ImportPath}}' $(CMD_DIR))
-
+PACKAGE := $(shell go list -f '{{.ImportPath}}' ./$(CLI_DIR))
+PACKAGE := $(PACKAGE:%/$(CLI_DIR)=%)
 SIGNING_KEY_DIR:=~/.config/containerum/.chkit-sign
 PRIVATE_KEY_FILE:=privkey.pem
 PUBLIC_KEY_FILE:=pubkey.pem
@@ -17,11 +18,11 @@ VERSION?=$(LATEST_TAG:v%=%)
 # make directory and store path to variable
 BUILDS_DIR:=$(PWD)/build
 EXECUTABLE:=chkit
-DEV_LDFLAGS=-X $(PACKAGE)/cmd.Version=$(VERSION) \
-	-X $(PACKAGE)/pkg/cli/mode.API_ADDR=$(CONTAINERUM_API)
-RELEASE_LDFLAGS=-X $(PACKAGE)/cmd.Version=$(VERSION) \
+DEV_LDFLAGS=-X '$(PACKAGE)/$(CLI_DIR)/mode.API_ADDR=$(CONTAINERUM_API)' \
+	-X '$(PACKAGE)/$(CLI_DIR).VERSION=v$(VERSION)'
+RELEASE_LDFLAGS=-X $(PACKAGE)/$(CLI_DIR).VERSION=v$(VERSION) \
 	-X $(PACKAGE)/pkg/update.PublicKeyB64=\'$(shell base64 -w 0 $(SIGNING_KEY_DIR)/$(PUBLIC_KEY_FILE))\'\
-	-X $(PACKAGE)/pkg/cli/mode.API_ADDR=$(CONTAINERUM_API)
+	-X $(PACKAGE)/$(CLI_DIR)/mode.API_ADDR=$(CONTAINERUM_API)
 
 genkey:
 	@echo "Generating private/public ECDSA keys to sign"
@@ -33,7 +34,7 @@ genkey:
 # go has build artifacts caching so soruce tracking not needed
 build:
 	@echo "Building chkit for current OS/architecture, without signing"
-	@go build $(CMD_DIR) -v -ldflags="$(RELEASE_LDFLAGS)" -o $(BUILDS_DIR)/$(EXECUTABLE)
+	@go build -v -ldflags="$(RELEASE_LDFLAGS)" -o $(BUILDS_DIR)/$(EXECUTABLE) ./$(CMD_DIR)
 
 test:
 	@echo "Running tests"
@@ -63,8 +64,8 @@ $(eval ifeq ($(1),windows)
 else
 	temp_executable=$(temp_build_dir)/$(EXECUTABLE)
 endif)
-@echo go build -tags="dev" -ldflags="$(RELEASE_LDFLAGS)"  -v -o $(temp_executable)
-@GOOS=$(1) GOARCH=$(2) go build -tags="dev" -ldflags="$(RELEASE_LDFLAGS)"  -v -o $(temp_executable)
+@echo go build -tags="dev" -ldflags="$(RELEASE_LDFLAGS)"  -v -o $(temp_executable) ./$(CMD_DIR)
+@GOOS=$(1) GOARCH=$(2) go build -tags="dev" -ldflags="$(RELEASE_LDFLAGS)"  -v -o $(temp_executable) ./$(CMD_DIR)
 @$(call create_checksum,$(temp_executable))
 @$(call create_signature,$(temp_executable))
 $(eval ifeq ($(1),windows)
@@ -89,9 +90,10 @@ single_release:
 dev:
 	$(eval VERSION=$(LATEST_TAG:v%=%)+dev)
 	@echo building $(VERSION)
-	@go build -v --tags="dev" -ldflags="$(DEV_LDFLAGS)" $(CMD_DIR)
+	@echo $(PACKAGE)
+	go build -v --tags="dev" --ldflags="$(DEV_LDFLAGS)" ./$(CMD_DIR)
 
 mock:
 	$(eval VERSION=$(LATEST_TAG:v%=%)+mock)
 	@echo building $(VERSION)
-	@go build -v -tags="dev mock" -ldflags="$(DEV_LDFLAGS)"
+	@go build -v --tags="dev mock" -ldflags="$(DEV_LDFLAGS)" ./$(CMD_DIR)

Makefile

@@ -8,7 +8,7 @@ import (
 )
 
 func main() {
-	if err := cli.Root.Execute(); err != nil {
+	if err := cli.Run(); err != nil {
 		fmt.Printf("%v\n", err)
 		os.Exit(1)
 	}

cmd/chkit/chkit.go

@@ -3,25 +3,25 @@ package clisetup
 import (
 	"github.com/containerum/chkit/pkg/cli/mode"
 	"github.com/containerum/chkit/pkg/client"
-	. "github.com/containerum/chkit/pkg/context"
+	"github.com/containerum/chkit/pkg/context"
 	"github.com/sirupsen/logrus"
 )
 
-func SetupClient() error {
+func SetupClient(ctx *context.Context, debugRequests bool) error {
 	var err error
 	if mode.DEBUG && !mode.MOCK {
-		logrus.WithField("operation", "SetupClient").Debugf("Using test API: %q", GlobalContext.Client.APIaddr)
-		if Config.DebugRequests {
+		logrus.WithField("operation", "SetupClient").Debugf("Using test API: %q", ctx.Client.APIaddr)
+		if debugRequests {
 			logrus.Debugf("verbose requests logs")
-			GlobalContext.Client.Log = logrus.StandardLogger().WriterLevel(logrus.DebugLevel)
+			ctx.Client.Log = logrus.StandardLogger().WriterLevel(logrus.DebugLevel)
 		}
-		err = GlobalContext.Client.Init(chClient.WithTestAPI)
+		err = ctx.Client.Init(chClient.WithTestAPI)
 	} else if mode.DEBUG && mode.MOCK {
 		logrus.Debugf("Using mock API")
-		err = GlobalContext.Client.Init(chClient.WithMock)
+		err = ctx.Client.Init(chClient.WithMock)
 	} else {
-		logrus.Debugf("Using production API: %v", GlobalContext.Client.APIaddr)
-		err = GlobalContext.Client.Init(chClient.WithCommonAPI)
+		logrus.Debugf("Using production API: %v", ctx.Client.APIaddr)
+		err = ctx.Client.Init(chClient.WithCommonAPI)
 	}
 	if err != nil {
 		return err

pkg/cli/clisetup/client.go

@@ -11,27 +11,25 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func SetupConfig() error {
-	config := context.GlobalContext.Client.Config
-	config.Fingerprint = fingerpint.Fingerprint()
-	tokens, err := configuration.LoadTokens()
+func SetupConfig(ctx *context.Context) error {
+	ctx.Client.Fingerprint = fingerpint.Fingerprint()
+	tokens, err := configuration.LoadTokens(ctx)
 	if err != nil && !os.IsNotExist(err) {
 		return ErrUnableToLoadTokens.Wrap(err)
 	} else if os.IsNotExist(err) {
-		if err = configuration.SaveTokens(model.Tokens{}); err != nil {
+		if err = configuration.SaveTokens(ctx, model.Tokens{}); err != nil {
 			logrus.WithError(ErrUnableToSaveTokens.Wrap(err)).Errorf("unable to setup config")
 			return ErrUnableToSaveTokens.Wrap(err)
 		}
 	}
-	config.Tokens = tokens
-	if _, err := url.Parse(config.APIaddr); err != nil {
-		logrus.Debugf("invalid API url: %q", config.APIaddr)
+	ctx.Client.Tokens = tokens
+	if _, err := url.Parse(ctx.Client.APIaddr); err != nil {
+		logrus.Debugf("invalid API url: %q", ctx.Client.APIaddr)
 		return ErrInvalidAPIurl.Wrap(err)
 	}
-	if config.Password == "" || config.Username == "" {
+	if ctx.Client.Password == "" || ctx.Client.Username == "" {
 		logrus.Debugf("invalid username or pass")
 		return ErrInvalidUserInfo
 	}
-	context.GlobalContext.Client.Config = config
 	return nil
 }

pkg/cli/clisetup/config.go

@@ -0,0 +1,45 @@
+package clisetup
+
+import (
+	"fmt"
+
+	"github.com/containerum/chkit/pkg/context"
+	"github.com/containerum/chkit/pkg/util/activekit"
+	"github.com/sirupsen/logrus"
+)
+
+func GetDefaultNS(ctx *context.Context, force bool) error {
+	logrus.Debugf("getting user namespaces list")
+	list, err := ctx.Client.GetNamespaceList()
+	if err != nil {
+		logrus.WithError(err).Errorf("unable to get user namespace list")
+		fmt.Printf("Unable to get default namespace\n")
+		return err
+	}
+	if len(list) == 0 {
+		fmt.Printf("You have no namespaces!\n")
+	} else if force {
+		ctx.Namespace = list[0].Label
+		return nil
+	} else {
+		var menu []*activekit.MenuItem
+		for _, ns := range list {
+			menu = append(menu, &activekit.MenuItem{
+				Label: ns.Label,
+				Action: func(ns string) func() error {
+					return func() error {
+						ctx.Namespace = ns
+						ctx.Changed = true
+						return nil
+					}
+				}(ns.Label),
+			})
+		}
+		_, err := (&activekit.Menu{
+			Title: "Select default namespace",
+			Items: menu,
+		}).Run()
+		return err
+	}
+	return nil
+}

pkg/cli/clisetup/defaultns.go

@@ -1,4 +1,4 @@
-package login
+package clisetup
 
 import (
 	"bufio"
@@ -7,36 +7,47 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/containerum/chkit/pkg/chkitErrors"
 	"github.com/containerum/chkit/pkg/context"
 	"golang.org/x/crypto/ssh/terminal"
 )
 
-func Login() error {
+var (
+	// ErrUnableToReadPassword -- unable to read password
+	ErrUnableToReadPassword chkitErrors.Err = "unable to read password"
+	// ErrUnableToReadUsername -- unable to read username
+	ErrUnableToReadUsername chkitErrors.Err = "unable to read username"
+	// ErrInvalidPassword -- invalid password
+	ErrInvalidPassword chkitErrors.Err = "invalid password"
+	// ErrInvalidUsername -- invalid username
+	ErrInvalidUsername chkitErrors.Err = "invalid username"
+)
+
+func InteractiveLogin(ctx *context.Context) error {
 	var err error
 	var username, pass string
 
-	if strings.TrimSpace(context.GlobalContext.Client.Username) == "" {
+	if strings.TrimSpace(ctx.Client.Username) == "" {
 		username, err = readLogin()
 		if err != nil {
 			return err
 		}
 		if strings.TrimSpace(username) == "" {
 			return ErrInvalidUsername
 		}
-		context.GlobalContext.Client.Username = username
+		ctx.Client.Username = username
 	}
 
-	if strings.TrimSpace(context.GlobalContext.Client.Password) == "" {
+	if strings.TrimSpace(ctx.Client.Password) == "" {
 		pass, err = readPassword()
 		if err != nil {
 			return err
 		}
 		if strings.TrimSpace(pass) == "" {
 			return ErrInvalidPassword
 		}
-		context.GlobalContext.Client.Password = pass
+		ctx.Client.Password = pass
 	}
-
 	return nil
 }
 

pkg/cli/login/input.go pkg/cli/clisetup/login.gopkg/cli/login/input.go renamed to pkg/cli/clisetup/login.go

@@ -0,0 +1,27 @@
+package clisetup
+
+import (
+	"os"
+	"path"
+	"time"
+
+	"github.com/containerum/chkit/pkg/configdir"
+	"github.com/containerum/chkit/pkg/configuration"
+	"github.com/containerum/chkit/pkg/context"
+	"github.com/sirupsen/logrus"
+)
+
+func SetupLogs(ctx *context.Context) error {
+	logrus.SetLevel(logrus.DebugLevel)
+	logrus.SetFormatter(&logrus.TextFormatter{
+		FullTimestamp:   true,
+		TimestampFormat: time.RFC1123,
+	})
+	logFile := path.Join(configdir.LogDir(), configuration.LogFileName())
+	file, err := os.OpenFile(logFile, os.O_CREATE|os.O_APPEND|os.O_WRONLY, os.ModePerm)
+	if err != nil {
+		logrus.Fatalf("error while creating log file: %v", err)
+	}
+	logrus.SetOutput(file)
+	return nil
+}