Start api directory, which will become a module.

This commit is contained in:
Jeffrey Regan
2019-10-17 11:36:34 -07:00
parent 180429774a
commit e5c8b5ec8f
226 changed files with 623 additions and 689 deletions

View File

@@ -2,9 +2,9 @@
package builtin
import (
"sigs.k8s.io/kustomize/v3/kv"
"sigs.k8s.io/kustomize/v3/api/kv"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -4,7 +4,7 @@ package builtin
import (
"fmt"
"regexp"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/kustomize/v3/api/types"
"strings"
"sigs.k8s.io/kustomize/v3/pkg/resmap"

View File

@@ -4,13 +4,13 @@ package builtin
import (
"fmt"
"sigs.k8s.io/kustomize/v3/hasher"
"sigs.k8s.io/kustomize/v3/kv"
"sigs.k8s.io/kustomize/v3/api/hasher"
"sigs.k8s.io/kustomize/v3/api/kv"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/inventory"
"sigs.k8s.io/kustomize/v3/pkg/resid"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/pkg/resource"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -4,12 +4,12 @@ package builtin
import (
"fmt"
"sigs.k8s.io/kustomize/v3/pkg/resid"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/pkg/resource"
"sigs.k8s.io/kustomize/v3/pkg/transformers"
"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -6,11 +6,10 @@ import (
"github.com/evanphx/json-patch"
"github.com/pkg/errors"
"sigs.k8s.io/kustomize/v3/pkg/gvk"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/ifc"
"sigs.k8s.io/kustomize/v3/pkg/resid"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)
@@ -70,7 +69,7 @@ func (p *PatchJson6902TransformerPlugin) Config(
func (p *PatchJson6902TransformerPlugin) Transform(m resmap.ResMap) error {
id := resid.NewResIdWithNamespace(
gvk.Gvk{
resid.Gvk{
Group: p.Target.Group,
Version: p.Target.Version,
Kind: p.Target.Kind,

View File

@@ -4,9 +4,9 @@ package builtin
import (
"fmt"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/pkg/resource"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -6,9 +6,9 @@ import (
"github.com/evanphx/json-patch"
"github.com/pkg/errors"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/pkg/resource"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -5,8 +5,7 @@ import (
"errors"
"fmt"
"sigs.k8s.io/kustomize/v3/pkg/gvk"
"sigs.k8s.io/kustomize/v3/pkg/resid"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/pkg/transformers"
"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
@@ -23,10 +22,10 @@ type PrefixSuffixTransformerPlugin struct {
// Not placed in a file yet due to lack of demand.
var prefixSuffixFieldSpecsToSkip = []config.FieldSpec{
{
Gvk: gvk.Gvk{Kind: "CustomResourceDefinition"},
Gvk: resid.Gvk{Kind: "CustomResourceDefinition"},
},
{
Gvk: gvk.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"},
Gvk: resid.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"},
},
}

View File

@@ -4,11 +4,11 @@ package builtin
import (
"fmt"
"sigs.k8s.io/kustomize/v3/pkg/resid"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/pkg/transformers"
"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -2,9 +2,9 @@
package builtin
import (
"sigs.k8s.io/kustomize/v3/kv"
"sigs.k8s.io/kustomize/v3/api/kv"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -6,18 +6,17 @@ package main_test
import (
"testing"
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
"sigs.k8s.io/kustomize/v3/pluglib"
"sigs.k8s.io/kustomize/v3/api/kusttest"
)
func TestAnnotationsTransformer(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "AnnotationsTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin

View File

@@ -5,9 +5,9 @@
package main
import (
"sigs.k8s.io/kustomize/v3/kv"
"sigs.k8s.io/kustomize/v3/api/kv"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -6,19 +6,17 @@ package main_test
import (
"testing"
"sigs.k8s.io/kustomize/v3/pluglib"
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
"sigs.k8s.io/kustomize/v3/api/kusttest"
)
func TestConfigMapGenerator(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "ConfigMapGenerator")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
th.WriteF("/app/devops.env", `
SERVICE_PORT=32

View File

@@ -6,19 +6,17 @@ package main_test
import (
"testing"
"sigs.k8s.io/kustomize/v3/pluglib"
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
"sigs.k8s.io/kustomize/v3/api/kusttest"
)
func TestHashTransformer(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "HashTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin

View File

@@ -7,7 +7,7 @@ package main
import (
"fmt"
"regexp"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/kustomize/v3/api/types"
"strings"
"sigs.k8s.io/kustomize/v3/pkg/resmap"

View File

@@ -6,19 +6,17 @@ package main_test
import (
"testing"
"sigs.k8s.io/kustomize/v3/pluglib"
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
"sigs.k8s.io/kustomize/v3/api/kusttest"
)
func TestImageTagTransformerNewTag(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "ImageTagTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin
@@ -83,13 +81,13 @@ spec:
`)
}
func TestImageTagTransformerNewImage(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "ImageTagTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin
@@ -155,13 +153,13 @@ spec:
}
func TestImageTagTransformerNewImageAndTag(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "ImageTagTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin
@@ -228,13 +226,13 @@ spec:
}
func TestImageTagTransformerNewDigest(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "ImageTagTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin
@@ -300,13 +298,13 @@ spec:
}
func TestImageTagTransformerNewImageAndDigest(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "ImageTagTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin

View File

@@ -7,13 +7,13 @@ package main
import (
"fmt"
"sigs.k8s.io/kustomize/v3/hasher"
"sigs.k8s.io/kustomize/v3/kv"
"sigs.k8s.io/kustomize/v3/api/hasher"
"sigs.k8s.io/kustomize/v3/api/kv"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/inventory"
"sigs.k8s.io/kustomize/v3/pkg/resid"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/pkg/resource"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -6,9 +6,7 @@ package main_test
import (
"testing"
"sigs.k8s.io/kustomize/v3/pluglib"
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
"sigs.k8s.io/kustomize/v3/api/kusttest"
)
const (
@@ -60,13 +58,13 @@ metadata:
)
func TestInventoryTransformerCollect(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "InventoryTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin
@@ -81,13 +79,13 @@ policy: GarbageCollect
}
func TestInventoryTransformerIgnore(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "InventoryTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin
@@ -102,13 +100,13 @@ policy: GarbageIgnore
}
func TestInventoryTransformerDefaultPolicy(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "InventoryTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin

View File

@@ -6,19 +6,17 @@ package main_test
import (
"testing"
"sigs.k8s.io/kustomize/v3/pluglib"
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
"sigs.k8s.io/kustomize/v3/api/kusttest"
)
func TestLabelTransformer(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "LabelTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin

View File

@@ -6,19 +6,17 @@ package main_test
import (
"testing"
"sigs.k8s.io/kustomize/v3/pluglib"
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
"sigs.k8s.io/kustomize/v3/api/kusttest"
)
func TestLegacyOrderTransformer(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "LegacyOrderTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin
kind: LegacyOrderTransformer

View File

@@ -7,12 +7,12 @@ package main
import (
"fmt"
"sigs.k8s.io/kustomize/v3/pkg/resid"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/pkg/resource"
"sigs.k8s.io/kustomize/v3/pkg/transformers"
"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -7,19 +7,17 @@ import (
"strings"
"testing"
"sigs.k8s.io/kustomize/v3/pluglib"
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
"sigs.k8s.io/kustomize/v3/api/kusttest"
)
func TestNamespaceTransformer1(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "NamespaceTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin
@@ -191,13 +189,13 @@ metadata:
}
func TestNamespaceTransformerClusterLevelKinds(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "NamespaceTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
const noChangeExpected = `
apiVersion: v1
@@ -242,13 +240,13 @@ fieldSpecs:
}
func TestNamespaceTransformerObjectConflict(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "NamespaceTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
err := th.ErrorFromLoadAndRunTransformer(`
apiVersion: builtin

View File

@@ -9,11 +9,10 @@ import (
"github.com/evanphx/json-patch"
"github.com/pkg/errors"
"sigs.k8s.io/kustomize/v3/pkg/gvk"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/ifc"
"sigs.k8s.io/kustomize/v3/pkg/resid"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)
@@ -76,7 +75,7 @@ func (p *plugin) Config(
func (p *plugin) Transform(m resmap.ResMap) error {
id := resid.NewResIdWithNamespace(
gvk.Gvk{
resid.Gvk{
Group: p.Target.Group,
Version: p.Target.Version,
Kind: p.Target.Kind,

View File

@@ -7,9 +7,7 @@ import (
"strings"
"testing"
"sigs.k8s.io/kustomize/v3/pluglib"
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
"sigs.k8s.io/kustomize/v3/api/kusttest"
)
const target = `
@@ -30,13 +28,13 @@ spec:
`
func TestPatchJson6902TransformerMissingFile(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchJson6902Transformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
_, err := th.RunTransformer(`
apiVersion: builtin
@@ -59,13 +57,13 @@ path: jsonpatch.json
}
func TestBadPatchJson6902Transformer(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchJson6902Transformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
_, err := th.RunTransformer(`
apiVersion: builtin
@@ -88,13 +86,13 @@ jsonOp: 'thisIsNotAPatch'
}
func TestBothEmptyJson6902Transformer(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchJson6902Transformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
_, err := th.RunTransformer(`
apiVersion: builtin
@@ -116,13 +114,13 @@ target:
}
func TestBothSpecifiedJson6902Transformer(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchJson6902Transformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
th.WriteF("/app/jsonpatch.json", `[
{"op": "replace", "path": "/spec/template/spec/containers/0/name", "value": "my-nginx"},
@@ -152,13 +150,13 @@ jsonOp: '[{"op": "add", "path": "/spec/template/spec/dnsPolicy", "value": "Clust
}
func TestPatchJson6902TransformerFromJsonFile(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchJson6902Transformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
th.WriteF("/app/jsonpatch.json", `[
{"op": "replace", "path": "/spec/template/spec/containers/0/name", "value": "my-nginx"},
@@ -202,13 +200,13 @@ spec:
}
func TestPatchJson6902TransformerFromYamlFile(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchJson6902Transformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
th.WriteF("/app/jsonpatch.json", `
- op: add
@@ -252,13 +250,13 @@ spec:
}
func TestPatchJson6902TransformerWithInlineJSON(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchJson6902Transformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin
@@ -293,13 +291,13 @@ spec:
}
func TestPatchJson6902TransformerWithInlineYAML(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchJson6902Transformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin

View File

@@ -7,9 +7,9 @@ package main
import (
"fmt"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/pkg/resource"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -8,9 +8,7 @@ import (
"strings"
"testing"
"sigs.k8s.io/kustomize/v3/pluglib"
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
"sigs.k8s.io/kustomize/v3/api/kusttest"
)
const (
@@ -60,12 +58,12 @@ spec:
)
func TestPatchStrategicMergeTransformerMissingFile(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
_, err := th.RunTransformer(`
apiVersion: builtin
@@ -87,13 +85,13 @@ paths:
}
func TestBadPatchStrategicMergeTransformer(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
_, err := th.RunTransformer(`
apiVersion: builtin
@@ -112,13 +110,13 @@ patches: 'thisIsNotAPatch'
}
func TestBothEmptyPatchStrategicMergeTransformer(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
_, err := th.RunTransformer(`
apiVersion: builtin
@@ -135,13 +133,13 @@ metadata:
}
func TestPatchStrategicMergeTransformerFromFiles(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
th.WriteF("/app/patch.yaml", `
apiVersion: apps/v1
@@ -185,13 +183,13 @@ spec:
}
func TestPatchStrategicMergeTransformerWithInlineJSON(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin
@@ -220,13 +218,13 @@ spec:
}
func TestPatchStrategicMergeTransformerWithInlineYAML(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin
@@ -272,13 +270,13 @@ spec:
}
func TestPatchStrategicMergeTransformerMultiplePatches(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
th.WriteF("/app/patch1.yaml", `
apiVersion: apps/v1
@@ -349,13 +347,13 @@ spec:
}
func TestStrategicMergeTransformerMultiplePatchesWithConflicts(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
th.WriteF("/app/patch1.yaml", `
apiVersion: apps/v1
@@ -410,13 +408,13 @@ paths:
}
func TestStrategicMergeTransformerWrongNamespace(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
th.WriteF("/app/patch.yaml", `
apiVersion: apps/v1
@@ -453,13 +451,13 @@ paths:
}
func TestStrategicMergeTransformerNoSchema(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
th.WriteF("/app/patch.yaml", `
apiVersion: example.com/v1
@@ -493,13 +491,13 @@ spec:
}
func TestStrategicMergeTransformerNoSchemaMultiPatches(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
th.WriteF("/app/patch1.yaml", `
apiVersion: example.com/v1
@@ -549,13 +547,13 @@ spec:
}
func TestStrategicMergeTransformerNoSchemaMultiPatchesWithConflict(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
th.WriteF("/app/patch1.yaml", `
apiVersion: example.com/v1
@@ -885,13 +883,13 @@ func TestSinglePatch(t *testing.T) {
},
}
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
for _, test := range tests {
th := kusttest_test.NewKustTestPluginHarness(t, fmt.Sprintf("/%s", test.name))
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, fmt.Sprintf("/%s", test.name))
th.WriteF(fmt.Sprintf("/%s/patch%d.yaml", test.name, 0), test.patch)
if test.errorExpected {
@@ -988,13 +986,13 @@ func TestMultiplePatches(t *testing.T) {
},
}
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
for _, test := range tests {
th := kusttest_test.NewKustTestPluginHarness(t, fmt.Sprintf("/%s", test.name))
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, fmt.Sprintf("/%s", test.name))
for idx, patch := range test.patch {
th.WriteF(fmt.Sprintf("/%s/patch%d.yaml", test.name, idx), patch)
}
@@ -1119,13 +1117,13 @@ func TestMultiplePatchesWithConflict(t *testing.T) {
},
}
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
for _, test := range tests {
th := kusttest_test.NewKustTestPluginHarness(t, fmt.Sprintf("/%s", test.name))
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, fmt.Sprintf("/%s", test.name))
for idx, patch := range test.patch {
th.WriteF(fmt.Sprintf("/%s/patch%d.yaml", test.name, idx), patch)
}
@@ -1228,13 +1226,13 @@ func TestMultipleNamespaces(t *testing.T) {
},
}
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
for _, test := range tests {
th := kusttest_test.NewKustTestPluginHarness(t, fmt.Sprintf("/%s", test.name))
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, fmt.Sprintf("/%s", test.name))
for idx, patch := range test.patch {
th.WriteF(fmt.Sprintf("/%s/patch%d.yaml", test.name, idx), patch)
}
@@ -1250,13 +1248,13 @@ func TestMultipleNamespaces(t *testing.T) {
}
func TestPatchStrategicMergeTransformerPatchDelete(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchStrategicMergeTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
th.WriteF("/app/patch.yaml", `
apiVersion: apps/v1

View File

@@ -9,9 +9,9 @@ import (
"github.com/evanphx/json-patch"
"github.com/pkg/errors"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/pkg/resource"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -7,9 +7,7 @@ import (
"strings"
"testing"
"sigs.k8s.io/kustomize/v3/pluglib"
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
"sigs.k8s.io/kustomize/v3/api/kusttest"
)
const (
@@ -67,12 +65,12 @@ spec:
)
func TestPatchTransformerMissingFile(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
_, err := th.RunTransformer(`
apiVersion: builtin
@@ -91,12 +89,12 @@ path: patch.yaml
}
func TestPatchTransformerBadPatch(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
_, err := th.RunTransformer(`
apiVersion: builtin
@@ -115,12 +113,12 @@ patch: "thisIsNotAPatch"
}
func TestPatchTransformerMissingSelector(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
_, err := th.RunTransformer(`
apiVersion: builtin
@@ -139,13 +137,13 @@ patch: '[{"op": "add", "path": "/spec/template/spec/dnsPolicy", "value": "Cluste
}
func TestPatchTransformerBothEmptyPathAndPatch(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
_, err := th.RunTransformer(`
apiVersion: builtin
@@ -162,13 +160,13 @@ metadata:
}
func TestPatchTransformerBothNonEmptyPathAndPatch(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
_, err := th.RunTransformer(`
apiVersion: builtin
@@ -187,13 +185,13 @@ Patch: "something"
}
func TestPatchTransformerFromFiles(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
th.WriteF("/app/patch.yaml", `
apiVersion: apps/v1
@@ -269,13 +267,13 @@ spec:
}
func TestPatchTransformerWithInline(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PatchTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin

View File

@@ -8,8 +8,7 @@ import (
"errors"
"fmt"
"sigs.k8s.io/kustomize/v3/pkg/gvk"
"sigs.k8s.io/kustomize/v3/pkg/resid"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/pkg/transformers"
"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
@@ -29,10 +28,10 @@ var KustomizePlugin plugin
// Not placed in a file yet due to lack of demand.
var prefixSuffixFieldSpecsToSkip = []config.FieldSpec{
{
Gvk: gvk.Gvk{Kind: "CustomResourceDefinition"},
Gvk: resid.Gvk{Kind: "CustomResourceDefinition"},
},
{
Gvk: gvk.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"},
Gvk: resid.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"},
},
}

View File

@@ -6,19 +6,17 @@ package main_test
import (
"testing"
"sigs.k8s.io/kustomize/v3/pluglib"
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
"sigs.k8s.io/kustomize/v3/api/kusttest"
)
func TestPrefixSuffixTransformer(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "PrefixSuffixTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin
kind: PrefixSuffixTransformer

View File

@@ -7,11 +7,11 @@ package main
import (
"fmt"
"sigs.k8s.io/kustomize/v3/pkg/resid"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/pkg/transformers"
"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -6,19 +6,17 @@ package main_test
import (
"testing"
"sigs.k8s.io/kustomize/v3/pluglib"
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
"sigs.k8s.io/kustomize/v3/api/kusttest"
)
func TestReplicaCountTransformer(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "ReplicaCountTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin
@@ -154,13 +152,13 @@ spec:
}
func TestMatchesCurrentID(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin("builtin", "", "PrefixSuffixTransformer")
tc.BuildGoPlugin("builtin", "", "ReplicaCountTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
rm := th.LoadAndRunTransformer(`
apiVersion: builtin
@@ -200,12 +198,12 @@ spec:
}
func TestNoMatch(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin("builtin", "", "ReplicaCountTransformer")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
err := th.ErrorFromLoadAndRunTransformer(`
apiVersion: builtin

View File

@@ -5,9 +5,9 @@
package main
import (
"sigs.k8s.io/kustomize/v3/kv"
"sigs.k8s.io/kustomize/v3/api/kv"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -6,19 +6,17 @@ package main_test
import (
"testing"
"sigs.k8s.io/kustomize/v3/pluglib"
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
"sigs.k8s.io/kustomize/v3/api/kusttest"
)
func TestSecretGenerator(t *testing.T) {
tc := pluglib.NewEnvForTest(t).Set()
tc := kusttest_test.NewPluginTestEnv(t).Set()
defer tc.Reset()
tc.BuildGoPlugin(
"builtin", "", "SecretGenerator")
th := kusttest_test.NewKustTestPluginHarness(t, "/app")
th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app")
th.WriteF("/app/a.env", `
ROUTER_PASSWORD=admin