From 04c23b20854e6dba76ee209f3871002cac7dc268 Mon Sep 17 00:00:00 2001 From: jregan Date: Wed, 16 Oct 2019 12:25:09 -0700 Subject: [PATCH] Maker hasher public for now. --- hacks/awker.sh | 13 +++++++++++++ {pkg/hasher => hasher}/hasher.go | 0 {pkg/hasher => hasher}/hasher_test.go | 2 +- k8sdeps/kunstruct/hasher.go | 2 +- plugin/builtin/InventoryTransformer.go | 2 +- .../inventorytransformer/InventoryTransformer.go | 2 +- 6 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 hacks/awker.sh rename {pkg/hasher => hasher}/hasher.go (100%) rename {pkg/hasher => hasher}/hasher_test.go (95%) diff --git a/hacks/awker.sh b/hacks/awker.sh new file mode 100644 index 000000000..014532b44 --- /dev/null +++ b/hacks/awker.sh @@ -0,0 +1,13 @@ +function pluginDeps { + find ./plugin -name "*.go" |\ + xargs grep sigs.k8s.io/kustomize/v3 |\ + sed 's|"sigs.k8s.io/kustomize/v3/||' |\ + awk '{ printf "%40s %s\n", $2, $1 }' |\ + sed 's|" \./| |' |\ + sed 's|:$||' |\ + sort | uniq +} + + +pluginDeps + diff --git a/pkg/hasher/hasher.go b/hasher/hasher.go similarity index 100% rename from pkg/hasher/hasher.go rename to hasher/hasher.go diff --git a/pkg/hasher/hasher_test.go b/hasher/hasher_test.go similarity index 95% rename from pkg/hasher/hasher_test.go rename to hasher/hasher_test.go index 6d214830d..95ee3624b 100644 --- a/pkg/hasher/hasher_test.go +++ b/hasher/hasher_test.go @@ -6,7 +6,7 @@ package hasher_test import ( "testing" - . "sigs.k8s.io/kustomize/v3/pkg/hasher" + . "sigs.k8s.io/kustomize/v3/hasher" ) func TestSortArrayAndComputeHash(t *testing.T) { diff --git a/k8sdeps/kunstruct/hasher.go b/k8sdeps/kunstruct/hasher.go index cbbfa47a9..c3f22a35c 100644 --- a/k8sdeps/kunstruct/hasher.go +++ b/k8sdeps/kunstruct/hasher.go @@ -9,7 +9,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "sigs.k8s.io/kustomize/v3/pkg/hasher" + "sigs.k8s.io/kustomize/v3/hasher" "sigs.k8s.io/kustomize/v3/pkg/ifc" ) diff --git a/plugin/builtin/InventoryTransformer.go b/plugin/builtin/InventoryTransformer.go index cd7922854..97f10a39d 100644 --- a/plugin/builtin/InventoryTransformer.go +++ b/plugin/builtin/InventoryTransformer.go @@ -4,8 +4,8 @@ package builtin import ( "fmt" + "sigs.k8s.io/kustomize/v3/hasher" "sigs.k8s.io/kustomize/v3/kv" - "sigs.k8s.io/kustomize/v3/pkg/hasher" "sigs.k8s.io/kustomize/v3/pkg/inventory" "sigs.k8s.io/kustomize/v3/pkg/resid" "sigs.k8s.io/kustomize/v3/pkg/resmap" diff --git a/plugin/builtin/inventorytransformer/InventoryTransformer.go b/plugin/builtin/inventorytransformer/InventoryTransformer.go index 88b1e6503..570414edb 100644 --- a/plugin/builtin/inventorytransformer/InventoryTransformer.go +++ b/plugin/builtin/inventorytransformer/InventoryTransformer.go @@ -7,8 +7,8 @@ package main import ( "fmt" + "sigs.k8s.io/kustomize/v3/hasher" "sigs.k8s.io/kustomize/v3/kv" - "sigs.k8s.io/kustomize/v3/pkg/hasher" "sigs.k8s.io/kustomize/v3/pkg/inventory" "sigs.k8s.io/kustomize/v3/pkg/resid" "sigs.k8s.io/kustomize/v3/pkg/resmap"