feature: add bash completion for plugin mode of kubectl ctx and kubectl ns

.github/workflows/release.yml

@@ -19,37 +19,22 @@ on:
     - 'v*.*.*'
 jobs:
   goreleaser:
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
       uses: actions/checkout@master
+    - run: git fetch --tags
     - name: Setup Go
       uses: actions/setup-go@v2
       with:
-        go-version: '1.20'
-    - name: Install Snapcraft
-      uses: samuelmeuli/action-snapcraft@v1
-    - name: Setup Snapcraft
-      run: |
-        # https://github.com/goreleaser/goreleaser/issues/1715
-        mkdir -p $HOME/.cache/snapcraft/download
-        mkdir -p $HOME/.cache/snapcraft/stage-packages
+        go-version: '1.22'
     - name: GoReleaser
       uses: goreleaser/goreleaser-action@v2
       with:
         version: latest
-        args: release --rm-dist
+        args: release --clean
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Update new version for plugin 'ctx' in krew-index
-      uses: rajatjindal/[email protected]
-      with:
-        krew_template_file: .krew/ctx.yaml
-    - name: Update new version for plugin 'ns' in krew-index
-      uses: rajatjindal/[email protected]
-      with:
-        krew_template_file: .krew/ns.yaml
-    - name: Publish Snaps to the Snap Store (stable channel)
-      run: for snap in $(ls dist/*.snap); do snapcraft upload --release=stable $snap; done
-      env:
-        SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
+

.goreleaser.yml

@@ -1,3 +1,5 @@
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+
 # Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +16,8 @@
 
 # This is an example goreleaser.yaml file with some sane defaults.
 # Make sure to check the documentation at http://goreleaser.com
+
+version: 2
 before:
   hooks:
     - go mod download
@@ -70,7 +74,11 @@ archives:
   format_overrides:
     - goos: windows
       format: zip
-  files: ["LICENSE"]
+  files:
+    - "LICENSE"
+    - "completion/plugins/kubectl_complete-ctx"
+    - src: "kubectx"
+      dst: "kubectx.sh"
 - id: kubens-archive
   name_template: |-
     kubens_{{ .Tag }}_{{ .Os }}_
@@ -90,28 +98,15 @@ archives:
   format_overrides:
     - goos: windows
       format: zip
-  files: ["LICENSE"]
+  files:
+    - "LICENSE"
+    - "completion/plugins/kubectl_complete-ns"
+    - src: "kubens"
+      dst: "kubens.sh"
 checksum:
   name_template: "checksums.txt"
   algorithm: sha256
 release:
   extra_files:
     - glob: ./kubens
     - glob: ./kubectx
-snapcrafts:
-  - id: kubectx
-    name: kubectx
-    summary: 'kubectx + kubens: Power tools for kubectl'
-    description: |
-      kubectx is a tool to switch between contexts (clusters) on kubectl faster.
-      kubens is a tool to switch between Kubernetes namespaces (and configure them for kubectl) easily.
-    grade: stable
-    confinement: classic
-    base: core20
-    apps:
-      kubectx:
-        command: kubectx
-        completer: completion/kubectx.bash
-      kubens:
-        command: kubens
-        completer: completion/kubens.bash

cmd/kubectx/current.go

@@ -15,11 +15,10 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"io"
 
-	"github.com/pkg/errors"
-
 	"github.com/ahmetb/kubectx/internal/kubeconfig"
 )
 
@@ -30,13 +29,16 @@ func (_op CurrentOp) Run(stdout, _ io.Writer) error {
 	kc := new(kubeconfig.Kubeconfig).WithLoader(kubeconfig.DefaultLoader)
 	defer kc.Close()
 	if err := kc.Parse(); err != nil {
-		return errors.Wrap(err, "kubeconfig error")
+		return fmt.Errorf("kubeconfig error, %w", err)
 	}
 
 	v := kc.GetCurrentContext()
 	if v == "" {
 		return errors.New("current-context is not set")
 	}
 	_, err := fmt.Fprintln(stdout, v)
-	return errors.Wrap(err, "write error")
+	if err != nil {
+		return fmt.Errorf("write error, %w", err)
+	}
+	return nil
 }

cmd/kubectx/delete.go

@@ -15,10 +15,10 @@
 package main
 
 import (
+	"errors"
+	"fmt"
 	"io"
 
-	"github.com/pkg/errors"
-
 	"github.com/ahmetb/kubectx/internal/kubeconfig"
 	"github.com/ahmetb/kubectx/internal/printer"
 )
@@ -34,7 +34,7 @@ func (op DeleteOp) Run(_, stderr io.Writer) error {
 		// TODO inefficiency here. we open/write/close the same file many times.
 		deletedName, wasActiveContext, err := deleteContext(ctx)
 		if err != nil {
-			return errors.Wrapf(err, "error deleting context \"%s\"", deletedName)
+			return fmt.Errorf("error deleting context \"%s\", %w", deletedName, err)
 		}
 		if wasActiveContext {
 			printer.Warning(stderr, "You deleted the current context. Use \"%s\" to select a new context.",
@@ -52,7 +52,7 @@ func deleteContext(name string) (deleteName string, wasActiveContext bool, err e
 	kc := new(kubeconfig.Kubeconfig).WithLoader(kubeconfig.DefaultLoader)
 	defer kc.Close()
 	if err := kc.Parse(); err != nil {
-		return deleteName, false, errors.Wrap(err, "kubeconfig error")
+		return deleteName, false, fmt.Errorf("kubeconfig error, %w", err)
 	}
 
 	cur := kc.GetCurrentContext()
@@ -70,7 +70,7 @@ func deleteContext(name string) (deleteName string, wasActiveContext bool, err e
 	}
 
 	if err := kc.DeleteContextEntry(name); err != nil {
-		return name, false, errors.Wrap(err, "failed to modify yaml doc")
+		return name, false, fmt.Errorf("failed to modify yaml doc, %w", err)
 	}
-	return name, wasActiveContext, errors.Wrap(kc.Save(), "failed to save modified kubeconfig file")
+	return name, wasActiveContext, fmt.Errorf("failed to save modified kubeconfig file, %w", kc.Save())
 }

cmd/kubectx/fzf.go

@@ -16,14 +16,13 @@ package main
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"io"
 	"os"
 	"os/exec"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"github.com/ahmetb/kubectx/internal/cmdutil"
 	"github.com/ahmetb/kubectx/internal/env"
 	"github.com/ahmetb/kubectx/internal/kubeconfig"
@@ -46,7 +45,7 @@ func (op InteractiveSwitchOp) Run(_, stderr io.Writer) error {
 			printer.Warning(stderr, "kubeconfig file not found")
 			return nil
 		}
-		return errors.Wrap(err, "kubeconfig error")
+		return fmt.Errorf("kubeconfig error, %w", err)
 	}
 	kc.Close()
 
@@ -70,7 +69,7 @@ func (op InteractiveSwitchOp) Run(_, stderr io.Writer) error {
 	}
 	name, err := switchContext(choice)
 	if err != nil {
-		return errors.Wrap(err, "failed to switch context")
+		return fmt.Errorf("failed to switch context, %w", err)
 	}
 	printer.Success(stderr, "Switched to context \"%s\".", printer.SuccessColor.Sprint(name))
 	return nil
@@ -84,7 +83,7 @@ func (op InteractiveDeleteOp) Run(_, stderr io.Writer) error {
 			printer.Warning(stderr, "kubeconfig file not found")
 			return nil
 		}
-		return errors.Wrap(err, "kubeconfig error")
+		return fmt.Errorf("kubeconfig error, %w", err)
 	}
 	kc.Close()
 
@@ -114,7 +113,7 @@ func (op InteractiveDeleteOp) Run(_, stderr io.Writer) error {
 
 	name, wasActiveContext, err := deleteContext(choice)
 	if err != nil {
-		return errors.Wrap(err, "failed to delete context")
+		return fmt.Errorf("failed to delete context, %w", err)
 	}
 
 	if wasActiveContext {

cmd/kubectx/help.go

@@ -20,8 +20,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-
-	"github.com/pkg/errors"
 )
 
 // HelpOp describes printing help.
@@ -49,7 +47,10 @@ func printUsage(out io.Writer) error {
 	help = strings.ReplaceAll(help, "%SPAC%", strings.Repeat(" ", len(selfName())))
 
 	_, err := fmt.Fprintf(out, "%s\n", help)
-	return errors.Wrap(err, "write error")
+	if err != nil {
+		return fmt.Errorf("write error, %w", err)
+	}
+	return nil
 }
 
 // selfName guesses how the user invoked the program.

cmd/kubectx/list.go

@@ -19,7 +19,6 @@ import (
 	"io"
 
 	"facette.io/natsort"
-	"github.com/pkg/errors"
 
 	"github.com/ahmetb/kubectx/internal/cmdutil"
 	"github.com/ahmetb/kubectx/internal/kubeconfig"
@@ -37,7 +36,7 @@ func (_ ListOp) Run(stdout, stderr io.Writer) error {
 			printer.Warning(stderr, "kubeconfig file not found")
 			return nil
 		}
-		return errors.Wrap(err, "kubeconfig error")
+		return fmt.Errorf("kubeconfig error, %w", err)
 	}
 
 	ctxs := kc.ContextNames()

cmd/kubectx/rename.go

@@ -15,11 +15,10 @@
 package main
 
 import (
+	"fmt"
 	"io"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"github.com/ahmetb/kubectx/internal/kubeconfig"
 	"github.com/ahmetb/kubectx/internal/printer"
 )
@@ -51,7 +50,7 @@ func (op RenameOp) Run(_, stderr io.Writer) error {
 	kc := new(kubeconfig.Kubeconfig).WithLoader(kubeconfig.DefaultLoader)
 	defer kc.Close()
 	if err := kc.Parse(); err != nil {
-		return errors.Wrap(err, "kubeconfig error")
+		return fmt.Errorf("kubeconfig error, %w", err)
 	}
 
 	cur := kc.GetCurrentContext()
@@ -60,26 +59,26 @@ func (op RenameOp) Run(_, stderr io.Writer) error {
 	}
 
 	if !kc.ContextExists(op.Old) {
-		return errors.Errorf("context \"%s\" not found, can't rename it", op.Old)
+		return fmt.Errorf("context \"%s\" not found, can't rename it", op.Old)
 	}
 
 	if kc.ContextExists(op.New) {
 		printer.Warning(stderr, "context \"%s\" exists, overwriting it.", op.New)
 		if err := kc.DeleteContextEntry(op.New); err != nil {
-			return errors.Wrap(err, "failed to delete new context to overwrite it")
+			return fmt.Errorf("failed to delete new context to overwrite it, %w", err)
 		}
 	}
 
 	if err := kc.ModifyContextName(op.Old, op.New); err != nil {
-		return errors.Wrap(err, "failed to change context name")
+		return fmt.Errorf("failed to change context name, %w", err)
 	}
 	if op.Old == cur {
 		if err := kc.ModifyCurrentContext(op.New); err != nil {
-			return errors.Wrap(err, "failed to set current-context to new name")
+			return fmt.Errorf("failed to set current-context to new name, %w", err)
 		}
 	}
 	if err := kc.Save(); err != nil {
-		return errors.Wrap(err, "failed to save modified kubeconfig")
+		return fmt.Errorf("failed to save modified kubeconfig, %w", err)
 	}
 	printer.Success(stderr, "Context %s renamed to %s.",
 		printer.SuccessColor.Sprint(op.Old),

cmd/kubectx/state.go

@@ -15,12 +15,12 @@
 package main
 
 import (
+	"errors"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 
-	"github.com/pkg/errors"
-
 	"github.com/ahmetb/kubectx/internal/cmdutil"
 )
 
@@ -47,7 +47,7 @@ func readLastContext(path string) (string, error) {
 func writeLastContext(path, value string) error {
 	dir := filepath.Dir(path)
 	if err := os.MkdirAll(dir, 0755); err != nil {
-		return errors.Wrap(err, "failed to create parent directories")
+		return fmt.Errorf("failed to create parent directories, %w", err)
 	}
 	return ioutil.WriteFile(path, []byte(value), 0644)
 }