Merge pull request #116 from containerum/chkit-v3

Chkit v3

Author: MargoTuleninova

Gopkg.lock

@@ -9,15 +9,7 @@
 
 [[constraint]]
   name = "github.com/containerum/kube-client"
-  version = "~0.14.2"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/containerum/solutions"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/kardianos/osext"
+  version = "~0.19.0"
 
 [[constraint]]
   branch = "master"
@@ -54,3 +46,15 @@
 [[constraint]]
   name = "github.com/vbauerster/mpb"
   version = "3.2.0"
+
+[[constraint]]
+  name = "git.containerum.net/ch/api-gateway"
+  branch = "develop"
+  
+[[constraint]]
+  branch = "develop"
+  name = "git.containerum.net/ch/auth"
+
+[[constraint]]
+  branch = "develop"
+  name = "git.containerum.net/ch/resource-service"

Gopkg.toml

@@ -1,4 +1,4 @@
-.PHONY: genkey build test clean release single_release
+.PHONY: docker genkey build test clean install release single_release dev mock
 
 CMD_DIR:=cmd/chkit
 CLI_DIR:=pkg/cli
@@ -34,16 +34,17 @@ docker:
 	docker build -t $(CONTAINER_NAME) . \
 		--build-arg ALLOW_SELF_SIGNED_CERTS=$(ALLOW_SELF_SIGNED_CERTS)
 
-
-genkey:
+$(SIGNING_KEY_DIR)/$(PRIVATE_KEY_FILE):
 	@echo "Generating private/public ECDSA keys to sign"
 	@mkdir -p $(SIGNING_KEY_DIR)
 	@openssl ecparam -genkey -name prime256v1 -out $(SIGNING_KEY_DIR)/$(PRIVATE_KEY_FILE)
 	@openssl ec -in $(SIGNING_KEY_DIR)/$(PRIVATE_KEY_FILE) -pubout -out $(SIGNING_KEY_DIR)/$(PUBLIC_KEY_FILE)
 	@echo "Keys stored in $(SIGNING_KEY_DIR)"
 
+genkey: $(SIGNING_KEY_DIR)/$(PRIVATE_KEY_FILE)
+
 # go has build artifacts caching so soruce tracking not needed
-build:
+build: $(SIGNING_KEY_DIR)/$(PRIVATE_KEY_FILE)
 	@echo "Building chkit for current OS/architecture, without signing"
 	go build -v -ldflags="$(RELEASE_LDFLAGS)" -o $(BUILDS_DIR)/$(EXECUTABLE) ./$(CMD_DIR)
 
@@ -86,22 +87,20 @@ endif)
 @$(pack_cmd)
 endef
 
-release:
-	$(eval VERSION=$(LATEST_TAG:v%=%)+release)
+release: $(SIGNING_KEY_DIR)/$(PRIVATE_KEY_FILE)
 	$(call build_release,linux,amd64)
 	$(call build_release,linux,386)
 	$(call build_release,linux,arm)
 	$(call build_release,darwin,amd64)
 	$(call build_release,windows,amd64)
 	$(call build_release,windows,386)
 
-single_release:
+single_release: $(SIGNING_KEY_DIR)/$(PRIVATE_KEY_FILE)
 	$(call build_release,$(OS),$(ARCH))
 
 dev:
 	$(eval VERSION=$(LATEST_TAG:v%=%)+dev)
 	@echo building $(VERSION)
-	@echo $(PACKAGE)
 	go build -v --tags="dev" --ldflags="$(DEV_LDFLAGS)" ./$(CMD_DIR)
 
 mock:

Makefile

@@ -9,6 +9,6 @@ To use it sign up on [Containerum.com](https://containerum.com).
 
 Buid with env
 ```fish
-set -x CONTAINERUM_API "https://api.containerum.io:8082"
+set -x CONTAINERUM_API "https://api.containerum.io"
 make release
 ```

README.md

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/containerum/chkit/pkg/context"
+	"github.com/containerum/chkit/pkg/model/namespace"
 	"github.com/containerum/chkit/pkg/util/activekit"
 	"github.com/sirupsen/logrus"
 )
@@ -19,21 +20,19 @@ func GetDefaultNS(ctx *context.Context, force bool) error {
 	if len(list) == 0 {
 		fmt.Printf("You have no namespaces!\n")
 	} else if force {
-		ctx.Namespace = list[0].Label
-		ctx.Changed = true
+		ctx.SetNamespace(list[0])
 		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 {
+				Label: ns.LabelAndID(),
+				Action: func(ns namespace.Namespace) func() error {
 					return func() error {
-						ctx.Namespace = ns
-						ctx.Changed = true
+						ctx.SetNamespace(ns)
 						return nil
 					}
-				}(ns.Label),
+				}(ns),
 			})
 		}
 		_, err := (&activekit.Menu{

helpers/chkit.go

@@ -0,0 +1 @@
+package clisetup