Merge pull request #3532 from monopole/commandsOption3

Expose some top level kustomize commands.
2026-05-17 18:25:26 +00:00 · 2021-02-04 10:02:26 -08:00
parent 1ee16d9f52 b9f05dd357
commit b3cb61b80f
69 changed files with 70 additions and 71 deletions
--- a/hack/imports.sh
+++ b/hack/imports.sh
@@ -1,5 +1,6 @@
 for f in $(find $1 -name '*.go'); do
  echo $f
-  # go run go.coder.com/go-tools/cmd/goimports
-  ~/gopath/bin/goimports -w $f
+  # go get golang.org/x/tools/cmd/goimports
+  # {or} go run go.coder.com/go-tools/cmd/goimports
+  goimports -w $f
 done
--- a/kustomize/internal/commands/build/build.go
+++ b/kustomize/internal/commands/build/build.go
@@ -54,10 +54,10 @@ https://github.com/hashicorp/go-getter#url-format
 `

 // NewCmdBuild creates a new build command.
-func NewCmdBuild(out io.Writer) *cobra.Command {
+func NewCmdBuild(cmdName string, out io.Writer) *cobra.Command {
 	var o Options
 	cmd := &cobra.Command{
-		Use: "build {path}",
+		Use: cmdName + " {path}",
 		Short: "Print configuration per contents of " +
 			konfig.DefaultKustomizationFileName(),
 		Example:      examples,
--- a/kustomize/internal/commands/build/build_test.go
+++ b/kustomize/internal/commands/build/build_test.go
--- a/kustomize/internal/commands/build/flagEnableKyaml.go
+++ b/kustomize/internal/commands/build/flagEnableKyaml.go
--- a/kustomize/internal/commands/build/flagaddmanagedby.go
+++ b/kustomize/internal/commands/build/flagaddmanagedby.go
@@ -7,7 +7,6 @@ import (
 	"os"

 	"github.com/spf13/pflag"
-
 	"sigs.k8s.io/kustomize/api/konfig"
 )

--- a/kustomize/internal/commands/build/flagallowresourceidchanges.go
+++ b/kustomize/internal/commands/build/flagallowresourceidchanges.go
--- a/kustomize/internal/commands/build/flagenableplugins.go
+++ b/kustomize/internal/commands/build/flagenableplugins.go
--- a/kustomize/internal/commands/build/flagloadrestrictor.go
+++ b/kustomize/internal/commands/build/flagloadrestrictor.go
--- a/kustomize/internal/commands/build/reorderoutput.go
+++ b/kustomize/internal/commands/build/reorderoutput.go
--- a/kustomize/internal/commands/build/reorderoutput_string.go
+++ b/kustomize/internal/commands/build/reorderoutput_string.go
--- a/kustomize/internal/commands/commands.go
+++ b/kustomize/internal/commands/commands.go
@@ -14,11 +14,11 @@ import (
 	"sigs.k8s.io/kustomize/api/provider"
 	"sigs.k8s.io/kustomize/cmd/config/completion"
 	"sigs.k8s.io/kustomize/cmd/config/configcobra"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/build"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/create"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/openapi"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/version"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/build"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/create"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/edit"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/openapi"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/version"
 )

 // NewDefaultCommand returns the default (aka root) command for kustomize command.
@@ -37,7 +37,7 @@ See https://sigs.k8s.io/kustomize
 	pvd := provider.NewDefaultDepProvider()
 	c.AddCommand(
 		completion.NewCommand(),
-		build.NewCmdBuild(stdOut),
+		build.NewCmdBuild("build", stdOut),
 		edit.NewCmdEdit(
 			fSys, pvd.GetFieldValidator(), pvd.GetKunstructuredFactory()),
 		create.NewCmdCreate(fSys, pvd.GetKunstructuredFactory()),
--- a/kustomize/internal/commands/create/create.go
+++ b/kustomize/internal/commands/create/create.go
@@ -14,8 +14,8 @@ import (
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/loader"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util"
 )

 type createFlags struct {
--- a/kustomize/internal/commands/create/create_test.go
+++ b/kustomize/internal/commands/create/create_test.go
@@ -10,7 +10,7 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/provider"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 var factory = provider.NewDefaultDepProvider().GetKunstructuredFactory()
--- a/kustomize/internal/commands/edit/add/addbase.go
+++ b/kustomize/internal/commands/edit/add/addbase.go
@@ -10,7 +10,7 @@ import (

 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 type addBaseOptions struct {
--- a/kustomize/internal/commands/edit/add/addbase_test.go
+++ b/kustomize/internal/commands/edit/add/addbase_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"

 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 const (
--- a/kustomize/internal/commands/edit/add/addcomponent.go
+++ b/kustomize/internal/commands/edit/add/addcomponent.go
@@ -10,8 +10,8 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/loader"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util"
 )

 type addComponentOptions struct {
--- a/kustomize/internal/commands/edit/add/addcomponent_test.go
+++ b/kustomize/internal/commands/edit/add/addcomponent_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"

 	"sigs.k8s.io/kustomize/api/filesys"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 const (
--- a/kustomize/internal/commands/edit/add/addmetadata.go
+++ b/kustomize/internal/commands/edit/add/addmetadata.go
@@ -10,8 +10,8 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util"
 )

 // kindOfAdd is the kind of metadata being added: label or annotation
--- a/kustomize/internal/commands/edit/add/addmetadata_test.go
+++ b/kustomize/internal/commands/edit/add/addmetadata_test.go
@@ -10,8 +10,8 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 func makeKustomization(t *testing.T) *types.Kustomization {
--- a/kustomize/internal/commands/edit/add/addpatch.go
+++ b/kustomize/internal/commands/edit/add/addpatch.go
@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 type addPatchOptions struct {
--- a/kustomize/internal/commands/edit/add/addpatch_test.go
+++ b/kustomize/internal/commands/edit/add/addpatch_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"

 	"sigs.k8s.io/kustomize/api/filesys"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 const (
--- a/kustomize/internal/commands/edit/add/addresource.go
+++ b/kustomize/internal/commands/edit/add/addresource.go
@@ -10,8 +10,8 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/loader"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util"
 )

 type addResourceOptions struct {
--- a/kustomize/internal/commands/edit/add/addresource_test.go
+++ b/kustomize/internal/commands/edit/add/addresource_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"

 	"sigs.k8s.io/kustomize/api/filesys"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 const (
--- a/kustomize/internal/commands/edit/add/addtransformer.go
+++ b/kustomize/internal/commands/edit/add/addtransformer.go
@@ -9,8 +9,8 @@ import (

 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util"
 )

 type addTransformerOptions struct {
--- a/kustomize/internal/commands/edit/add/addtransformer_test.go
+++ b/kustomize/internal/commands/edit/add/addtransformer_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"

 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 const (
--- a/kustomize/internal/commands/edit/add/all.go
+++ b/kustomize/internal/commands/edit/add/all.go
--- a/kustomize/internal/commands/edit/add/configmap.go
+++ b/kustomize/internal/commands/edit/add/configmap.go
@@ -8,7 +8,7 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 // newCmdAddConfigMap returns a new command.
--- a/kustomize/internal/commands/edit/add/configmap_test.go
+++ b/kustomize/internal/commands/edit/add/configmap_test.go
--- a/kustomize/internal/commands/edit/add/flagsandargs.go
+++ b/kustomize/internal/commands/edit/add/flagsandargs.go
@@ -10,7 +10,7 @@ import (
 	"sigs.k8s.io/kustomize/api/types"

 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util"
 )

 // flagsAndArgs encapsulates the options for add secret/configmap commands.
--- a/kustomize/internal/commands/edit/add/flagsandargs_test.go
+++ b/kustomize/internal/commands/edit/add/flagsandargs_test.go
--- a/kustomize/internal/commands/edit/add/secret.go
+++ b/kustomize/internal/commands/edit/add/secret.go
@@ -8,7 +8,7 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 // newCmdAddSecret returns a new command.
--- a/kustomize/internal/commands/edit/add/secret_test.go
+++ b/kustomize/internal/commands/edit/add/secret_test.go
--- a/kustomize/internal/commands/edit/all.go
+++ b/kustomize/internal/commands/edit/all.go
@@ -9,11 +9,11 @@ import (
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/kv"
 	"sigs.k8s.io/kustomize/api/loader"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/add"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/fix"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/listbuiltin"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/remove"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/set"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/edit/add"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/edit/fix"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/edit/listbuiltin"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/edit/remove"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/edit/set"
 )

 // NewCmdEdit returns an instance of 'edit' subcommand.
--- a/kustomize/internal/commands/edit/fix/fix.go
+++ b/kustomize/internal/commands/edit/fix/fix.go
@@ -6,7 +6,7 @@ package fix
 import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 // NewCmdFix returns an instance of 'fix' subcommand.
--- a/kustomize/internal/commands/edit/fix/fix_test.go
+++ b/kustomize/internal/commands/edit/fix/fix_test.go
@@ -9,7 +9,7 @@ import (

 	"github.com/google/go-cmp/cmp"
 	"sigs.k8s.io/kustomize/api/filesys"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 func TestFix(t *testing.T) {
--- a/kustomize/internal/commands/edit/listbuiltin/listbuiltin.go
+++ b/kustomize/internal/commands/edit/listbuiltin/listbuiltin.go
--- a/kustomize/internal/commands/edit/remove/all.go
+++ b/kustomize/internal/commands/edit/remove/all.go
--- a/kustomize/internal/commands/edit/remove/removemetadata.go
+++ b/kustomize/internal/commands/edit/remove/removemetadata.go
@@ -11,7 +11,7 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 // kindOfAdd is the kind of metadata being added: label or annotation
--- a/kustomize/internal/commands/edit/remove/removemetadata_test.go
+++ b/kustomize/internal/commands/edit/remove/removemetadata_test.go
@@ -11,8 +11,8 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 func makeKustomizationFS() filesys.FileSystem {
--- a/kustomize/internal/commands/edit/remove/removepatch.go
+++ b/kustomize/internal/commands/edit/remove/removepatch.go
@@ -11,7 +11,7 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 type removePatchOptions struct {
--- a/kustomize/internal/commands/edit/remove/removepatch_test.go
+++ b/kustomize/internal/commands/edit/remove/removepatch_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"

 	"sigs.k8s.io/kustomize/api/filesys"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 const (
--- a/kustomize/internal/commands/edit/remove/removeresource.go
+++ b/kustomize/internal/commands/edit/remove/removeresource.go
@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 type removeResourceOptions struct {
--- a/kustomize/internal/commands/edit/remove/removeresource_test.go
+++ b/kustomize/internal/commands/edit/remove/removeresource_test.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"testing"

-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/remove_test"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/edit/remove_test"
 )

 func TestRemoveResources(t *testing.T) {
--- a/kustomize/internal/commands/edit/remove/removetransformer.go
+++ b/kustomize/internal/commands/edit/remove/removetransformer.go
@@ -9,7 +9,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 type removeTransformerOptions struct {
--- a/kustomize/internal/commands/edit/remove/removetransformer_test.go
+++ b/kustomize/internal/commands/edit/remove/removetransformer_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"

 	"github.com/pkg/errors"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/remove_test"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/edit/remove_test"
 )

 func TestRemoveTransformer(t *testing.T) {
--- a/kustomize/internal/commands/edit/remove_test/removetest.go
+++ b/kustomize/internal/commands/edit/remove_test/removetest.go
@@ -7,7 +7,7 @@ import (

 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/api/filesys"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 // Given represents the provided inputs for the test case.
--- a/kustomize/internal/commands/edit/set/all.go
+++ b/kustomize/internal/commands/edit/set/all.go
--- a/kustomize/internal/commands/edit/set/set_name_prefix.go
+++ b/kustomize/internal/commands/edit/set/set_name_prefix.go
@@ -8,7 +8,7 @@ import (

 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 type setNamePrefixOptions struct {
--- a/kustomize/internal/commands/edit/set/set_name_prefix_test.go
+++ b/kustomize/internal/commands/edit/set/set_name_prefix_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"

 	"sigs.k8s.io/kustomize/api/filesys"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 const (
--- a/kustomize/internal/commands/edit/set/set_name_suffix.go
+++ b/kustomize/internal/commands/edit/set/set_name_suffix.go
@@ -8,7 +8,7 @@ import (

 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 type setNameSuffixOptions struct {
--- a/kustomize/internal/commands/edit/set/set_name_suffix_test.go
+++ b/kustomize/internal/commands/edit/set/set_name_suffix_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"

 	"sigs.k8s.io/kustomize/api/filesys"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 const (
--- a/kustomize/internal/commands/edit/set/setimage.go
+++ b/kustomize/internal/commands/edit/set/setimage.go
@@ -13,7 +13,7 @@ import (

 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 type setImageOptions struct {
--- a/kustomize/internal/commands/edit/set/setimage_test.go
+++ b/kustomize/internal/commands/edit/set/setimage_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"

 	"sigs.k8s.io/kustomize/api/filesys"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 func TestSetImage(t *testing.T) {
--- a/kustomize/internal/commands/edit/set/setlabel.go
+++ b/kustomize/internal/commands/edit/set/setlabel.go
@@ -10,8 +10,8 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util"
 )

 type setLabelOptions struct {
--- a/kustomize/internal/commands/edit/set/setlabel_test.go
+++ b/kustomize/internal/commands/edit/set/setlabel_test.go
@@ -9,8 +9,8 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 func makeKustomization(t *testing.T) *types.Kustomization {
--- a/kustomize/internal/commands/edit/set/setnamespace.go
+++ b/kustomize/internal/commands/edit/set/setnamespace.go
@@ -11,7 +11,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 type setNamespaceOptions struct {
--- a/kustomize/internal/commands/edit/set/setnamespace_test.go
+++ b/kustomize/internal/commands/edit/set/setnamespace_test.go
@@ -10,7 +10,7 @@ import (

 	"sigs.k8s.io/kustomize/api/filesys"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 const (
--- a/kustomize/internal/commands/edit/set/setreplicas.go
+++ b/kustomize/internal/commands/edit/set/setreplicas.go
@@ -12,7 +12,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
 )

 type setReplicasOptions struct {
--- a/kustomize/internal/commands/edit/set/setreplicas_test.go
+++ b/kustomize/internal/commands/edit/set/setreplicas_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"

 	"sigs.k8s.io/kustomize/api/filesys"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 func TestSetReplicas(t *testing.T) {
--- a/kustomize/commands/internal/kustfile/kustomizationfile.go
+++ b/kustomize/commands/internal/kustfile/kustomizationfile.go
--- a/kustomize/commands/internal/kustfile/kustomizationfile_test.go
+++ b/kustomize/commands/internal/kustfile/kustomizationfile_test.go
@@ -13,7 +13,7 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
-	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
 )

 func TestFieldOrder(t *testing.T) {
--- a/kustomize/commands/internal/testutils/testutils.go
+++ b/kustomize/commands/internal/testutils/testutils.go
--- a/kustomize/commands/internal/util/util.go
+++ b/kustomize/commands/internal/util/util.go
--- a/kustomize/commands/internal/util/util_test.go
+++ b/kustomize/commands/internal/util/util_test.go
--- a/kustomize/internal/commands/openapi/info/info.go
+++ b/kustomize/internal/commands/openapi/info/info.go
--- a/kustomize/internal/commands/openapi/openapi.go
+++ b/kustomize/internal/commands/openapi/openapi.go
@@ -8,7 +8,7 @@ import (

 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/cmd/config/configcobra"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/openapi/info"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands/openapi/info"
 )

 // NewCmdOpenAPI makes a new openapi command.
--- a/kustomize/internal/commands/version/version.go
+++ b/kustomize/internal/commands/version/version.go
--- a/kustomize/go.mod
+++ b/kustomize/go.mod
@@ -15,7 +15,6 @@ require (
 )

 exclude (
-	github.com/russross/blackfriday v2.0.0+incompatible
 	sigs.k8s.io/kustomize/api v0.2.0
 	sigs.k8s.io/kustomize/cmd/config v0.2.0
 )
--- a/kustomize/main.go
+++ b/kustomize/main.go
@@ -7,7 +7,7 @@ package main
 import (
 	"os"

-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands"
+	"sigs.k8s.io/kustomize/kustomize/v3/commands"

 	// initialize auth
 	// This is here rather than in the libraries because of