Merge pull request #312 from monopole/fixSomeImports

Remove some unnecessary import renames.
kubernetes-sigs · Sep 4, 2018 · 95f5bec · 95f5bec
2 parents 694d809 + 340cb2b
commit 95f5bec
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 15 deletions.
diff --git a/pkg/patch/jsonpatch.go b/pkg/patch/jsonpatch.go
@@ -17,7 +17,7 @@ limitations under the License.
 package patch
 
 import (
-	yamlpatch "github.com/krishicks/yaml-patch"
+	"github.com/krishicks/yaml-patch"
 )
 
 // PatchJson6902 represents a json patch for an object

diff --git a/pkg/patch/transformer/factory.go b/pkg/patch/transformer/factory.go
@@ -19,14 +19,13 @@ package transformer
 import (
 	"fmt"
 
-	jsonpatch "github.com/evanphx/json-patch"
-	yamlpatch "github.com/krishicks/yaml-patch"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-
+	"github.com/evanphx/json-patch"
+	"github.com/krishicks/yaml-patch"
 	"github.com/kubernetes-sigs/kustomize/pkg/loader"
 	"github.com/kubernetes-sigs/kustomize/pkg/patch"
 	"github.com/kubernetes-sigs/kustomize/pkg/resource"
 	"github.com/kubernetes-sigs/kustomize/pkg/transformers"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // PatchJson6902Factory makes PatchJson6902 transformers.

diff --git a/pkg/patch/transformer/factory_test.go b/pkg/patch/transformer/factory_test.go
@@ -20,10 +20,9 @@ import (
 	"strings"
 	"testing"
 
-	yaml "gopkg.in/yaml.v2"
-
 	"github.com/kubernetes-sigs/kustomize/pkg/internal/loadertest"
 	"github.com/kubernetes-sigs/kustomize/pkg/patch"
+	"gopkg.in/yaml.v2"
 )
 
 func TestNewPatchJson6902FactoryNull(t *testing.T) {

diff --git a/pkg/patch/transformer/patchjson6902json.go b/pkg/patch/transformer/patchjson6902json.go
@@ -17,8 +17,7 @@ limitations under the License.
 package transformer
 
 import (
-	jsonpatch "github.com/evanphx/json-patch"
-
+	"github.com/evanphx/json-patch"
 	"github.com/kubernetes-sigs/kustomize/pkg/resmap"
 	"github.com/kubernetes-sigs/kustomize/pkg/resource"
 	"github.com/kubernetes-sigs/kustomize/pkg/transformers"

diff --git a/pkg/patch/transformer/patchjson6902json_test.go b/pkg/patch/transformer/patchjson6902json_test.go
@@ -20,8 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	jsonpatch "github.com/evanphx/json-patch"
-
+	"github.com/evanphx/json-patch"
 	"github.com/kubernetes-sigs/kustomize/pkg/resmap"
 	"github.com/kubernetes-sigs/kustomize/pkg/resource"
 )

diff --git a/pkg/patch/transformer/patchjson6902yaml.go b/pkg/patch/transformer/patchjson6902yaml.go
@@ -18,8 +18,7 @@ package transformer
 
 import (
 	"github.com/ghodss/yaml"
-	yamlpatch "github.com/krishicks/yaml-patch"
-
+	"github.com/krishicks/yaml-patch"
 	"github.com/kubernetes-sigs/kustomize/pkg/resmap"
 	"github.com/kubernetes-sigs/kustomize/pkg/resource"
 	"github.com/kubernetes-sigs/kustomize/pkg/transformers"

diff --git a/pkg/patch/transformer/patchjson6902yaml_test.go b/pkg/patch/transformer/patchjson6902yaml_test.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	yamlpatch "github.com/krishicks/yaml-patch"
+	"github.com/krishicks/yaml-patch"
 	"github.com/kubernetes-sigs/kustomize/pkg/resmap"
 	"github.com/kubernetes-sigs/kustomize/pkg/resource"
 	"k8s.io/apimachinery/pkg/runtime/schema"

diff --git a/pkg/patch/transformer/util.go b/pkg/patch/transformer/util.go
@@ -27,7 +27,7 @@ import (
 func findTargetObj(m resmap.ResMap, targetId resource.ResId) (*resource.Resource, error) {
 	matchedIds := m.FindByGVKN(targetId)
 	if targetId.Namespace() != "" {
-		ids := []resource.ResId{}
+		var ids []resource.ResId
 		for _, id := range matchedIds {
 			if id.Namespace() == targetId.Namespace() {
 				ids = append(ids, id)