feat(plugins/plugin-kubectl): CLI-based kubectl polling does not allow for flexible overrides of the command prefix

Fixes #7042

Author: starpit

plugins/plugin-kubectl/src/controller/kubectl/options.ts

@@ -18,6 +18,7 @@ import { Arguments, ExecOptions, ParsedOptions } from '@kui-shell/core'
 
 import { FinalState } from '../../lib/model/states'
 import { getCurrentDefaultNamespace } from './contexts'
+import { getCommandFromArgs } from '../../lib/util/util'
 
 type EntityFormat = 'yaml' | 'json'
 type TableFormat = 'wide' | string // want: 'custom-columns-file=' | 'custom-columns='
@@ -345,6 +346,22 @@ export function withKubeconfigFrom(args: Pick<Arguments<KubeOptions>, 'parsedOpt
   }
 }
 
+function execOptionsHasPrefix(data: Arguments['execOptions']['data']): data is { kubectlPrefix: string } {
+  return !Buffer.isBuffer(data) && typeof data === 'object' && typeof data.kubectlPrefix === 'string'
+}
+
+/** As with `withKubeconfigFrom`, and also copy over the leading command (e.g. `kubectl`) */
+export function withKubeconfigAndCommandFrom(
+  args: Pick<Arguments<KubeOptions>, 'argvNoOptions' | 'execOptions' | 'parsedOptions'>,
+  cmdline: string
+): string {
+  if (execOptionsHasPrefix(args.execOptions.data)) {
+    return withKubeconfigFrom(args, `${args.execOptions.data.kubectlPrefix} ${cmdline}`)
+  } else {
+    return withKubeconfigFrom(args, `${getCommandFromArgs(args)} ${cmdline}`)
+  }
+}
+
 /** Apply --dry-run? */
 export function isDryRun(args: Arguments<KubeOptions>): boolean {
   const opt = args.parsedOptions['dry-run']

plugins/plugin-kubectl/src/controller/kubectl/watch/get-watch.ts

@@ -40,6 +40,7 @@ import {
   getNamespace,
   getResourceNamesForArgv,
   withKubeconfigFrom,
+  withKubeconfigAndCommandFrom,
   KubeOptions,
   KubeExecOptions
 } from '../options'
@@ -337,9 +338,9 @@ class KubectlWatcher implements Abortable, Watcher {
     namespace: string,
     rowNames: string[]
   ): Promise<Table | void> {
-    const getCommand = withKubeconfigFrom(
+    const getCommand = withKubeconfigAndCommandFrom(
       this.args,
-      `${getCommandFromArgs(this.args)} get ${kindPart(apiVersion, kind)} ${rowNames.join(' ')} -n ${namespace} ${
+      `get ${kindPart(apiVersion, kind)} ${rowNames.join(' ')} -n ${namespace} ${
         this.output ? `-o ${this.output}` : ''
       }`
     )

plugins/plugin-kubectl/src/lib/util/util.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-/* eslint-disable @typescript-eslint/explicit-member-accessibility */
 import { Arguments } from '@kui-shell/core'
 
 import commandPrefix from '../../controller/command-prefix'
@@ -105,16 +104,16 @@ export class StatusError extends Error {}
 export class TryLaterError extends StatusError {}
 
 export class NotFoundError extends StatusError {
-  code: any // eslint-disable-line @typescript-eslint/no-explicit-any
+  public code: any // eslint-disable-line @typescript-eslint/no-explicit-any
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  constructor(message: string, code: any = 404) {
+  public constructor(message: string, code: any = 404) {
     super(message)
     this.code = code
   }
 }
 
-export const getCommandFromArgs = (args: { argvNoOptions: string[] }) => {
+export const getCommandFromArgs = (args: Pick<Arguments, 'argvNoOptions'>): string => {
   const cmd = args.argvNoOptions[0] === commandPrefix ? args.argvNoOptions[1] : args.argvNoOptions[0]
   return cmd === 'k' ? 'kubectl' : cmd
 }