Merge branch 'main' into enable-krew-automation

.github/workflows/release.yaml

@@ -1,8 +1,8 @@
 name: release
 on:
-  push:
-    tags:
-    - 'v*.*.*'
+  release:
+    types: [published]
+
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
@@ -11,17 +11,20 @@ jobs:
       uses: actions/checkout@v3
       with:
           fetch-depth: 0
+
     - name: Setup Go
       uses: actions/setup-go@v1
       with:
         go-version: 1.18
+
     - name: GoReleaser
       uses: goreleaser/goreleaser-action@v1
       with:
         version: latest
         args: release --rm-dist
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Update new version in krew-index
-      uses: rajatjindal/[email protected]
+        VERSION: ${{ github.event.release.tag_name }}
 
+    - name: Update new version in krew-index
+      uses: rajatjindal/[email protected]

.goreleaser.yml

@@ -5,6 +5,8 @@ builds:
 - id: kubectl-permissions
   main: ./cmd/kubectl-permissions.go
   binary: kubectl-permissions
+  ldflags:
+    - -X github.com/garethjevans/permissions/pkg/version.Version={{.Version}}
   env:
   - CGO_ENABLED=0
   goos:

Makefile

@@ -1,5 +1,5 @@
 build:
-	go build -o kubectl-permissions cmd/kubectl-permissions.go
+	go build -o kubectl-permissions -trimpath -ldflags "-X github.com/garethjevans/permissions/pkg/version.Version=dev" cmd/kubectl-permissions.go
 
 install: build
 	sudo cp -f kubectl-permissions /usr/local/bin

pkg/cmd/permissions.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/garethjevans/permissions/pkg/asciitree"
+	"github.com/garethjevans/permissions/pkg/version"
 	"github.com/kyokomi/emoji/v2"
 	"github.com/mgutz/ansi"
 	"github.com/spf13/cobra"
@@ -38,6 +39,8 @@ type PermissionsOptions struct {
 	configFlags *genericclioptions.ConfigFlags
 	genericclioptions.IOStreams
 
+	Version bool
+
 	Cmd  *cobra.Command
 	Args []string
 }
@@ -59,7 +62,7 @@ func NewCmdPermissions(streams genericclioptions.IOStreams) *cobra.Command {
 		Short:        "View the permissions inherited by the specified service account",
 		Example:      fmt.Sprintf(permissionsExample, binaryName),
 		SilenceUsage: true,
-		Args:         cobra.ExactArgs(1),
+		Args:         cobra.MaximumNArgs(1),
 		RunE: func(c *cobra.Command, args []string) error {
 			o.Args = args
 			o.Cmd = c
@@ -70,6 +73,8 @@ func NewCmdPermissions(streams genericclioptions.IOStreams) *cobra.Command {
 		},
 	}
 
+	cmd.Flags().BoolVarP(&o.Version, "version", "v", false, "Display the version of the permissions plugin")
+
 	o.configFlags.AddFlags(cmd.Flags())
 
 	return cmd
@@ -78,6 +83,14 @@ func NewCmdPermissions(streams genericclioptions.IOStreams) *cobra.Command {
 // Run lists all available namespaces on a user's KUBECONFIG or updates the
 // current context based on a provided namespace.
 func (o *PermissionsOptions) Run() error {
+	if o.Version {
+		fmt.Println(version.Version)
+		return nil
+	}
+
+	if len(o.Args) != 1 {
+		panic(fmt.Sprintf("Error: accepts 1 arg(s), received %d", len(o.Args)))
+	}
 
 	var err error
 	config, err := o.configFlags.ToRESTConfig()

pkg/version/info.go

@@ -0,0 +1,3 @@
+package version
+
+var Version string