Enhance monoctl (#98)

* Cleanup config
* Allow forcing authentication
* add wide option
* Enahnce output
* Update kubeconfig with overwrite
* Allow to create multiple rolebindings
* Bump to go 1.19

Author: jastBytes

.github/workflows/golang.yaml

@@ -16,16 +16,16 @@ name: Golang CI
 
 on:
   push:
-    branches: [ main, develop ]
-    tags: [ '!*' ]
+    branches: [main, develop]
+    tags: ["!*"]
   pull_request:
-    branches: [ main, develop ]
+    branches: [main, develop]
 
 env:
   GO_MODULE: github.com/finleap-connect/monoctl
-  GO_VERSION: 1.18.x
+  GO_VERSION: 1.19.x
   GINKGO_VERSION: v1.16.5
-  GO_CI_LINT_VERSION: v1.46.1
+  GO_CI_LINT_VERSION: v1.48.0
 
 jobs:
   lint:
@@ -66,4 +66,4 @@ jobs:
         uses: coverallsapp/[email protected]
         with:
           github-token: ${{ secrets.github_token }}
-          path-to-lcov: coverage.lcov
+          path-to-lcov: coverage.lcov

.github/workflows/publish.yaml

@@ -16,10 +16,10 @@ name: Publish CI
 
 on:
   push:
-    tags: [ 'v*' ]
+    tags: ["v*"]
 
 env:
-  GO_VERSION: 1.18.x
+  GO_VERSION: 1.19.x
 
 jobs:
   build:
@@ -29,8 +29,8 @@ jobs:
 
     strategy:
       matrix:
-        os: [ "linux", "osx", "win" ]
-  
+        os: ["linux", "osx", "win"]
+
     steps:
       - name: Install Go
         uses: actions/setup-go@v2

Makefile

@@ -11,8 +11,6 @@ LATEST_TAG=$(shell git describe --tags $(LATEST_REV))
 
 export 
 
-clean: go-clean tools-clean
-
 # go
 include *go.mk
 

cmd/monoctl/create/cluster.go

@@ -18,8 +18,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net/url"
+	"os"
 
 	"github.com/finleap-connect/monoctl/cmd/monoctl/flags"
 	"github.com/finleap-connect/monoctl/internal/config"
@@ -68,7 +68,7 @@ func NewCreateClusterCmd() *cobra.Command {
 				displayName = name
 			}
 
-			caCertBundle, err := ioutil.ReadFile(caCertBundleFile)
+			caCertBundle, err := os.ReadFile(caCertBundleFile)
 			if err != nil {
 				return fmt.Errorf("failed to read CA certificates from '%s': %s", caCertBundleFile, err)
 			}

cmd/monoctl/create/create.go

@@ -31,7 +31,6 @@ func NewCreateCmd() *cobra.Command {
 	cmd.AddCommand(NewCreateUserCmd())
 	cmd.AddCommand(NewCreateClusterCmd())
 	cmd.AddCommand(NewCreateTenantCmd())
-	cmd.AddCommand(NewCreateKubeConfigCmd())
 	cmd.AddCommand(NewCreateAPITokenCmd())
 
 	return cmd

cmd/monoctl/create/rolebinding.go

@@ -31,14 +31,14 @@ func NewCreateRoleBindingCmd() *cobra.Command {
 	var resource string
 
 	cmd := &cobra.Command{
-		Use:   "rolebinding <EMAIL>",
+		Use:   "rolebinding <EMAIL> [<EMAIL>,...]",
 		Short: "Create rolebinding.",
 		Long:  `Creates a rolebinding for the given user.`,
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			configManager := config.NewLoaderFromExplicitFile(flags.ExplicitFile)
 			return auth_util.RetryOnAuthFail(cmd.Context(), configManager, func(ctx context.Context) error {
-				return usecases.NewCreateRoleBindingUseCase(configManager.GetConfig(), args[0], role, scope, resource).Run(ctx)
+				return usecases.NewCreateRoleBindingUseCase(configManager.GetConfig(), args, role, scope, resource).Run(ctx)
 			})
 		},
 	}

cmd/monoctl/flags/flags.go

@@ -19,4 +19,5 @@ import "time"
 var (
 	Timeout      time.Duration
 	ExplicitFile string
+	ForceAuth    bool
 )

cmd/monoctl/get/get.go

@@ -23,6 +23,7 @@ var showDeleted bool
 var sortBy string
 var sortDescending bool
 var exportFile string
+var wide bool
 
 func getOutputOptions() *output.OutputOptions {
 	sortOpt := output.SortOptions{SortByColumn: sortBy}
@@ -33,7 +34,7 @@ func getOutputOptions() *output.OutputOptions {
 		Format: output.CSV,
 		File:   exportFile,
 	}
-	return &output.OutputOptions{ShowDeleted: showDeleted, SortOptions: sortOpt, ExportOptions: exportOpt}
+	return &output.OutputOptions{ShowDeleted: showDeleted, SortOptions: sortOpt, ExportOptions: exportOpt, Wide: wide}
 }
 
 func NewGetCmd() *cobra.Command {
@@ -62,6 +63,7 @@ func NewGetCmd() *cobra.Command {
 	flags.BoolVar(&sortDescending, "descending", false, "Sort result in descending order.")
 	flags.StringVar(&exportFile, "export", "", "exports the output to a file in CSV format. If no file is specified m8-output.csv will be written in the current directory if it doesn't exists")
 	flags.Lookup("export").NoOptDefVal = "m8-output.csv"
+	flags.BoolVar(&wide, "wide", false, "Show more information on the resources.")
 
 	return cmd
 }

cmd/monoctl/root.go

@@ -44,6 +44,7 @@ users and their roles in a Kubernetes multi-cluster environment.`,
 	fl.AddGoFlagSet(flag.CommandLine)
 	fl.StringVar(&flags.ExplicitFile, "monoconfig", "", "Path to explicit monoskope config file to use for CLI requests")
 	fl.DurationVar(&flags.Timeout, "command-timeout", 10*time.Second, "Timeout for long running commands")
+	fl.BoolVar(&flags.ForceAuth, "force-auth", false, "Force authentication even if authenticated")
 
 	rootCmd.AddCommand(NewVersionCmd())
 	rootCmd.AddCommand(NewCompletionCommand())

cmd/monoctl/update/cluster.go

@@ -18,8 +18,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net/url"
+	"os"
 
 	"github.com/finleap-connect/monoctl/cmd/monoctl/flags"
 	"github.com/finleap-connect/monoctl/internal/config"
@@ -49,7 +49,7 @@ func NewUpdateClusterCmd() *cobra.Command {
 			}
 
 			if caCertBundleFile != "" {
-				caCertBundle, err = ioutil.ReadFile(caCertBundleFile)
+				caCertBundle, err = os.ReadFile(caCertBundleFile)
 				if err != nil {
 					return fmt.Errorf("failed to read CA certificates from '%s': %s", caCertBundleFile, err)
 				}