Move plugin lister to avoid import cycle.

kubernetes-sigs · Jan 8, 2021 · 8c6a9f6 · 8c6a9f6
1 parent 03b2fff
commit 8c6a9f6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/api/konfig/plugins.go b/api/konfig/plugins.go
@@ -9,7 +9,6 @@ import (
 	"runtime"
 
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/internal/plugins/builtinhelpers"
 	"sigs.k8s.io/kustomize/api/types"
 )
 
@@ -158,15 +157,3 @@ func pwdEnv() string {
 	}
 	return "PWD"
 }
-
-// GetBuiltinPluginNames returns a list of builtin plugin names
-func GetBuiltinPluginNames() []string {
-	var ret []string
-	for k := range builtinhelpers.GeneratorFactories {
-		ret = append(ret, k.String())
-	}
-	for k := range builtinhelpers.TransformerFactories {
-		ret = append(ret, k.String())
-	}
-	return ret
-}
diff --git a/api/krusty/options.go b/api/krusty/options.go
@@ -4,6 +4,7 @@
 package krusty
 
 import (
+	"sigs.k8s.io/kustomize/api/internal/plugins/builtinhelpers"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
 )
@@ -61,3 +62,15 @@ func (o Options) IfApiMachineryElseKyaml(s1, s2 string) string {
 	}
 	return s2
 }
+
+// GetBuiltinPluginNames returns a list of builtin plugin names
+func GetBuiltinPluginNames() []string {
+	var ret []string
+	for k := range builtinhelpers.GeneratorFactories {
+		ret = append(ret, k.String())
+	}
+	for k := range builtinhelpers.TransformerFactories {
+		ret = append(ret, k.String())
+	}
+	return ret
+}
diff --git a/kustomize/internal/commands/edit/listbuiltin/listbuiltin.go b/kustomize/internal/commands/edit/listbuiltin/listbuiltin.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/konfig"
+	"sigs.k8s.io/kustomize/api/krusty"
 )
 
 // NewCmdListBuiltinPlugin return an instance of list-builtin-plugin
@@ -18,7 +18,7 @@ func NewCmdListBuiltinPlugin() *cobra.Command {
 		Short: "[Alpha] List the builtin plugins",
 		Long:  "",
 		Run: func(cmd *cobra.Command, args []string) {
-			plugins := konfig.GetBuiltinPluginNames()
+			plugins := krusty.GetBuiltinPluginNames()
 			fmt.Print("Builtin plugins:\n\n")
 			for _, p := range plugins {
 				fmt.Printf(" * %s\n", p)