Merge branch 'main' into patch-1

Author: hidetatz

.goreleaser.yml

@@ -13,7 +13,7 @@ builds:
     - -s -w
     - -X main.Version={{.Version}}
   goos:
-    - windows
+    # - windows
     - darwin
     - linux
   goarch:
@@ -37,9 +37,9 @@ archives:
 brews:
 - name: kubecolor
   tap:
-    owner: dty1er
+    owner: hidetatz
     name: homebrew-tap
-  homepage: "https://github.com/dty1er/kubecolor"
+  homepage: "https://github.com/hidetatz/kubecolor"
   description: "Colorize your kubectl output"
   folder: Formula
   install: |

command/subcommand.go

@@ -2,6 +2,7 @@ package command
 
 import (
 	"os"
+	"strings"
 
 	"github.com/hidetatz/kubecolor/kubectl"
 	"github.com/mattn/go-isatty"
@@ -21,6 +22,15 @@ func ResolveSubcommand(args []string, config *KubecolorConfig) (bool, *kubectl.S
 		return false, subcommandInfo
 	}
 
+	// if there is an argument starting with __,
+	// the subcommand is probably an internal subcommand (like __completeNoDesc)
+	// and should probably not be colorized
+	for i := range args {
+		if strings.HasPrefix(args[i], "__") {
+			return false, subcommandInfo
+		}
+	}
+
 	// if subcommand is not found (e.g. kubecolor --help or just "kubecolor"),
 	// it is treated as help because kubectl shows help for such input
 	if !subcommandFound {
@@ -44,6 +54,7 @@ func isColoringSupported(sc kubectl.Subcommand) bool {
 	// when you add something here, it won't be colorized
 	unsupported := []kubectl.Subcommand{
 		kubectl.Create,
+		kubectl.Debug,
 		kubectl.Delete,
 		kubectl.Edit,
 		kubectl.Attach,
@@ -54,6 +65,8 @@ func isColoringSupported(sc kubectl.Subcommand) bool {
 		kubectl.Plugin,
 		kubectl.Wait,
 		kubectl.Run,
+		kubectl.Ctx,
+		kubectl.Ns,
 	}
 
 	for _, u := range unsupported {

command/subcommand_test.go

@@ -81,6 +81,19 @@ func Test_ResolveSubcommand(t *testing.T) {
 			expectedShouldColorize: true,
 			expectedInfo:           &kubectl.SubcommandInfo{Help: true},
 		},
+		{
+			name:             "when the internal argument is found, it won't colorize",
+			args:             []string{"__completeNoDesc", "get", "pods"},
+			isOutputTerminal: func() bool { return true },
+			conf: &KubecolorConfig{
+				Plain:          false,
+				DarkBackground: true,
+				ForceColor:     false,
+				KubectlCmd:     "kubectl",
+			},
+			expectedShouldColorize: false,
+			expectedInfo:           &kubectl.SubcommandInfo{Subcommand: kubectl.Get},
+		},
 		{
 			name:             "when not tty, it won't colorize",
 			args:             []string{"get", "pods"},

kubectl/subcommand.go

@@ -70,6 +70,9 @@ const (
 	Plugin
 	Version
 	Options
+	Ctx
+	Ns
+	Debug
 )
 
 var strToSubcommand = map[string]Subcommand{
@@ -115,6 +118,9 @@ var strToSubcommand = map[string]Subcommand{
 	"plugin":        Plugin,
 	"version":       Version,
 	"options":       Options,
+	"ctx":           Ctx,
+	"ns":            Ns,
+	"debug":         Debug,
 }
 
 func InspectSubcommand(command string) (Subcommand, bool) {
@@ -187,7 +193,7 @@ func CollectCommandlineOptions(args []string, info *SubcommandInfo) {
 			info.NoHeader = true
 		} else if args[i] == "-w" || args[i] == "--watch" {
 			info.Watch = true
-		} else if args[i] == "--recursive=true" {
+		} else if args[i] == "--recursive=true" || args[i] == "--recursive" {
 			info.Recursive = true
 		} else if args[i] == "-h" || args[i] == "--help" {
 			info.Help = true

kubectl/subcommand_test.go

@@ -51,8 +51,7 @@ func TestInspectSubcommandInfo(t *testing.T) {
 
 		{"explain pod", &SubcommandInfo{Subcommand: Explain}, true},
 		{"explain pod --recursive=true", &SubcommandInfo{Subcommand: Explain, Recursive: true}, true},
-		// "--recursive true" is not acceptable by kubectl explain
-		{"explain pod --recursive true", &SubcommandInfo{Subcommand: Explain}, true},
+		{"explain pod --recursive", &SubcommandInfo{Subcommand: Explain, Recursive: true}, true},
 
 		{"version", &SubcommandInfo{Subcommand: Version}, true},
 		{"version --client", &SubcommandInfo{Subcommand: Version}, true},