From 5c93722db805562c1f445a11b8b1af1b197c34b7 Mon Sep 17 00:00:00 2001
From: Takuro Wada <taxpon@gmail.com>
Date: Tue, 25 Jun 2019 11:46:01 +0900
Subject: [PATCH] Update pkg structure to avoid circular import

---
 pkg/commands/edit/add/addpatch.go                | 4 ++--
 pkg/commands/edit/add/addresource.go             | 4 ++--
 pkg/commands/edit/add/flagsandargs.go            | 4 ++--
 pkg/commands/edit/remove/removepatch.go          | 4 ++--
 pkg/commands/edit/{util.go => util/functions.go} | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename pkg/commands/edit/{util.go => util/functions.go} (97%)

diff --git a/pkg/commands/edit/add/addpatch.go b/pkg/commands/edit/add/addpatch.go
index 81a2832d6..7ab1e871b 100644
--- a/pkg/commands/edit/add/addpatch.go
+++ b/pkg/commands/edit/add/addpatch.go
@@ -21,7 +21,7 @@ import (
 	"log"
 
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/v3/pkg/commands/edit"
+	"sigs.k8s.io/kustomize/v3/pkg/commands/edit/util"
 	"sigs.k8s.io/kustomize/v3/pkg/commands/kustfile"
 	"sigs.k8s.io/kustomize/v3/pkg/fs"
 	"sigs.k8s.io/kustomize/v3/pkg/patch"
@@ -71,7 +71,7 @@ func (o *addPatchOptions) Complete(cmd *cobra.Command, args []string) error {
 
 // RunAddPatch runs addPatch command (do real work).
 func (o *addPatchOptions) RunAddPatch(fSys fs.FileSystem) error {
-	patches, err := edit.GlobPatterns(fSys, o.patchFilePaths)
+	patches, err := util.GlobPatterns(fSys, o.patchFilePaths)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/commands/edit/add/addresource.go b/pkg/commands/edit/add/addresource.go
index 5fba8af04..37c63a5ea 100644
--- a/pkg/commands/edit/add/addresource.go
+++ b/pkg/commands/edit/add/addresource.go
@@ -19,9 +19,9 @@ package add
 import (
 	"errors"
 	"log"
-	"sigs.k8s.io/kustomize/v3/pkg/commands/edit"
 
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/kustomize/v3/pkg/commands/edit/util"
 	"sigs.k8s.io/kustomize/v3/pkg/commands/kustfile"
 	"sigs.k8s.io/kustomize/v3/pkg/fs"
 )
@@ -70,7 +70,7 @@ func (o *addResourceOptions) Complete(cmd *cobra.Command, args []string) error {
 
 // RunAddResource runs addResource command (do real work).
 func (o *addResourceOptions) RunAddResource(fSys fs.FileSystem) error {
-	resources, err := edit.GlobPatterns(fSys, o.resourceFilePaths)
+	resources, err := util.GlobPatterns(fSys, o.resourceFilePaths)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/commands/edit/add/flagsandargs.go b/pkg/commands/edit/add/flagsandargs.go
index c4372f6c7..85807c2ac 100644
--- a/pkg/commands/edit/add/flagsandargs.go
+++ b/pkg/commands/edit/add/flagsandargs.go
@@ -18,9 +18,9 @@ package add
 
 import (
 	"fmt"
-	"sigs.k8s.io/kustomize/v3/pkg/commands/edit"
 	"strings"
 
+	"sigs.k8s.io/kustomize/v3/pkg/commands/edit/util"
 	"sigs.k8s.io/kustomize/v3/pkg/fs"
 )
 
@@ -86,7 +86,7 @@ func (a *flagsAndArgs) ExpandFileSource(fSys fs.FileSystem) error {
 		} else {
 			patterns = append(patterns, s[0])
 		}
-		result, err := edit.GlobPatterns(fSys, patterns)
+		result, err := util.GlobPatterns(fSys, patterns)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/commands/edit/remove/removepatch.go b/pkg/commands/edit/remove/removepatch.go
index f2bf56c27..f40995332 100644
--- a/pkg/commands/edit/remove/removepatch.go
+++ b/pkg/commands/edit/remove/removepatch.go
@@ -5,10 +5,10 @@ package remove
 
 import (
 	"log"
-	"sigs.k8s.io/kustomize/v3/pkg/commands/edit"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/kustomize/v3/pkg/commands/edit/util"
 	"sigs.k8s.io/kustomize/v3/pkg/commands/kustfile"
 	"sigs.k8s.io/kustomize/v3/pkg/fs"
 	"sigs.k8s.io/kustomize/v3/pkg/patch"
@@ -59,7 +59,7 @@ func (o *removePatchOptions) Complete(cmd *cobra.Command, args []string) error {
 
 // RunRemovePatch runs removePatch command (do real work).
 func (o *removePatchOptions) RunRemovePatch(fSys fs.FileSystem) error {
-	patches, err := edit.GlobPatterns(fSys, o.patchFilePaths)
+	patches, err := util.GlobPatterns(fSys, o.patchFilePaths)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/commands/edit/util.go b/pkg/commands/edit/util/functions.go
similarity index 97%
rename from pkg/commands/edit/util.go
rename to pkg/commands/edit/util/functions.go
index 90f124461..407e13027 100644
--- a/pkg/commands/edit/util.go
+++ b/pkg/commands/edit/util/functions.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package edit
+package util
 
 import (
 	"log"