Fix internal kustomize CLI deps

kustomize/internal/commands/commands.go

@@ -16,11 +16,11 @@ import (
 	"sigs.k8s.io/kustomize/api/pgmconfig"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/build"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/config"
-	"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/version"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/build"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/config"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/create"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/edit"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/version"
 )
 
 // NewDefaultCommand returns the default (aka root) command for kustomize command.

kustomize/internal/commands/create/create.go

@@ -13,8 +13,8 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/pgmconfig"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/util"
 )
 
 type createFlags struct {

kustomize/internal/commands/create/create_test.go

@@ -10,7 +10,7 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
 )
 
 var factory = kunstruct.NewKunstructuredFactoryImpl()

kustomize/internal/commands/edit/add/addbase.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
 )
 
 type addBaseOptions struct {

kustomize/internal/commands/edit/add/addbase_test.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 	"testing"
 
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
 	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
 )
 
 const (

kustomize/internal/commands/edit/add/addmetadata.go

@@ -7,11 +7,11 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/pgmconfig"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/util"
 )
 
 // kindOfAdd is the kind of metadata being added: label or annotation

kustomize/internal/commands/edit/add/addmetadata_test.go

@@ -6,11 +6,11 @@ package add
 import (
 	"testing"
 
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/testutils/valtest"
+	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
 )
 
 func makeKustomization(t *testing.T) *types.Kustomization {
@@ -73,7 +73,7 @@ func TestAddAnnotationInvalidFormat(t *testing.T) {
 	if err == nil {
 		t.Errorf("expected an error")
 	}
-	if err.Error() != validators.SAD {
+	if err.Error() != valtest_test.SAD {
 		t.Errorf("incorrect error: %v", err.Error())
 	}
 }
@@ -254,7 +254,7 @@ func TestAddLabelInvalidFormat(t *testing.T) {
 	if err == nil {
 		t.Errorf("expected an error")
 	}
-	if err.Error() != validators.SAD {
+	if err.Error() != valtest_test.SAD {
 		t.Errorf("incorrect error: %v", err.Error())
 	}
 }

kustomize/internal/commands/edit/add/addpatch.go

@@ -8,10 +8,10 @@ import (
 	"log"
 
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/patch"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
 	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/edit/patch"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/util"
 )
 
 type addPatchOptions struct {

kustomize/internal/commands/edit/add/addpatch_test.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
 	"sigs.k8s.io/kustomize/api/filesys"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
 )
 
 const (

kustomize/internal/commands/edit/add/addresource.go

@@ -8,9 +8,9 @@ import (
 	"log"
 
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
 	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/util"
 )
 
 type addResourceOptions struct {

kustomize/internal/commands/edit/add/addresource_test.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
 	"sigs.k8s.io/kustomize/api/filesys"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
 )
 
 const (

kustomize/internal/commands/edit/add/configmap.go

@@ -5,10 +5,10 @@ package add
 
 import (
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
 )
 
 // newCmdAddConfigMap returns a new command.

kustomize/internal/commands/edit/add/configmap_test.go

@@ -9,7 +9,7 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/kv"
 	"sigs.k8s.io/kustomize/api/loader"
-	"sigs.k8s.io/kustomize/api/testutils/valtest"
+	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
 )
 

kustomize/internal/commands/edit/add/flagsandargs.go

@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"strings"
 
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
 	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/util"
 )
 
 // flagsAndArgs encapsulates the options for add secret/configmap commands.

kustomize/internal/commands/edit/add/secret.go

@@ -5,10 +5,10 @@ package add
 
 import (
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
 )
 
 // newCmdAddSecret returns a new command.

kustomize/internal/commands/edit/add/secret_test.go

@@ -7,10 +7,10 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/api/kv"
+	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/loader"
-	"sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
 )
 

kustomize/internal/commands/edit/all.go

@@ -9,10 +9,10 @@ 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/remove"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/set"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/edit/add"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/edit/fix"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/edit/remove"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/edit/set"
 )
 
 // NewCmdEdit returns an instance of 'edit' subcommand.

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/internal/commands/kustfile"
 )
 
 // NewCmdFix returns an instance of 'fix' subcommand.

kustomize/internal/commands/edit/fix/fix_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
 )
 
 func TestFix(t *testing.T) {

kustomize/internal/commands/edit/remove/removemetadata.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/pgmconfig"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
 )
 
 // kindOfAdd is the kind of metadata being added: label or annotation

kustomize/internal/commands/edit/remove/removemetadata_test.go

@@ -8,11 +8,11 @@ import (
 	"strings"
 	"testing"
 
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/testutils/valtest"
+	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
 )
 
 func makeKustomizationFS() filesys.FileSystem {
@@ -147,7 +147,7 @@ func TestRemoveAnnotationInvalidFormat(t *testing.T) {
 	if err == nil {
 		t.Errorf("expected an error")
 	}
-	if err.Error() != validators.SAD {
+	if err.Error() != valtest_test.SAD {
 		t.Errorf("incorrect error: %v", err.Error())
 	}
 }
@@ -295,7 +295,7 @@ func TestRemoveLabelInvalidFormat(t *testing.T) {
 	if err == nil {
 		t.Errorf("expected an error")
 	}
-	if err.Error() != validators.SAD {
+	if err.Error() != valtest_test.SAD {
 		t.Errorf("incorrect error: %v", err.Error())
 	}
 }

kustomize/internal/commands/edit/remove/removepatch.go

@@ -8,11 +8,11 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/patch"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/pgmconfig"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/edit/patch"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/util"
 )
 
 type removePatchOptions struct {

kustomize/internal/commands/edit/remove/removepatch_test.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"testing"
 
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/patch"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
 	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/edit/patch"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
 )
 
 const (

kustomize/internal/commands/edit/remove/removeresource.go

@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/pgmconfig"
+	"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
 )
 
 type removeResourceOptions struct {

kustomize/internal/commands/edit/remove/removeresource_test.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
 	"sigs.k8s.io/kustomize/api/filesys"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
 )
 
 func TestRemoveResources(t *testing.T) {

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/internal/commands/kustfile"
 )
 
 type setNamePrefixOptions struct {

kustomize/internal/commands/edit/set/set_name_prefix_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
 )
 
 const (

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/internal/commands/kustfile"
 )
 
 type setNameSuffixOptions struct {

kustomize/internal/commands/edit/set/set_name_suffix_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
 )
 
 const (

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/internal/commands/kustfile"
 )
 
 type setImageOptions struct {

kustomize/internal/commands/edit/set/setimage_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
 )
 
 func TestSetImage(t *testing.T) {

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/internal/commands/kustfile"
 )
 
 type setNamespaceOptions struct {

kustomize/internal/commands/edit/set/setnamespace_test.go

@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/testutils/valtest"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
 )
 
 const (

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/internal/commands/kustfile"
 )
 
 type setReplicasOptions struct {

kustomize/internal/commands/edit/set/setreplicas_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
 )
 
 func TestSetReplicas(t *testing.T) {

kustomize/internal/commands/kustfile/kustomizationfile_test.go

@@ -11,7 +11,7 @@ import (
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/pgmconfig"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
+	testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
 )
 
 func TestFieldOrder(t *testing.T) {