Merge pull request #7 from kalgurn/feat/refactoring

Command module refactored for #6

Author: kalgurn

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/release.yaml

@@ -23,7 +23,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           WITH_V: true
-          DRY_RUN: false
+          DRY_RUN: true
 
   test:
     name: Test
@@ -130,6 +130,14 @@ jobs:
       - name: Release Notes
         run:
           git log $(git describe HEAD~ --tags --abbrev=0)..HEAD --pretty='format:* %h %s%n  * %an <%ae>' --no-merges >> ".github/RELEASE_TEMPLATE.md"
+      
+      - name: Bump version and push tag
+        uses: anothrNick/github-tag-action@1.35.0
+        id: tag
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WITH_V: true
+          DRY_RUN: false
 
       - name: Download artifacts
         id: download

.gitignore

@@ -17,4 +17,6 @@ vendor/
 *-test.yaml
 
 # Intermediate binary
-kubeconfig-manager
+kubeconfig-manager
+
+.vscode/

Dockerfile

@@ -0,0 +1,7 @@
+FROM golang:latest
+
+COPY . /app
+WORKDIR /app
+
+RUN go mod download
+RUN go test -v ./...

build.sh

@@ -2,7 +2,7 @@
 
 PACKAGE_NAME="kubeconfig-manager"
 MAIN_PACKAGE="cmd/${PACKAGE_NAME}/main.go"
-COMMAND_PACKAGE="github.com/kalgurn/${PACKAGE_NAME}/internal/command"
+COMMAND_PACKAGE="github.com/kalgurn/${PACKAGE_NAME}/internal/cmd"
 
 BINARY_NAME="${PACKAGE_NAME}-${GOOS}-${GOARCH}"
 

cmd/kubeconfig-manager/main.go

@@ -1,13 +1,11 @@
 package main
 
 import (
-	"os"
-
-	"github.com/kalgurn/kubeconfig-manager/internal/command"
+	"github.com/kalgurn/kubeconfig-manager/internal/cmd"
 )
 
 func main() {
 
-	command.Run(os.Args)
+	cmd.Execute()
 
 }

go.mod

@@ -3,6 +3,8 @@ module github.com/kalgurn/kubeconfig-manager
 go 1.16
 
 require (
-	github.com/pborman/getopt/v2 v2.1.0
+	facette.io/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/spf13/cobra v1.2.1
 	k8s.io/client-go v0.21.2
 )

go.sum

@@ -0,0 +1,50 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/kalgurn/kubeconfig-manager/internal/kubeconfig"
+	log "github.com/kalgurn/kubeconfig-manager/internal/logger"
+	"github.com/spf13/cobra"
+	"k8s.io/client-go/tools/clientcmd/api"
+)
+
+func init() {
+	rootCmd.AddCommand(addCmd)
+}
+
+func AddComposer(cmd *cobra.Command, args []string) error {
+	path := args[0]
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		return fmt.Errorf("no kubeconfig at path %s", path)
+	}
+	importedConfig := kubeconfig.Load(path)
+	err := Add(importedConfig)
+	return err
+
+}
+func Add(cfg *api.Config) error {
+	kubeconfigPath, err := kubeconfig.GetConfigPath()
+	if err != nil {
+		return fmt.Errorf("%s", err)
+	}
+	defaultCfg := kubeconfig.Load(kubeconfigPath)
+	logger = log.NewLogger(Verbose)
+	logger.Debug("merging config from ", cfg, " with ", kubeconfigPath)
+	kubeconfig.Merge(cfg, defaultCfg)
+	logger.Debug("saving config to ", kubeconfigPath)
+	kubeconfig.Save(kubeconfigPath, defaultCfg)
+	logger.Info("config saved")
+	return nil
+}
+
+var addCmd = &cobra.Command{
+	Use:   "add [path to kubeconfig]",
+	Short: "adding kubeconfig context, cluster and user from external to current",
+	Long:  "adding kubeconfig context, cluster and user from external to current",
+	Args:  cobra.MinimumNArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return AddComposer(cmd, args)
+	},
+}

internal/cmd/add.go

@@ -0,0 +1,65 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/kalgurn/kubeconfig-manager/internal/kubeconfig"
+	log "github.com/kalgurn/kubeconfig-manager/internal/logger"
+	"github.com/kalgurn/kubeconfig-manager/internal/rancherClient"
+	"github.com/spf13/cobra"
+)
+
+var (
+	URL     string
+	Token   string
+	Cluster string
+)
+
+func init() {
+	addRancherCmd.Flags().StringVarP(&URL, "url", "u", "", "URL to a Rancher")
+	addRancherCmd.Flags().StringVarP(&Cluster, "cluster", "c", "", "URL to a Rancher")
+	addRancherCmd.Flags().StringVarP(&Token, "token", "t", "", "token to a Rancher")
+	addRancherCmd.MarkFlagRequired("url")
+	addRancherCmd.MarkFlagRequired("cluster")
+	addCmd.AddCommand(addRancherCmd)
+}
+
+func AddRancherComposer(cmd *cobra.Command, args []string) error {
+	URL, _ = cmd.Flags().GetString("url")
+	Token, _ = cmd.Flags().GetString("token")
+	Cluster, _ = cmd.Flags().GetString("cluter")
+
+	err := AddRancher(URL, Cluster, Token)
+
+	return err
+}
+func AddRancher(url string, cluster string, token string) error {
+	kubeconfigPath, err := kubeconfig.GetConfigPath()
+	if err != nil {
+		return fmt.Errorf("%s", err)
+	}
+	defaultCfg := kubeconfig.Load(kubeconfigPath)
+	logger = log.NewLogger(Verbose)
+	logger.Debug("downloading kubeconfig for a cluster", Cluster, "from", URL)
+	rancherCfg, err := rancherClient.GetRancherConfig(url, cluster, token)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	logger.Debug("merging config with ", kubeconfigPath)
+	kubeconfig.Merge(rancherCfg, defaultCfg)
+	logger.Debug("saving config to ", kubeconfigPath)
+	kubeconfig.Save(kubeconfigPath, defaultCfg)
+	logger.Info("config saved")
+	return nil
+}
+
+var addRancherCmd = &cobra.Command{
+	Use:   "rancher --url=[rancher url] --token=[rancher token]",
+	Short: "adding kubeconfig downloaded from a specific rancher installation",
+	Long:  "adding kubeconfig downloaded from a specific rancher installation",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return AddRancherComposer(cmd, args)
+	},
+}