Make api/plugins

2026-09-15 12:18:57 +00:00 · 2019-10-20 14:03:56 -07:00
parent 286b9c1aed
commit 951d15bf17
120 changed files with 668 additions and 411 deletions
--- a/plugin/builtin/ImageTagTransformer.go
+++ b/plugin/builtin/ImageTagTransformer.go
@@ -4,9 +4,10 @@ package builtin
 import (
 	"fmt"
 	"regexp"
+	"strings"
+
 	"sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"strings"

 	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/yaml"
--- a/plugin/builtin/InventoryTransformer.go
+++ b/plugin/builtin/InventoryTransformer.go
@@ -5,12 +5,12 @@ import (
 	"fmt"

 	"sigs.k8s.io/kustomize/v3/api/hasher"
+	"sigs.k8s.io/kustomize/v3/api/inventory"
 	"sigs.k8s.io/kustomize/v3/api/kv"
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/inventory"
 	"sigs.k8s.io/yaml"
 )

--- a/plugin/builtin/NamespaceTransformer.go
+++ b/plugin/builtin/NamespaceTransformer.go
@@ -3,6 +3,7 @@ package builtin

 import (
 	"fmt"
+
 	"sigs.k8s.io/kustomize/v3/api/transform"

 	"sigs.k8s.io/kustomize/v3/api/resid"
--- a/plugin/builtin/PrefixSuffixTransformer.go
+++ b/plugin/builtin/PrefixSuffixTransformer.go
@@ -4,6 +4,7 @@ package builtin
 import (
 	"errors"
 	"fmt"
+
 	"sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/api/types"

--- a/plugin/builtin/ReplicaCountTransformer.go
+++ b/plugin/builtin/ReplicaCountTransformer.go
@@ -3,6 +3,7 @@ package builtin

 import (
 	"fmt"
+
 	"sigs.k8s.io/kustomize/v3/api/transform"

 	"sigs.k8s.io/kustomize/v3/api/resid"
--- a/plugin/builtin/annotationstransformer/AnnotationsTransformer_test.go
+++ b/plugin/builtin/annotationstransformer/AnnotationsTransformer_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestAnnotationsTransformer(t *testing.T) {
--- a/plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go
+++ b/plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestConfigMapGenerator(t *testing.T) {
--- a/plugin/builtin/hashtransformer/HashTransformer_test.go
+++ b/plugin/builtin/hashtransformer/HashTransformer_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestHashTransformer(t *testing.T) {
--- a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go
+++ b/plugin/builtin/imagetagtransformer/ImageTagTransformer.go
@@ -7,9 +7,10 @@ package main
 import (
 	"fmt"
 	"regexp"
+	"strings"
+
 	"sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"strings"

 	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/yaml"
--- a/plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go
+++ b/plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestImageTagTransformerNewTag(t *testing.T) {
--- a/plugin/builtin/inventorytransformer/InventoryTransformer.go
+++ b/plugin/builtin/inventorytransformer/InventoryTransformer.go
@@ -8,12 +8,12 @@ import (
 	"fmt"

 	"sigs.k8s.io/kustomize/v3/api/hasher"
+	"sigs.k8s.io/kustomize/v3/api/inventory"
 	"sigs.k8s.io/kustomize/v3/api/kv"
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/inventory"
 	"sigs.k8s.io/yaml"
 )

--- a/plugin/builtin/inventorytransformer/InventoryTransformer_test.go
+++ b/plugin/builtin/inventorytransformer/InventoryTransformer_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 const (
--- a/plugin/builtin/labeltransformer/LabelTransformer_test.go
+++ b/plugin/builtin/labeltransformer/LabelTransformer_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestLabelTransformer(t *testing.T) {
--- a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go
+++ b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestLegacyOrderTransformer(t *testing.T) {
--- a/plugin/builtin/namespacetransformer/NamespaceTransformer.go
+++ b/plugin/builtin/namespacetransformer/NamespaceTransformer.go
@@ -6,6 +6,7 @@ package main

 import (
 	"fmt"
+
 	"sigs.k8s.io/kustomize/v3/api/transform"

 	"sigs.k8s.io/kustomize/v3/api/resid"
--- a/plugin/builtin/namespacetransformer/NamespaceTransformer_test.go
+++ b/plugin/builtin/namespacetransformer/NamespaceTransformer_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestNamespaceTransformer1(t *testing.T) {
--- a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go
+++ b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 const target = `
--- a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go
+++ b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 const (
--- a/plugin/builtin/patchtransformer/PatchTransformer_test.go
+++ b/plugin/builtin/patchtransformer/PatchTransformer_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 const (
--- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go
+++ b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go
@@ -7,6 +7,7 @@ package main
 import (
 	"errors"
 	"fmt"
+
 	"sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/api/types"

--- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go
+++ b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestPrefixSuffixTransformer(t *testing.T) {
--- a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go
+++ b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go
@@ -6,6 +6,7 @@ package main

 import (
 	"fmt"
+
 	"sigs.k8s.io/kustomize/v3/api/transform"

 	"sigs.k8s.io/kustomize/v3/api/resid"
--- a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go
+++ b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestReplicaCountTransformer(t *testing.T) {
--- a/plugin/builtin/secretgenerator/SecretGenerator_test.go
+++ b/plugin/builtin/secretgenerator/SecretGenerator_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestSecretGenerator(t *testing.T) {
--- a/plugin/someteam.example.com/v1/bashedconfigmap/BashedConfigMap_test.go
+++ b/plugin/someteam.example.com/v1/bashedconfigmap/BashedConfigMap_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestBashedConfigMapPlugin(t *testing.T) {
--- a/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go
+++ b/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go
@@ -11,7 +11,7 @@ import (
 	"regexp"
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 // This test requires having the helm binary on the PATH.
--- a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go
+++ b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestDatePrefixerPlugin(t *testing.T) {
--- a/plugin/someteam.example.com/v1/gogetter/GoGetter_test.go
+++ b/plugin/someteam.example.com/v1/gogetter/GoGetter_test.go
@@ -10,7 +10,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 // This test requires having the go-getter binary on the PATH.
--- a/plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go
+++ b/plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func shouldContain(t *testing.T, s []byte, x string) {
--- a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go
+++ b/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestSecretsFromDatabasePlugin(t *testing.T) {
--- a/plugin/someteam.example.com/v1/sedtransformer/SedTransformer_test.go
+++ b/plugin/someteam.example.com/v1/sedtransformer/SedTransformer_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestSedTransformer(t *testing.T) {
--- a/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go
+++ b/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestSomeServiceGeneratorPlugin(t *testing.T) {
--- a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go
+++ b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go
@@ -6,7 +6,7 @@ package main_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestStringPrefixerPlugin(t *testing.T) {
--- a/plugin/someteam.example.com/v1/validator/validator_test.go
+++ b/plugin/someteam.example.com/v1/validator/validator_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"

-	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 )

 func TestValidatorHappy(t *testing.T) {