update go.mod for release

.github/workflows/go.yml

@@ -1,100 +0,0 @@
-name: Go
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-
-  lint:
-    name: Lint
-    runs-on: [ubuntu-latest]
-    steps:
-
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v2
-      with:
-        go-version: ^1.13
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
-
-    - name: Lint
-      run: ./travis/kyaml-pre-commit.sh
-      env:
-        KUSTOMIZE_DOCKER_E2E: false # don't need to do e2e tests for linting
-
-  test-linux:
-    name: Test Linux
-    runs-on: [ubuntu-latest]
-    steps:
-
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v2
-        with:
-          go-version: ^1.13
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Test kyaml
-        run: go test -cover ./...
-        working-directory: ./kyaml
-
-      - name: Test cmd/config
-        run: go test -cover ./...
-        working-directory: ./cmd/config
-        env:
-          KUSTOMIZE_DOCKER_E2E: true
-
-  test-macos:
-    name: Test MacOS
-    runs-on: [macos-latest]
-    steps:
-
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v2
-        with:
-          go-version: ^1.13
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Test kyaml
-        run: go test -cover ./...
-        working-directory: ./kyaml
-
-      - name: Test cmd/config
-        run: go test -cover ./...
-        working-directory: ./cmd/config
-        env:
-          KUSTOMIZE_DOCKER_E2E: false # docker not installed on mac
-
-  test-windows:
-    name: Test Windows
-    runs-on: [windows-latest]
-    steps:
-
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v2
-        with:
-          go-version: ^1.13
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Test kyaml
-        run: go test -cover ./...
-        working-directory: ./kyaml
-
-      - name: Test cmd/config
-        run: go test -cover ./...
-        working-directory: ./cmd/config
-        env:
-          KUSTOMIZE_DOCKER_E2E: false # docker on windows not working well yet

.gitignore

@@ -19,5 +19,3 @@
 
 # macOS
 *.DS_store
-
-.bin

.golangci-kustomize.yml

@@ -7,13 +7,8 @@ linters:
     - bodyclose
     - deadcode
     - depguard
-    # - dogsled
     - dupl
-    # - errcheck
-    # - funlen
-    # - gochecknoinits
     - goconst
-    # - gocritic
     - gocyclo
     - gofmt
     - goimports
@@ -26,7 +21,6 @@ linters:
     - lll
     - misspell
     - nakedret
-    # - scopelint
     - staticcheck
     - structcheck
     # stylecheck demands that acronyms not be treated as words
@@ -34,10 +28,9 @@ linters:
     # - stylecheck
     - typecheck
     - unconvert
-    - unparam
     - unused
+    - unparam
     - varcheck
-    # - whitespace
 
 linters-settings:
   dupl:

.travis.yml

@@ -0,0 +1,43 @@
+os:
+  - linux
+  - osx
+# TODO: Speed up the slowness of the osx travis runs
+# Maybe cache brew installs?
+#
+# TODO: Uncomment when some gets the tests running on Windows.
+#  - windows
+
+addons:
+  apt:
+    packages:
+    - tree
+  homebrew:
+    packages:
+    - tree
+    update: true
+
+# Only clone the most recent commit.
+git:
+  depth: 1
+
+language: go
+
+go:
+  - "1.13"
+
+go_import_path: sigs.k8s.io/kustomize
+
+before_install:
+  - source ./travis/consider-early-travis-exit.sh
+
+# Skip the install process; let pre-commit.sh do it.
+install: true
+
+script:
+  - make verify-kustomize
+  - ./travis/kyaml-pre-commit.sh
+  - ./travis/check-go-mod.sh
+
+# TBD. Suppressing for now.
+notifications:
+  email: false

Makefile

@@ -15,21 +15,7 @@ verify-kustomize: \
 	lint-kustomize \
 	test-unit-kustomize-all \
 	test-examples-kustomize-against-HEAD \
-	test-examples-kustomize-against-3.8.0
-
-# The following target referenced by a file in
-# https://github.com/kubernetes/test-infra/tree/master/config/jobs/kubernetes-sigs/kustomize
-.PHONY: prow-presubmit-check
-prow-presubmit-check: \
-	lint-kustomize \
-	test-unit-kustomize-all \
-	test-unit-cmd-all \
-	test-go-mod \
-	test-examples-kustomize-against-HEAD \
-	test-examples-kustomize-against-3.8.0
-
-.PHONY: verify-kustomize-e2e
-verify-kustomize-e2e: test-examples-e2e-kustomize
+	test-examples-kustomize-against-latest
 
 # Other builds in this repo might want a different linter version.
 # Without one Makefile to rule them all, the different makes
@@ -37,12 +23,14 @@ verify-kustomize-e2e: test-examples-e2e-kustomize
 # since everything uses the same implicit GOPATH.
 # This installs in a temp dir to avoid overwriting someone else's
 # linter, then installs in MYGOBIN with a new name.
-# Version pinned by hack/go.mod
+# Version pinned by api/go.mod
 $(MYGOBIN)/golangci-lint-kustomize:
 	( \
 		set -e; \
-		cd hack; \
-		GO111MODULE=on go build -tags=tools -o $(MYGOBIN)/golangci-lint-kustomize github.com/golangci/golangci-lint/cmd/golangci-lint; \
+		export GOBIN=$$(mktemp -d) \
+		cd api; \
+		GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint; \
+		mv $$GOBIN/golangci-lint $(MYGOBIN)/golangci-lint-kustomize \
 	)
 
 # Version pinned by api/go.mod
@@ -60,11 +48,6 @@ $(MYGOBIN)/goimports:
 	cd api; \
 	go install golang.org/x/tools/cmd/goimports
 
-# Install resource from whatever is checked out.
-$(MYGOBIN)/resource:
-	cd cmd/resource; \
-	go install .
-
 # To pin pluginator, use this recipe instead:
 #   cd api;
 #   go install sigs.k8s.io/kustomize/pluginator/v2
@@ -116,6 +99,7 @@ _builtinplugins = \
 	ConfigMapGenerator.go \
 	HashTransformer.go \
 	ImageTagTransformer.go \
+	InventoryTransformer.go \
 	LabelTransformer.go \
 	LegacyOrderTransformer.go \
 	NamespaceTransformer.go \
@@ -124,8 +108,7 @@ _builtinplugins = \
 	PatchTransformer.go \
 	PrefixSuffixTransformer.go \
 	ReplicaCountTransformer.go \
-	SecretGenerator.go \
-	ValueAddTransformer.go
+	SecretGenerator.go
 
 # Maintaining this explicit list of generated files, and
 # adding it as a dependency to a few targets, to assure
@@ -141,6 +124,7 @@ $(pGen)/AnnotationsTransformer.go: $(pSrc)/annotationstransformer/AnnotationsTra
 $(pGen)/ConfigMapGenerator.go: $(pSrc)/configmapgenerator/ConfigMapGenerator.go
 $(pGen)/HashTransformer.go: $(pSrc)/hashtransformer/HashTransformer.go
 $(pGen)/ImageTagTransformer.go: $(pSrc)/imagetagtransformer/ImageTagTransformer.go
+$(pGen)/InventoryTransformer.go: $(pSrc)/inventorytransformer/InventoryTransformer.go
 $(pGen)/LabelTransformer.go: $(pSrc)/labeltransformer/LabelTransformer.go
 $(pGen)/LegacyOrderTransformer.go: $(pSrc)/legacyordertransformer/LegacyOrderTransformer.go
 $(pGen)/NamespaceTransformer.go: $(pSrc)/namespacetransformer/NamespaceTransformer.go
@@ -150,7 +134,6 @@ $(pGen)/PatchTransformer.go: $(pSrc)/patchtransformer/PatchTransformer.go
 $(pGen)/PrefixSuffixTransformer.go: $(pSrc)/prefixsuffixtransformer/PrefixSuffixTransformer.go
 $(pGen)/ReplicaCountTransformer.go: $(pSrc)/replicacounttransformer/ReplicaCountTransformer.go
 $(pGen)/SecretGenerator.go: $(pSrc)/secretgenerator/SecretGenerator.go
-$(pGen)/ValueAddTransformer.go: $(pSrc)/valueaddtransformer/ValueAddTransformer.go
 
 # The (verbose but portable) Makefile way to convert to lowercase.
 toLowerCase = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1))))))))))))))))))))))))))
@@ -188,15 +171,9 @@ lint-kustomize: install-tools $(builtinplugins)
 	cd pluginator; \
 	$(MYGOBIN)/golangci-lint-kustomize -c ../.golangci-kustomize.yml run ./...
 
-# Used to add non-default compilation flags when experimenting with
-# plugin-to-api compatibility checks.
-.PHONY: build-kustomize-api
-build-kustomize-api: $(builtinplugins)
-	cd api; go build ./...
-
 .PHONY: test-unit-kustomize-api
-test-unit-kustomize-api: build-kustomize-api
-	cd api; go test ./...  -ldflags "-X sigs.k8s.io/kustomize/api/provenance.version=v444.333.222"
+test-unit-kustomize-api: $(builtinplugins)
+	cd api; go test ./...
 
 .PHONY: test-unit-kustomize-plugins
 test-unit-kustomize-plugins:
@@ -212,35 +189,18 @@ test-unit-kustomize-all: \
 	test-unit-kustomize-cli \
 	test-unit-kustomize-plugins
 
-test-unit-cmd-all:
-	./travis/kyaml-pre-commit.sh
-
-test-go-mod:
-	./travis/check-go-mod.sh
-
-.PHONY:
-test-examples-e2e-kustomize: $(MYGOBIN)/mdrip $(MYGOBIN)/kind
-	( \
-		set -e; \
-		/bin/rm -f $(MYGOBIN)/kustomize; \
-		echo "Installing kustomize from ."; \
-		cd kustomize; go install .; cd ..; \
-		./hack/testExamplesE2EAgainstKustomize.sh .; \
-	)
-
 .PHONY:
 test-examples-kustomize-against-HEAD: $(MYGOBIN)/kustomize $(MYGOBIN)/mdrip
 	./hack/testExamplesAgainstKustomize.sh HEAD
 
 .PHONY:
-test-examples-kustomize-against-3.8.0: $(MYGOBIN)/mdrip
+test-examples-kustomize-against-latest: $(MYGOBIN)/mdrip
 	( \
 		set -e; \
-		tag=v3.8.0; \
 		/bin/rm -f $(MYGOBIN)/kustomize; \
-		echo "Installing kustomize $$tag."; \
-		GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v3@$${tag}; \
-		./hack/testExamplesAgainstKustomize.sh $$tag; \
+		echo "Installing kustomize from latest."; \
+		GO111MODULE=on go install sigs.k8s.io/kustomize/kustomize/v3; \
+		./hack/testExamplesAgainstKustomize.sh latest; \
 		echo "Reinstalling kustomize from HEAD."; \
 		cd kustomize; go install .; \
 	)
@@ -262,48 +222,21 @@ $(MYGOBIN)/kubeval:
 	)
 
 # linux only.
-# This is for testing an example plugin that uses helm to inflate a chart
-# for subsequent kustomization.
-# Don't want to add a hard dependence in go.mod file to helm.
-# Instead, download the binaries.
-$(MYGOBIN)/helmV2:
+# This is for testing an example plugin that
+# uses helm to inflate a chart for subsequent kustomization.
+# Don't want to add a hard dependence in go.mod file
+# to helm.
+# Instead, download the binary.
+$(MYGOBIN)/helm:
 	( \
 		set -e; \
 		d=$(shell mktemp -d); cd $$d; \
-		tgzFile=helm-v2.13.1-linux-amd64.tar.gz; \
-		wget https://storage.googleapis.com/kubernetes-helm/$$tgzFile; \
-		tar -xvzf $$tgzFile; \
-		mv linux-amd64/helm $(MYGOBIN)/helmV2; \
+		wget https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-linux-amd64.tar.gz; \
+		tar -xvzf helm-v2.13.1-linux-amd64.tar.gz; \
+		mv linux-amd64/helm $(MYGOBIN); \
 		rm -rf $$d \
 	)
 
-# Helm V3 differs from helm V2; downloading it to provide coverage for the
-# chart inflator plugin under helm v3.
-$(MYGOBIN)/helmV3:
-	( \
-		set -e; \
-		d=$(shell mktemp -d); cd $$d; \
-		tgzFile=helm-v3.2.0-rc.1-linux-amd64.tar.gz; \
-		wget https://get.helm.sh/$$tgzFile; \
-		tar -xvzf $$tgzFile; \
-		mv linux-amd64/helm $(MYGOBIN)/helmV3; \
-		rm -rf $$d \
-	)
-
-# Default version of helm is v2 for the time being.
-$(MYGOBIN)/helm: $(MYGOBIN)/helmV2
-	ln -s $(MYGOBIN)/helmV2 $(MYGOBIN)/helm
-
-$(MYGOBIN)/kind:
-	( \
-        set -e; \
-        d=$(shell mktemp -d); cd $$d; \
-        wget -O ./kind https://github.com/kubernetes-sigs/kind/releases/download/v0.7.0/kind-$(shell uname)-amd64; \
-        chmod +x ./kind; \
-        mv ./kind $(MYGOBIN); \
-        rm -rf $$d; \
-	)
-
 .PHONY: clean
 clean: kustomize-external-go-plugin-clean
 	go clean --cache
@@ -312,7 +245,6 @@ clean: kustomize-external-go-plugin-clean
 	rm -f $(MYGOBIN)/kustomize
 	rm -f $(MYGOBIN)/golangci-lint-kustomize
 
-# Nuke the site from orbit.  It's the only way to be sure.
 .PHONY: nuke
 nuke: clean
-	go clean --modcache
+	sudo rm -rf $(shell go env GOPATH)/pkg/mod/sigs.k8s.io

OWNERS_ALIASES

@@ -9,5 +9,3 @@ aliases:
     - mengqiy
     - monopole
     - pwittrock
-    - mortent
-    - phanimarupaka

README.md

@@ -9,15 +9,19 @@ patch [kubernetes style] API objects.  It's like
 [`make`], in that what it does is declared in a file,
 and it's like [`sed`], in that it emits edited text.
 
-This tool is sponsored by [sig-cli] ([KEP]).
+This tool is sponsored by [sig-cli] ([KEP]), and
+inspired by [DAM].
 
- - [Installation instructions](https://kubernetes-sigs.github.io/kustomize/installation)
- - [General documentation](https://kubernetes-sigs.github.io/kustomize)
- - [Examples](examples)
 
-[![Build Status](https://prow.k8s.io/badge.svg?jobs=kustomize-presubmit-master)](https://prow.k8s.io/job-history/kubernetes-jenkins/pr-logs/directory/kustomize-presubmit-master)
+[![Build Status](https://travis-ci.org/kubernetes-sigs/kustomize.svg?branch=master)](https://travis-ci.org/kubernetes-sigs/kustomize)
 [![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes-sigs/kustomize)](https://goreportcard.com/report/github.com/kubernetes-sigs/kustomize)
 
+Download a binary from the [release page], or see
+these [instructions](docs/INSTALL.md).
+
+Browse the [docs](docs) or jump right into the
+tested [examples](examples).
+
 ## kubectl integration
 
 Since [v1.14][kubectl announcement] the kustomize build system has been included in kubectl.
@@ -103,7 +107,7 @@ Take the work from step (1) above, move it into a
 `someApp` subdirectory called `base`, then
 place overlays in a sibling directory.
 
-An overlay is just another kustomization, referring to
+An overlay is just another kustomization, refering to
 the base, and referring to patches to apply to that
 base.
 
@@ -129,8 +133,20 @@ The YAML can be directly [applied] to a cluster:
 
 ## Community
 
-- [file a bug](https://kubernetes-sigs.github.io/kustomize/contributing/bugs/) instructions
-- [contribute a feature](https://kubernetes-sigs.github.io/kustomize/contributing/features/) instructions
+To file bugs please read [this](docs/bugs.md).
+
+Before working on an implementation, please
+
+ * Read the [eschewed feature list].
+ * File an issue describing
+   how the new feature would behave
+   and label it [kind/feature].
+
+### Other communication channels
+
+- [Slack]
+- [Mailing List]
+- General kubernetes [community page]
 
 ### Code of conduct
 
@@ -139,27 +155,32 @@ is governed by the [Kubernetes Code of Conduct].
 
 [`make`]: https://www.gnu.org/software/make
 [`sed`]: https://www.gnu.org/software/sed
-[DAM]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#declarative-application-management
+[DAM]: docs/glossary.md#declarative-application-management
 [KEP]: https://github.com/kubernetes/enhancements/blob/master/keps/sig-cli/0008-kustomize.md
 [Kubernetes Code of Conduct]: code-of-conduct.md
-[applied]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#apply
-[base]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#base
-[declarative configuration]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#declarative-application-management
+[Mailing List]: https://groups.google.com/forum/#!forum/kubernetes-sig-cli
+[Slack]: https://kubernetes.slack.com/messages/sig-cli
+[applied]: docs/glossary.md#apply
+[base]: docs/glossary.md#base
+[community page]: http://kubernetes.io/community/
+[declarative configuration]: docs/glossary.md#declarative-application-management
+[eschewed feature list]: docs/eschewedFeatures.md
 [imageBase]: docs/images/base.jpg
 [imageOverlay]: docs/images/overlay.jpg
+[kind/feature]: /../../labels/kind%2Ffeature
 [kubectl announcement]: https://kubernetes.io/blog/2019/03/25/kubernetes-1-14-release-announcement
 [kubectl book]: https://kubectl.docs.kubernetes.io/pages/app_customization/introduction.html
 [kubernetes documentation]: https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/
-[kubernetes style]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#kubernetes-style-object
-[kustomization]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#kustomization
-[overlay]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#overlay
-[overlays]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#overlay
-[release page]: https://github.com/kubernetes-sigs/kustomize/releases
-[resource]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#resource
-[resources]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#resource
+[kubernetes style]: docs/glossary.md#kubernetes-style-object
+[kustomization]: docs/glossary.md#kustomization
+[overlay]: docs/glossary.md#overlay
+[overlays]: docs/glossary.md#overlay
+[release page]: /../../releases
+[resource]: docs/glossary.md#resource
+[resources]: docs/glossary.md#resource
 [sig-cli]: https://github.com/kubernetes/community/blob/master/sig-cli/README.md
-[variant]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#variant
-[variants]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#variant
-[v2.0.3]: https://github.com/kubernetes-sigs/kustomize/releases/tag/v2.0.3
-[v2.1.0]: https://github.com/kubernetes-sigs/kustomize/releases/tag/v2.1.0
-[workflows]: https://kubernetes-sigs.github.io/kustomize/guides
+[variant]: docs/glossary.md#variant
+[variants]: docs/glossary.md#variant
+[v2.0.3]: /../../releases/tag/v2.0.3
+[v2.1.0]: /../../releases/tag/v2.1.0
+[workflows]: docs/workflows.md

api/builtins/AnnotationsTransformer.go

@@ -4,10 +4,9 @@
 package builtins
 
 import (
-	"sigs.k8s.io/kustomize/api/filters/annotations"
 	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/transform"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
 	"sigs.k8s.io/yaml"
 )
 
@@ -25,16 +24,14 @@ func (p *AnnotationsTransformerPlugin) Config(
 }
 
 func (p *AnnotationsTransformerPlugin) Transform(m resmap.ResMap) error {
-	for _, r := range m.Resources() {
-		err := filtersutil.ApplyToJSON(annotations.Filter{
-			Annotations: p.Annotations,
-			FsSlice:     p.FieldSpecs,
-		}, r)
-		if err != nil {
-			return err
-		}
+	t, err := transform.NewMapTransformer(
+		p.FieldSpecs,
+		p.Annotations,
+	)
+	if err != nil {
+		return err
 	}
-	return nil
+	return t.Transform(m)
 }
 
 func NewAnnotationsTransformerPlugin() resmap.TransformerPlugin {

api/builtins/ConfigMapGenerator.go

@@ -13,10 +13,13 @@ import (
 type ConfigMapGeneratorPlugin struct {
 	h                *resmap.PluginHelpers
 	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+	types.GeneratorOptions
 	types.ConfigMapArgs
 }
 
-func (p *ConfigMapGeneratorPlugin) Config(h *resmap.PluginHelpers, config []byte) (err error) {
+func (p *ConfigMapGeneratorPlugin) Config(
+	h *resmap.PluginHelpers, config []byte) (err error) {
+	p.GeneratorOptions = types.GeneratorOptions{}
 	p.ConfigMapArgs = types.ConfigMapArgs{}
 	err = yaml.Unmarshal(config, p)
 	if p.ConfigMapArgs.Name == "" {
@@ -31,7 +34,8 @@ func (p *ConfigMapGeneratorPlugin) Config(h *resmap.PluginHelpers, config []byte
 
 func (p *ConfigMapGeneratorPlugin) Generate() (resmap.ResMap, error) {
 	return p.h.ResmapFactory().FromConfigMapArgs(
-		kv.NewLoader(p.h.Loader(), p.h.Validator()), p.ConfigMapArgs)
+		kv.NewLoader(p.h.Loader(), p.h.Validator()),
+		&p.GeneratorOptions, p.ConfigMapArgs)
 }
 
 func NewConfigMapGeneratorPlugin() resmap.GeneratorPlugin {

api/builtins/ImageTagTransformer.go

@@ -8,10 +8,10 @@ import (
 	"regexp"
 	"strings"
 
-	"sigs.k8s.io/kustomize/api/filters/imagetag"
-	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/transform"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
+
+	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/yaml"
 )
 
@@ -31,18 +31,18 @@ func (p *ImageTagTransformerPlugin) Config(
 
 func (p *ImageTagTransformerPlugin) Transform(m resmap.ResMap) error {
 	for _, r := range m.Resources() {
-		// If you're here because someone expected any field containing
-		// the string "containers" or "initContainers" to get an image
-		// update (not just spec/template/spec/containers[], etc.) then
-		// a code change is needed.  See api/filters/imagetag/legacy
-		// for the start of an implementation that won't use an
-		// allowlist like FsSlice, and instead walks the object looking
-		// for fields named containers or initContainers.
-		err := filtersutil.ApplyToJSON(imagetag.Filter{
-			ImageTag: p.ImageTag,
-			FsSlice:  p.FieldSpecs,
-		}, r)
-		if err != nil {
+		for _, path := range p.FieldSpecs {
+			if !r.OrgId().IsSelected(&path.Gvk) {
+				continue
+			}
+			err := transform.MutateField(
+				r.Map(), path.PathSlice(), false, p.mutateImage)
+			if err != nil {
+				return err
+			}
+		}
+		// Kept for backward compatibility
+		if err := p.findAndReplaceImage(r.Map()); err != nil && r.OrgId().Kind != `CustomResourceDefinition` {
 			return err
 		}
 	}
@@ -144,10 +144,8 @@ func (p *ImageTagTransformerPlugin) findContainers(obj map[string]interface{}) e
 }
 
 func isImageMatched(s, t string) bool {
-	// Tag values are limited to [a-zA-Z0-9_.{}-].
-	// Some tools like Bazel rules_k8s allow tag patterns with {} characters.
-	// More info: https://github.com/bazelbuild/rules_k8s/pull/423
-	pattern, _ := regexp.Compile("^" + t + "(@sha256)?(:[a-zA-Z0-9_.{}-]*)?$")
+	// Tag values are limited to [a-zA-Z0-9_.-].
+	pattern, _ := regexp.Compile("^" + t + "(@sha256)?(:[a-zA-Z0-9_.-]*)?$")
 	return pattern.MatchString(s)
 }
 

api/builtins/InventoryTransformer.go

@@ -0,0 +1,128 @@
+// Code generated by pluginator on InventoryTransformer; DO NOT EDIT.
+// pluginator {unknown  1970-01-01T00:00:00Z  }
+
+package builtins
+
+import (
+	"fmt"
+
+	"sigs.k8s.io/kustomize/api/hasher"
+	"sigs.k8s.io/kustomize/api/inventory"
+	"sigs.k8s.io/kustomize/api/kv"
+	"sigs.k8s.io/kustomize/api/resid"
+	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/resource"
+	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/yaml"
+)
+
+type InventoryTransformerPlugin struct {
+	h                *resmap.PluginHelpers
+	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+	Policy           string `json:"policy,omitempty" yaml:"policy,omitempty"`
+}
+
+func (p *InventoryTransformerPlugin) Config(
+	h *resmap.PluginHelpers, c []byte) (err error) {
+	p.h = h
+	err = yaml.Unmarshal(c, p)
+	if err != nil {
+		return err
+	}
+	if p.Policy == "" {
+		p.Policy = types.GarbageIgnore.String()
+	}
+	if p.Policy != types.GarbageCollect.String() &&
+		p.Policy != types.GarbageIgnore.String() {
+		return fmt.Errorf(
+			"unrecognized garbagePolicy '%s'", p.Policy)
+	}
+	return nil
+}
+
+// Transform generates an inventory object from the input ResMap.
+// This ConfigMap supports the pruning command in
+// the client side tool proposed here:
+// https://github.com/kubernetes/enhancements/pull/810
+//
+// The inventory data is written to the ConfigMap's
+// annotations, rather than to the key-value pairs in
+// the ConfigMap's data field, since
+//   1. Keys in a ConfigMap's data field are too
+//      constrained for this purpose.
+//   2. Using annotations allow any object to be used,
+//      not just a ConfigMap, should some other object
+//      (e.g. some App object) become more desirable
+//      for this purpose.
+func (p *InventoryTransformerPlugin) Transform(m resmap.ResMap) error {
+
+	inv, h, err := makeInventory(m)
+	if err != nil {
+		return err
+	}
+
+	args := types.ConfigMapArgs{}
+	args.Name = p.Name
+	args.Namespace = p.Namespace
+	opts := &types.GeneratorOptions{
+		Annotations: make(map[string]string),
+	}
+	opts.Annotations[inventory.HashAnnotation] = h
+	err = inv.UpdateAnnotations(opts.Annotations)
+	if err != nil {
+		return err
+	}
+
+	cm, err := p.h.ResmapFactory().RF().MakeConfigMap(
+		kv.NewLoader(p.h.Loader(), p.h.Validator()), opts, &args)
+	if err != nil {
+		return err
+	}
+
+	if p.Policy == types.GarbageCollect.String() {
+		for _, byeBye := range m.AllIds() {
+			m.Remove(byeBye)
+		}
+	}
+	return m.Append(cm)
+}
+
+func makeInventory(m resmap.ResMap) (
+	inv *inventory.Inventory, hash string, err error) {
+	inv = inventory.NewInventory()
+	var keys []string
+	for _, r := range m.Resources() {
+		ns := r.GetNamespace()
+		item := resid.NewResIdWithNamespace(r.GetGvk(), r.GetName(), ns)
+		if _, ok := inv.Current[item]; ok {
+			return nil, "", fmt.Errorf(
+				"item '%v' already in inventory", item)
+		}
+		inv.Current[item], err = computeRefs(r, m)
+		if err != nil {
+			return nil, "", err
+		}
+		keys = append(keys, item.String())
+	}
+	h, err := hasher.SortArrayAndComputeHash(keys)
+	return inv, h, err
+}
+
+func computeRefs(
+	r *resource.Resource, m resmap.ResMap) (refs []resid.ResId, err error) {
+	for _, refid := range r.GetRefBy() {
+		ref, err := m.GetByCurrentId(refid)
+		if err != nil {
+			return nil, err
+		}
+		refs = append(
+			refs,
+			resid.NewResIdWithNamespace(
+				ref.GetGvk(), ref.GetName(), ref.GetNamespace()))
+	}
+	return
+}
+
+func NewInventoryTransformerPlugin() resmap.TransformerPlugin {
+	return &InventoryTransformerPlugin{}
+}

api/builtins/LabelTransformer.go

@@ -4,10 +4,9 @@
 package builtins
 
 import (
-	"sigs.k8s.io/kustomize/api/filters/labels"
 	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/transform"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
 	"sigs.k8s.io/yaml"
 )
 
@@ -25,16 +24,14 @@ func (p *LabelTransformerPlugin) Config(
 }
 
 func (p *LabelTransformerPlugin) Transform(m resmap.ResMap) error {
-	for _, r := range m.Resources() {
-		err := filtersutil.ApplyToJSON(labels.Filter{
-			Labels:  p.Labels,
-			FsSlice: p.FieldSpecs,
-		}, r)
-		if err != nil {
-			return err
-		}
+	t, err := transform.NewMapTransformer(
+		p.FieldSpecs,
+		p.Labels,
+	)
+	if err != nil {
+		return err
 	}
-	return nil
+	return t.Transform(m)
 }
 
 func NewLabelTransformerPlugin() resmap.TransformerPlugin {

api/builtins/NamespaceTransformer.go

@@ -6,12 +6,12 @@ package builtins
 import (
 	"fmt"
 
-	"sigs.k8s.io/kustomize/api/filters/namespace"
+	"sigs.k8s.io/kustomize/api/transform"
+
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
 	"sigs.k8s.io/yaml"
 )
 
@@ -37,22 +37,29 @@ func (p *NamespaceTransformerPlugin) Transform(m resmap.ResMap) error {
 			// Don't mutate empty objects?
 			continue
 		}
-		err := filtersutil.ApplyToJSON(namespace.Filter{
-			Namespace: p.Namespace,
-			FsSlice:   p.FieldSpecs,
-		}, r)
-		if err != nil {
-			return err
+
+		id := r.OrgId()
+		applicableFs := p.applicableFieldSpecs(id)
+
+		for _, fs := range applicableFs {
+			err := transform.MutateField(
+				r.Map(), fs.PathSlice(), fs.CreateIfNotPresent,
+				p.changeNamespace(r))
+			if err != nil {
+				return err
+			}
 		}
+
 		matches := m.GetMatchingResourcesByCurrentId(r.CurId().Equals)
 		if len(matches) != 1 {
-			return fmt.Errorf(
-				"namespace transformation produces ID conflict: %+v", matches)
+			return fmt.Errorf("namespace tranformation produces ID conflict: %+v", matches)
 		}
 	}
 	return nil
 }
 
+const metaNamespace = "metadata/namespace"
+
 // Special casing metadata.namespace since
 // all objects have it, even "ClusterKind" objects
 // that don't exist in a namespace (the Namespace
@@ -60,9 +67,7 @@ func (p *NamespaceTransformerPlugin) Transform(m resmap.ResMap) error {
 func (p *NamespaceTransformerPlugin) applicableFieldSpecs(id resid.ResId) []types.FieldSpec {
 	var res []types.FieldSpec
 	for _, fs := range p.FieldSpecs {
-		if id.IsSelected(&fs.Gvk) &&
-			(fs.Path != types.MetadataNamespacePath ||
-				(fs.Path == types.MetadataNamespacePath && id.IsNamespaceableKind())) {
+		if id.IsSelected(&fs.Gvk) && (fs.Path != metaNamespace || (fs.Path == metaNamespace && id.IsNamespaceableKind())) {
 			res = append(res, fs)
 		}
 	}

api/builtins/PatchJson6902Transformer.go

@@ -8,12 +8,10 @@ import (
 
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/pkg/errors"
-	"sigs.k8s.io/kustomize/api/filters/patchjson6902"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
 	"sigs.k8s.io/yaml"
 )
 
@@ -85,9 +83,16 @@ func (p *PatchJson6902TransformerPlugin) Transform(m resmap.ResMap) error {
 	if err != nil {
 		return err
 	}
-	return filtersutil.ApplyToJSON(patchjson6902.Filter{
-		Patch: p.JsonOp,
-	}, obj)
+	rawObj, err := obj.MarshalJSON()
+	if err != nil {
+		return err
+	}
+	modifiedObj, err := p.decodedPatch.Apply(rawObj)
+	if err != nil {
+		return errors.Wrapf(
+			err, "failed to apply json patch '%s'", p.JsonOp)
+	}
+	return obj.UnmarshalJSON(modifiedObj)
 }
 
 func NewPatchJson6902TransformerPlugin() resmap.TransformerPlugin {

api/builtins/PatchStrategicMergeTransformer.go

@@ -5,14 +5,10 @@ package builtins
 
 import (
 	"fmt"
-	"strings"
 
-	"github.com/pkg/errors"
-	"sigs.k8s.io/kustomize/api/filters/patchstrategicmerge"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
 	"sigs.k8s.io/yaml"
 )
 
@@ -64,7 +60,7 @@ func (p *PatchStrategicMergeTransformerPlugin) Config(
 }
 
 func (p *PatchStrategicMergeTransformerPlugin) Transform(m resmap.ResMap) error {
-	patches, err := p.h.ResmapFactory().Merge(p.loadedPatches)
+	patches, err := p.h.ResmapFactory().MergePatches(p.loadedPatches)
 	if err != nil {
 		return err
 	}
@@ -73,39 +69,13 @@ func (p *PatchStrategicMergeTransformerPlugin) Transform(m resmap.ResMap) error
 		if err != nil {
 			return err
 		}
-		patchCopy := patch.DeepCopy()
-		patchCopy.SetName(target.GetName())
-		patchCopy.SetNamespace(target.GetNamespace())
-		patchCopy.SetGvk(target.GetGvk())
-		node, err := filtersutil.GetRNode(patchCopy)
+		err = target.Patch(patch.Kunstructured)
 		if err != nil {
 			return err
 		}
-		err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
-			Patch: node,
-		}, target)
-		if err != nil {
-			// Check for an error string from UnmarshalJSON that's indicative
-			// of an object that's missing basic KRM fields, and thus may have been
-			// entirely deleted (an acceptable outcome).  This error handling should
-			// be deleted along with use of ResMap and apimachinery functions like
-			// UnmarshalJSON.
-			if !strings.Contains(err.Error(), "Object 'Kind' is missing") {
-				// Some unknown error, let it through.
-				return err
-			}
-			if len(target.Map()) != 0 {
-				return errors.Wrapf(
-					err, "with unexpectedly non-empty object map of size %d",
-					len(target.Map()))
-			}
-			// Fall through to handle deleted object.
-		}
+		// remove the resource from resmap
+		// when the patch is to $patch: delete that target
 		if len(target.Map()) == 0 {
-			// This means all fields have been removed from the object.
-			// This can happen if a patch required deletion of the
-			// entire resource (not just a part of it).  This means
-			// the overall resmap must shrink by one.
 			err = m.Remove(target.CurId())
 			if err != nil {
 				return err

api/builtins/PatchTransformer.go

@@ -5,15 +5,12 @@ package builtins
 
 import (
 	"fmt"
-	"strings"
 
 	jsonpatch "github.com/evanphx/json-patch"
-	"sigs.k8s.io/kustomize/api/filters/patchjson6902"
-	"sigs.k8s.io/kustomize/api/filters/patchstrategicmerge"
+	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
 	"sigs.k8s.io/yaml"
 )
 
@@ -26,115 +23,99 @@ type PatchTransformerPlugin struct {
 }
 
 func (p *PatchTransformerPlugin) Config(
-	h *resmap.PluginHelpers, c []byte) error {
-	err := yaml.Unmarshal(c, p)
+	h *resmap.PluginHelpers, c []byte) (err error) {
+	err = yaml.Unmarshal(c, p)
 	if err != nil {
 		return err
 	}
-	p.Patch = strings.TrimSpace(p.Patch)
 	if p.Patch == "" && p.Path == "" {
-		return fmt.Errorf(
+		err = fmt.Errorf(
 			"must specify one of patch and path in\n%s", string(c))
+		return
 	}
 	if p.Patch != "" && p.Path != "" {
-		return fmt.Errorf(
+		err = fmt.Errorf(
 			"patch and path can't be set at the same time\n%s", string(c))
+		return
 	}
-
+	var in []byte
 	if p.Path != "" {
-		loaded, loadErr := h.Loader().Load(p.Path)
-		if loadErr != nil {
-			return loadErr
+		in, err = h.Loader().Load(p.Path)
+		if err != nil {
+			return
 		}
-		p.Patch = string(loaded)
+	}
+	if p.Patch != "" {
+		in = []byte(p.Patch)
 	}
 
-	patchSM, errSM := h.ResmapFactory().RF().FromBytes([]byte(p.Patch))
-	patchJson, errJson := jsonPatchFromBytes([]byte(p.Patch))
-	if (errSM == nil && errJson == nil) ||
-		(patchSM != nil && patchJson != nil) {
-		return fmt.Errorf(
-			"illegally qualifies as both an SM and JSON patch: [%v]",
-			p.Patch)
-	}
+	patchSM, errSM := h.ResmapFactory().RF().FromBytes(in)
+	patchJson, errJson := jsonPatchFromBytes(in)
 	if errSM != nil && errJson != nil {
-		return fmt.Errorf(
-			"unable to parse SM or JSON patch from [%v]", p.Patch)
+		err = fmt.Errorf(
+			"unable to get either a Strategic Merge Patch or JSON patch 6902 from %s", p.Patch)
+		return
 	}
-	if errSM == nil {
+	if errSM == nil && errJson != nil {
 		p.loadedPatch = patchSM
-	} else {
+	}
+	if errJson == nil && errSM != nil {
 		p.decodedPatch = patchJson
 	}
+	if patchSM != nil && patchJson != nil {
+		err = fmt.Errorf(
+			"a patch can't be both a Strategic Merge Patch and JSON patch 6902 %s", p.Patch)
+	}
+
 	return nil
 }
 
 func (p *PatchTransformerPlugin) Transform(m resmap.ResMap) error {
-	if p.loadedPatch == nil {
-		return p.transformJson6902(m, p.decodedPatch)
-	} else {
-		// The patch was a strategic merge patch
-		return p.transformStrategicMerge(m, p.loadedPatch)
-	}
-}
-
-// transformStrategicMerge applies the provided strategic merge patch
-// to all the resources in the ResMap that match either the Target or
-// the identifier of the patch.
-func (p *PatchTransformerPlugin) transformStrategicMerge(m resmap.ResMap, patch *resource.Resource) error {
-	if p.Target == nil {
-		target, err := m.GetById(patch.OrgId())
+	if p.loadedPatch != nil && p.Target == nil {
+		target, err := m.GetById(p.loadedPatch.OrgId())
 		if err != nil {
 			return err
 		}
-		return p.applySMPatch(target, patch)
-	}
-
-	resources, err := m.Select(*p.Target)
-	if err != nil {
-		return err
-	}
-	for _, res := range resources {
-		patchCopy := patch.DeepCopy()
-		patchCopy.SetName(res.GetName())
-		patchCopy.SetNamespace(res.GetNamespace())
-		patchCopy.SetGvk(res.GetGvk())
-		err := p.applySMPatch(res, patchCopy)
+		err = target.Patch(p.loadedPatch.Kunstructured)
 		if err != nil {
 			return err
 		}
+		return nil
 	}
-	return nil
-}
 
-// applySMPatch applies the provided strategic merge patch to the
-// given resource.
-func (p *PatchTransformerPlugin) applySMPatch(resource, patch *resource.Resource) error {
-	node, err := filtersutil.GetRNode(patch)
-	if err != nil {
-		return err
-	}
-	return filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
-		Patch: node,
-	}, resource)
-}
-
-// transformJson6902 applies the provided json6902 patch
-// to all the resources in the ResMap that match the Target.
-func (p *PatchTransformerPlugin) transformJson6902(m resmap.ResMap, patch jsonpatch.Patch) error {
 	if p.Target == nil {
 		return fmt.Errorf("must specify a target for patch %s", p.Patch)
 	}
+
 	resources, err := m.Select(*p.Target)
 	if err != nil {
 		return err
 	}
 	for _, res := range resources {
-		err = filtersutil.ApplyToJSON(patchjson6902.Filter{
-			Patch: p.Patch,
-		}, res)
-		if err != nil {
-			return err
+		if p.decodedPatch != nil {
+			rawObj, err := res.MarshalJSON()
+			if err != nil {
+				return err
+			}
+			modifiedObj, err := p.decodedPatch.Apply(rawObj)
+			if err != nil {
+				return errors.Wrapf(
+					err, "failed to apply json patch '%s'", p.Patch)
+			}
+			err = res.UnmarshalJSON(modifiedObj)
+			if err != nil {
+				return err
+			}
+		}
+		if p.loadedPatch != nil {
+			patchCopy := p.loadedPatch.DeepCopy()
+			patchCopy.SetName(res.GetName())
+			patchCopy.SetNamespace(res.GetNamespace())
+			patchCopy.SetGvk(res.GetGvk())
+			err = res.Patch(patchCopy.Kunstructured)
+			if err != nil {
+				return err
+			}
 		}
 	}
 	return nil

api/builtins/PrefixSuffixTransformer.go

@@ -5,28 +5,31 @@ package builtins
 
 import (
 	"errors"
+	"fmt"
+
+	"sigs.k8s.io/kustomize/api/transform"
+	"sigs.k8s.io/kustomize/api/types"
 
-	"sigs.k8s.io/kustomize/api/filters/prefixsuffix"
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
 	"sigs.k8s.io/yaml"
 )
 
 // Add the given prefix and suffix to the field.
 type PrefixSuffixTransformerPlugin struct {
-	Prefix     string        `json:"prefix,omitempty" yaml:"prefix,omitempty"`
-	Suffix     string        `json:"suffix,omitempty" yaml:"suffix,omitempty"`
-	FieldSpecs types.FsSlice `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+	Prefix     string            `json:"prefix,omitempty" yaml:"prefix,omitempty"`
+	Suffix     string            `json:"suffix,omitempty" yaml:"suffix,omitempty"`
+	FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
-// A Gvk skip list for prefix/suffix modification.
-// hard coded for now - eventually should be part of config.
-var prefixSuffixFieldSpecsToSkip = types.FsSlice{
-	{Gvk: resid.Gvk{Kind: "CustomResourceDefinition"}},
-	{Gvk: resid.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"}},
-	{Gvk: resid.Gvk{Kind: "Namespace"}},
+// Not placed in a file yet due to lack of demand.
+var prefixSuffixFieldSpecsToSkip = []types.FieldSpec{
+	{
+		Gvk: resid.Gvk{Kind: "CustomResourceDefinition"},
+	},
+	{
+		Gvk: resid.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"},
+	},
 }
 
 func (p *PrefixSuffixTransformerPlugin) Config(
@@ -45,24 +48,29 @@ func (p *PrefixSuffixTransformerPlugin) Config(
 }
 
 func (p *PrefixSuffixTransformerPlugin) Transform(m resmap.ResMap) error {
+
 	// Even if both the Prefix and Suffix are empty we want
 	// to proceed with the transformation. This allows to add contextual
 	// information to the resources (AddNamePrefix and AddNameSuffix).
+
 	for _, r := range m.Resources() {
-		// TODO: move this test into the filter (i.e. make a better filter)
 		if p.shouldSkip(r.OrgId()) {
+			// Don't change the actual definition
+			// of a CRD.
 			continue
 		}
 		id := r.OrgId()
 		// current default configuration contains
 		// only one entry: "metadata/name" with no GVK
-		for _, fs := range p.FieldSpecs {
-			// TODO: this is redundant to filter (but needed for now)
-			if !id.IsSelected(&fs.Gvk) {
+		for _, path := range p.FieldSpecs {
+			if !id.IsSelected(&path.Gvk) {
+				// With the currrent default configuration,
+				// because no Gvk is specified, so a wild
+				// card
 				continue
 			}
-			// TODO: move this test into the filter.
-			if smellsLikeANameChange(&fs) {
+
+			if smellsLikeANameChange(&path) {
 				// "metadata/name" is the only field.
 				// this will add a prefix and a suffix
 				// to the resource even if those are
@@ -70,11 +78,15 @@ func (p *PrefixSuffixTransformerPlugin) Transform(m resmap.ResMap) error {
 				r.AddNamePrefix(p.Prefix)
 				r.AddNameSuffix(p.Suffix)
 			}
-			err := filtersutil.ApplyToJSON(prefixsuffix.Filter{
-				Prefix:    p.Prefix,
-				Suffix:    p.Suffix,
-				FieldSpec: fs,
-			}, r)
+
+			// the addPrefixSuffix method will not
+			// change the name if both the prefix and suffix
+			// are empty.
+			err := transform.MutateField(
+				r.Map(),
+				path.PathSlice(),
+				path.CreateIfNotPresent,
+				p.addPrefixSuffix)
 			if err != nil {
 				return err
 			}
@@ -87,7 +99,8 @@ func smellsLikeANameChange(fs *types.FieldSpec) bool {
 	return fs.Path == "metadata/name"
 }
 
-func (p *PrefixSuffixTransformerPlugin) shouldSkip(id resid.ResId) bool {
+func (p *PrefixSuffixTransformerPlugin) shouldSkip(
+	id resid.ResId) bool {
 	for _, path := range prefixSuffixFieldSpecsToSkip {
 		if id.IsSelected(&path.Gvk) {
 			return true
@@ -96,6 +109,15 @@ func (p *PrefixSuffixTransformerPlugin) shouldSkip(id resid.ResId) bool {
 	return false
 }
 
+func (p *PrefixSuffixTransformerPlugin) addPrefixSuffix(
+	in interface{}) (interface{}, error) {
+	s, ok := in.(string)
+	if !ok {
+		return nil, fmt.Errorf("%#v is expected to be %T", in, s)
+	}
+	return fmt.Sprintf("%s%s%s", p.Prefix, s, p.Suffix), nil
+}
+
 func NewPrefixSuffixTransformerPlugin() resmap.TransformerPlugin {
 	return &PrefixSuffixTransformerPlugin{}
 }

api/builtins/ReplicaCountTransformer.go

@@ -6,8 +6,7 @@ package builtins
 import (
 	"fmt"
 
-	"sigs.k8s.io/kustomize/api/filters/replicacount"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
+	"sigs.k8s.io/kustomize/api/transform"
 
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resmap"
@@ -31,24 +30,18 @@ func (p *ReplicaCountTransformerPlugin) Config(
 
 func (p *ReplicaCountTransformerPlugin) Transform(m resmap.ResMap) error {
 	found := false
-	for _, fs := range p.FieldSpecs {
-		matcher := p.createMatcher(fs)
+	for i, replicaSpec := range p.FieldSpecs {
+		matcher := p.createMatcher(i)
 		matchOriginal := m.GetMatchingResourcesByOriginalId(matcher)
-		resList := append(
-			matchOriginal, m.GetMatchingResourcesByCurrentId(matcher)...)
-		if len(resList) > 0 {
+		matchCurrent := m.GetMatchingResourcesByCurrentId(matcher)
+
+		for _, res := range append(matchOriginal, matchCurrent...) {
 			found = true
-			for _, r := range resList {
-				// There are redundant checks in the filter
-				// that we'll live with until resolution of
-				// https://github.com/kubernetes-sigs/kustomize/issues/2506
-				err := filtersutil.ApplyToJSON(replicacount.Filter{
-					Replica:   p.Replica,
-					FieldSpec: fs,
-				}, r)
-				if err != nil {
-					return err
-				}
+			err := transform.MutateField(
+				res.Map(), replicaSpec.PathSlice(),
+				replicaSpec.CreateIfNotPresent, p.addReplicas)
+			if err != nil {
+				return err
 			}
 		}
 	}
@@ -66,12 +59,30 @@ func (p *ReplicaCountTransformerPlugin) Transform(m resmap.ResMap) error {
 }
 
 // Match Replica.Name and FieldSpec
-func (p *ReplicaCountTransformerPlugin) createMatcher(fs types.FieldSpec) resmap.IdMatcher {
+func (p *ReplicaCountTransformerPlugin) createMatcher(i int) resmap.IdMatcher {
 	return func(r resid.ResId) bool {
-		return r.Name == p.Replica.Name && r.Gvk.IsSelected(&fs.Gvk)
+		return r.Name == p.Replica.Name &&
+			r.Gvk.IsSelected(&p.FieldSpecs[i].Gvk)
 	}
 }
 
+func (p *ReplicaCountTransformerPlugin) addReplicas(in interface{}) (interface{}, error) {
+	switch m := in.(type) {
+	case int64:
+		// Was already in the field.
+	case map[string]interface{}:
+		if len(m) != 0 {
+			// A map was already in the replicas field, don't want to
+			// discard this data silently.
+			return nil, fmt.Errorf("%#v is expected to be %T", in, m)
+		}
+		// Just got added, default type is map, but we can return anything.
+	default:
+		return nil, fmt.Errorf("%#v is expected to be %T", in, m)
+	}
+	return p.Replica.Count, nil
+}
+
 func NewReplicaCountTransformerPlugin() resmap.TransformerPlugin {
 	return &ReplicaCountTransformerPlugin{}
 }

api/builtins/SecretGenerator.go

@@ -13,10 +13,12 @@ import (
 type SecretGeneratorPlugin struct {
 	h                *resmap.PluginHelpers
 	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+	types.GeneratorOptions
 	types.SecretArgs
 }
 
 func (p *SecretGeneratorPlugin) Config(h *resmap.PluginHelpers, config []byte) (err error) {
+	p.GeneratorOptions = types.GeneratorOptions{}
 	p.SecretArgs = types.SecretArgs{}
 	err = yaml.Unmarshal(config, p)
 	if p.SecretArgs.Name == "" {
@@ -31,7 +33,8 @@ func (p *SecretGeneratorPlugin) Config(h *resmap.PluginHelpers, config []byte) (
 
 func (p *SecretGeneratorPlugin) Generate() (resmap.ResMap, error) {
 	return p.h.ResmapFactory().FromSecretArgs(
-		kv.NewLoader(p.h.Loader(), p.h.Validator()), p.SecretArgs)
+		kv.NewLoader(p.h.Loader(), p.h.Validator()),
+		&p.GeneratorOptions, p.SecretArgs)
 }
 
 func NewSecretGeneratorPlugin() resmap.GeneratorPlugin {

api/builtins/ValueAddTransformer.go

@@ -1,142 +0,0 @@
-// Code generated by pluginator on ValueAddTransformer; DO NOT EDIT.
-// pluginator {unknown  1970-01-01T00:00:00Z  }
-
-package builtins
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-
-	"sigs.k8s.io/kustomize/api/filters/namespace"
-	"sigs.k8s.io/kustomize/api/filters/valueadd"
-	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/resource"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
-	"sigs.k8s.io/yaml"
-)
-
-// An 'Add' transformer inspired by the IETF RFC 6902 JSON spec Add operation.
-type ValueAddTransformerPlugin struct {
-	// Value is the value to add.
-	// Defaults to base name of encompassing kustomization root.
-	Value string `json:"value,omitempty" yaml:"value,omitempty"`
-
-	// Targets is a slice of targets that should have the value added.
-	Targets []Target `json:"targets,omitempty" yaml:"targets,omitempty"`
-
-	// TargetFilePath is a file path.  If specified, the file will be parsed into
-	// a slice of Target, and appended to anything that was specified in the
-	// Targets field.  This is just a means to share common target specifications.
-	TargetFilePath string `json:"targetFilePath,omitempty" yaml:"targetFilePath,omitempty"`
-}
-
-// Target describes where to put the value.
-type Target struct {
-	// Selector selects the resources to modify.
-	Selector *types.Selector `json:"selector,omitempty" yaml:"selector,omitempty"`
-
-	// NotSelector selects the resources to exclude
-	// from those included by overly broad selectors.
-	// TODO: implement this?
-	// NotSelector *types.Selector `json:"notSelector,omitempty" yaml:"notSelector,omitempty"`
-
-	// FieldPath is a JSON-style path to the field intended to hold the value.
-	FieldPath string `json:"fieldPath,omitempty" yaml:"fieldPath,omitempty"`
-
-	// FilePathPosition is passed to the filter directly.  Look there for doc.
-	FilePathPosition int `json:"filePathPosition,omitempty" yaml:"filePathPosition,omitempty"`
-}
-
-func (p *ValueAddTransformerPlugin) Config(h *resmap.PluginHelpers, c []byte) error {
-	err := yaml.Unmarshal(c, p)
-	if err != nil {
-		return err
-	}
-	p.Value = strings.TrimSpace(p.Value)
-	if p.Value == "" {
-		p.Value = filepath.Base(h.Loader().Root())
-	}
-	if p.TargetFilePath != "" {
-		bytes, err := h.Loader().Load(p.TargetFilePath)
-		if err != nil {
-			return err
-		}
-		var targets struct {
-			Targets []Target `json:"targets,omitempty" yaml:"targets,omitempty"`
-		}
-		err = yaml.Unmarshal(bytes, &targets)
-		if err != nil {
-			return err
-		}
-		p.Targets = append(p.Targets, targets.Targets...)
-	}
-	if len(p.Targets) == 0 {
-		return fmt.Errorf("must specify at least one target")
-	}
-	for _, target := range p.Targets {
-		if err = validateSelector(target.Selector); err != nil {
-			return err
-		}
-		// TODO: call validateSelector(target.NotSelector) if field added.
-		if err = validateJsonFieldPath(target.FieldPath); err != nil {
-			return err
-		}
-		if target.FilePathPosition < 0 {
-			return fmt.Errorf(
-				"value of FilePathPosition (%d) cannot be negative",
-				target.FilePathPosition)
-		}
-	}
-	return nil
-}
-
-// TODO: implement
-func validateSelector(_ *types.Selector) error {
-	return nil
-}
-
-// TODO: Enforce RFC 6902?
-func validateJsonFieldPath(p string) error {
-	if len(p) == 0 {
-		return fmt.Errorf("fieldPath cannot be empty")
-	}
-	return nil
-}
-
-func (p *ValueAddTransformerPlugin) Transform(m resmap.ResMap) (err error) {
-	for _, t := range p.Targets {
-		var resources []*resource.Resource
-		if t.Selector == nil {
-			resources = m.Resources()
-		} else {
-			resources, err = m.Select(*t.Selector)
-			if err != nil {
-				return err
-			}
-		}
-		// TODO: consider t.NotSelector if implemented
-		for _, res := range resources {
-			if t.FieldPath == types.MetadataNamespacePath {
-				err = filtersutil.ApplyToJSON(namespace.Filter{
-					Namespace: p.Value,
-				}, res)
-			} else {
-				err = filtersutil.ApplyToJSON(valueadd.Filter{
-					Value:            p.Value,
-					FieldPath:        t.FieldPath,
-					FilePathPosition: t.FilePathPosition,
-				}, res)
-			}
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func NewValueAddTransformerPlugin() resmap.TransformerPlugin {
-	return &ValueAddTransformerPlugin{}
-}

api/filesys/util.go

@@ -3,11 +3,7 @@
 
 package filesys
 
-import (
-	"os"
-	"path/filepath"
-	"strings"
-)
+import "path/filepath"
 
 // RootedPath returns a rooted path, e.g. "/foo/bar" as
 // opposed to "foo/bar".
@@ -32,94 +28,3 @@ func StripLeadingSeps(s string) string {
 	}
 	return s[k:]
 }
-
-// PathSplit converts a file path to a slice of string.
-// If the path is absolute (if the path has a leading slash),
-// then the first entry in the result is an empty string.
-// Desired:  path == PathJoin(PathSplit(path))
-func PathSplit(incoming string) []string {
-	if incoming == "" {
-		return []string{}
-	}
-	dir, path := filepath.Split(incoming)
-	if dir == string(os.PathSeparator) {
-		if path == "" {
-			return []string{""}
-		}
-		return []string{"", path}
-	}
-	dir = strings.TrimSuffix(dir, string(os.PathSeparator))
-	if dir == "" {
-		return []string{path}
-	}
-	return append(PathSplit(dir), path)
-}
-
-// PathJoin converts a slice of string to a file path.
-// If the first entry is an empty string, then the returned
-// path is absolute (it has a leading slash).
-// Desired:  path == PathJoin(PathSplit(path))
-func PathJoin(incoming []string) string {
-	if len(incoming) == 0 {
-		return ""
-	}
-	if incoming[0] == "" {
-		return string(os.PathSeparator) + filepath.Join(incoming[1:]...)
-	}
-	return filepath.Join(incoming...)
-}
-
-// InsertPathPart inserts 'part' at position 'pos' in the given filepath.
-// The first position is 0.
-//
-// E.g. if part == 'PEACH'
-//
-//                  OLD : NEW                    : POS
-//      --------------------------------------------------------
-//              {empty} : PEACH                  : irrelevant
-//                    / : /PEACH                 : irrelevant
-//                  pie : PEACH/pie              : 0 (or negative)
-//                 /pie : /PEACH/pie             : 0 (or negative)
-//                  raw : raw/PEACH              : 1 (or larger)
-//                 /raw : /raw/PEACH             : 1 (or larger)
-//      a/nice/warm/pie : a/nice/warm/PEACH/pie  : 3
-//     /a/nice/warm/pie : /a/nice/warm/PEACH/pie : 3
-//
-// * An empty part results in no change.
-//
-// * Absolute paths get their leading '/' stripped, treated like
-//   relative paths, and the leading '/' is re-added on output.
-//   The meaning of pos is intentionally the same in either absolute or
-//   relative paths; if it weren't, this function could convert absolute
-//   paths to relative paths, which is not desirable.
-//
-// * For robustness (liberal input, conservative output) Pos values that
-//   that are too small (large) to index the split filepath result in a
-//   prefix (postfix) rather than an error.  Use extreme position values
-//   to assure a prefix or postfix (e.g. 0 will always prefix, and
-//   9999 will presumably always postfix).
-func InsertPathPart(path string, pos int, part string) string {
-	if part == "" {
-		return path
-	}
-	parts := PathSplit(path)
-	if pos < 0 {
-		pos = 0
-	} else if pos > len(parts) {
-		pos = len(parts)
-	}
-	if len(parts) > 0 && parts[0] == "" && pos < len(parts) {
-		// An empty string at 0 indicates an absolute path, and means
-		// we must increment pos.  This change means that a position
-		// specification has the same meaning in relative and absolute paths.
-		// E.g. in either the path 'a/b/c' or the path '/a/b/c',
-		// 'a' is at 0, 'b' is at 1 and 'c' is at 2, and inserting at
-		// zero means a new first field _without_ changing an absolute
-		// path to a relative path.
-		pos++
-	}
-	result := make([]string, len(parts)+1)
-	copy(result, parts[0:pos])
-	result[pos] = part
-	return PathJoin(append(result, parts[pos:]...))
-}

api/filesys/util_test.go

@@ -1,7 +1,6 @@
 package filesys_test
 
 import (
-	"os"
 	"path/filepath"
 	"testing"
 
@@ -94,11 +93,6 @@ func TestFilePathSplit(t *testing.T) {
 			dir:  "",
 			file: "rabbit.jpg",
 		},
-		{
-			full: "/",
-			dir:  "/",
-			file: "",
-		},
 		{
 			full: "/beans",
 			dir:  "/",
@@ -130,169 +124,6 @@ func TestFilePathSplit(t *testing.T) {
 	}
 }
 
-func TestPathSplitAndJoin(t *testing.T) {
-	cases := map[string]struct {
-		original string
-		expected []string
-	}{
-		"Empty": {
-			original: "",
-			expected: []string{},
-		},
-		"One": {
-			original: "hello",
-			expected: []string{"hello"},
-		},
-		"Two": {
-			original: "hello/there",
-			expected: []string{"hello", "there"},
-		},
-		"Three": {
-			original: "hello/my/friend",
-			expected: []string{"hello", "my", "friend"},
-		},
-	}
-	for n, c := range cases {
-		f := func(t *testing.T, original string, expected []string) {
-			actual := PathSplit(original)
-			if len(actual) != len(expected) {
-				t.Fatalf(
-					"expected len %d, got len %d",
-					len(expected), len(actual))
-			}
-			for i := range expected {
-				if expected[i] != actual[i] {
-					t.Fatalf(
-						"at i=%d, expected '%s', got '%s'",
-						i, expected[i], actual[i])
-				}
-			}
-			joined := PathJoin(actual)
-			if joined != original {
-				t.Fatalf(
-					"when rejoining, expected '%s', got '%s'",
-					original, joined)
-			}
-		}
-		t.Run("relative"+n, func(t *testing.T) {
-			f(t, c.original, c.expected)
-		})
-		t.Run("absolute"+n, func(t *testing.T) {
-			f(t,
-				string(os.PathSeparator)+c.original,
-				append([]string{""}, c.expected...))
-		})
-	}
-}
-
-func TestInsertPathPart(t *testing.T) {
-	cases := map[string]struct {
-		original string
-		pos      int
-		part     string
-		expected string
-	}{
-		"rootOne": {
-			original: "/",
-			pos:      0,
-			part:     "___",
-			expected: "/___",
-		},
-		"rootTwo": {
-			original: "/",
-			pos:      444,
-			part:     "___",
-			expected: "/___",
-		},
-		"rootedFirst": {
-			original: "/apple",
-			pos:      0,
-			part:     "___",
-			expected: "/___/apple",
-		},
-		"rootedSecond": {
-			original: "/apple",
-			pos:      444,
-			part:     "___",
-			expected: "/apple/___",
-		},
-		"rootedThird": {
-			original: "/apple/banana",
-			pos:      444,
-			part:     "___",
-			expected: "/apple/banana/___",
-		},
-		"emptyLow": {
-			original: "",
-			pos:      -3,
-			part:     "___",
-			expected: "___",
-		},
-		"emptyHigh": {
-			original: "",
-			pos:      444,
-			part:     "___",
-			expected: "___",
-		},
-		"peachPie": {
-			original: "a/nice/warm/pie",
-			pos:      3,
-			part:     "PEACH",
-			expected: "a/nice/warm/PEACH/pie",
-		},
-		"rootedPeachPie": {
-			original: "/a/nice/warm/pie",
-			pos:      3,
-			part:     "PEACH",
-			expected: "/a/nice/warm/PEACH/pie",
-		},
-		"longStart": {
-			original: "a/b/c/d/e/f",
-			pos:      0,
-			part:     "___",
-			expected: "___/a/b/c/d/e/f",
-		},
-		"rootedLongStart": {
-			original: "/a/b/c/d/e/f",
-			pos:      0,
-			part:     "___",
-			expected: "/___/a/b/c/d/e/f",
-		},
-		"longMiddle": {
-			original: "a/b/c/d/e/f",
-			pos:      3,
-			part:     "___",
-			expected: "a/b/c/___/d/e/f",
-		},
-		"rootedLongMiddle": {
-			original: "/a/b/c/d/e/f",
-			pos:      3,
-			part:     "___",
-			expected: "/a/b/c/___/d/e/f",
-		},
-		"longEnd": {
-			original: "a/b/c/d/e/f",
-			pos:      444,
-			part:     "___",
-			expected: "a/b/c/d/e/f/___",
-		},
-		"rootedLongEnd": {
-			original: "/a/b/c/d/e/f",
-			pos:      444,
-			part:     "___",
-			expected: "/a/b/c/d/e/f/___",
-		},
-	}
-	for n, c := range cases {
-		t.Run(n, func(t *testing.T) {
-			actual := InsertPathPart(c.original, c.pos, c.part)
-			if actual != c.expected {
-				t.Fatalf("expected '%s', got '%s'", c.expected, actual)
-			}
-		})
-	}
-}
-
 func TestStripTrailingSeps(t *testing.T) {
 	cases := []struct {
 		full string

api/filters/annotations/annotations.go

@@ -1,44 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package annotations
-
-import (
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/filters/fsslice"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-type annoMap map[string]string
-
-type Filter struct {
-	// Annotations is the set of annotations to apply to the inputs
-	Annotations annoMap `yaml:"annotations,omitempty"`
-
-	// FsSlice contains the FieldSpecs to locate the namespace field
-	FsSlice types.FsSlice
-}
-
-var _ kio.Filter = Filter{}
-
-func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	keys := filtersutil.SortedMapKeys(f.Annotations)
-	_, err := kio.FilterAll(yaml.FilterFunc(
-		func(node *yaml.RNode) (*yaml.RNode, error) {
-			for _, k := range keys {
-				if err := node.PipeE(fsslice.Filter{
-					FsSlice: f.FsSlice,
-					SetValue: filtersutil.SetEntry(
-						k, f.Annotations[k], yaml.NodeTagString),
-					CreateKind: yaml.MappingNode, // Annotations are MappingNodes.
-					CreateTag:  yaml.NodeTagMap,
-				}); err != nil {
-					return nil, err
-				}
-			}
-			return node, nil
-		})).Filter(nodes)
-	return nodes, err
-}

api/filters/annotations/annotations_test.go

@@ -1,226 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package annotations
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig"
-	filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-var annosFs = builtinconfig.MakeDefaultConfig().CommonAnnotations
-
-func TestAnnotations_Filter(t *testing.T) {
-	testCases := map[string]struct {
-		input          string
-		expectedOutput string
-		filter         Filter
-		fsslice        types.FsSlice
-	}{
-		"add": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  annotations:
-    hero: batman
-    fiend: riddler
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  annotations:
-    hero: batman
-    fiend: riddler
-    auto: ford
-    bean: cannellini
-    clown: emmett kelley
-    dragon: smaug
-`,
-			filter: Filter{Annotations: annoMap{
-				"clown":  "emmett kelley",
-				"auto":   "ford",
-				"dragon": "smaug",
-				"bean":   "cannellini",
-			}},
-		},
-		"update": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  annotations:
-    hero: batman
-    fiend: riddler
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  annotations:
-    hero: superman
-    fiend: luthor
-    bean: cannellini
-    clown: emmett kelley
-`,
-			filter: Filter{Annotations: annoMap{
-				"clown": "emmett kelley",
-				"hero":  "superman",
-				"fiend": "luthor",
-				"bean":  "cannellini",
-			}},
-		},
-		"data-fieldspecs": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  annotations:
-    sleater: kinney
-a:
-  b:
-    sleater: kinney
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-  annotations:
-    sleater: kinney
-a:
-  b:
-    sleater: kinney
-`,
-			filter: Filter{Annotations: annoMap{
-				"sleater": "kinney",
-			}},
-			fsslice: []types.FieldSpec{
-				{
-					Path:               "a/b",
-					CreateIfNotPresent: true,
-				},
-			},
-		},
-
-		"number": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  annotations:
-    hero: batman
-    fiend: riddler
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  annotations:
-    hero: batman
-    fiend: riddler
-    2: ford
-    clown: "1"
-`,
-			filter: Filter{Annotations: annoMap{
-				"clown": "1",
-				"2":     "ford",
-			}},
-		},
-
-		// test quoting of values which are not considered strings in yaml 1.1
-		"yaml_1_1_compatibility": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  annotations:
-    hero: batman
-    fiend: riddler
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  annotations:
-    hero: batman
-    fiend: riddler
-    a: "y"
-    b: y1
-    c: "yes"
-    d: yes1
-    e: "true"
-    f: true1
-`,
-			filter: Filter{Annotations: annoMap{
-				"a": "y",
-				"b": "y1",
-				"c": "yes",
-				"d": "yes1",
-				"e": "true",
-				"f": "true1",
-			}},
-		},
-
-		// test quoting of values which are not considered strings in yaml 1.1
-		"null_annotations": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  annotations: null
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  annotations:
-    a: a1
-    b: b1
-`,
-			filter: Filter{Annotations: annoMap{
-				"a": "a1",
-				"b": "b1",
-			}},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			filter := tc.filter
-			filter.FsSlice = append(annosFs, tc.fsslice...)
-			if !assert.Equal(t,
-				strings.TrimSpace(tc.expectedOutput),
-				strings.TrimSpace(filtertest_test.RunFilter(t, tc.input, filter))) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/annotations/doc.go

@@ -1,6 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package annotations contains a kio.Filter implementation of the kustomize
-// annotations transformer.
-package annotations

api/filters/annotations/example_test.go

@@ -1,55 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package annotations
-
-import (
-	"bytes"
-	"log"
-	"os"
-
-	"sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-)
-
-func ExampleFilter() {
-	fss := builtinconfig.MakeDefaultConfig().CommonAnnotations
-	err := kio.Pipeline{
-		Inputs: []kio.Reader{&kio.ByteReader{Reader: bytes.NewBufferString(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-`)}},
-		Filters: []kio.Filter{Filter{
-			Annotations: map[string]string{
-				"foo": "bar",
-			},
-			FsSlice: fss,
-		}},
-		Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}},
-	}.Execute()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// apiVersion: example.com/v1
-	// kind: Foo
-	// metadata:
-	//   name: instance
-	//   annotations:
-	//     foo: bar
-	// ---
-	// apiVersion: example.com/v1
-	// kind: Bar
-	// metadata:
-	//   name: instance
-	//   annotations:
-	//     foo: bar
-}

api/filters/fieldspec/doc.go

@@ -1,6 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package fieldspec contains a yaml.Filter to modify a resource
-// that matches the FieldSpec.
-package fieldspec

api/filters/fieldspec/example_test.go

@@ -1,61 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package fieldspec_test
-
-import (
-	"bytes"
-	"log"
-	"os"
-
-	. "sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-func ExampleFilter() {
-	in := &kio.ByteReader{
-		Reader: bytes.NewBufferString(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-`),
-	}
-	fltr := Filter{
-		CreateKind: yaml.ScalarNode,
-		SetValue:   filtersutil.SetScalar("green"),
-		FieldSpec:  types.FieldSpec{Path: "a/b", CreateIfNotPresent: true},
-	}
-
-	err := kio.Pipeline{
-		Inputs:  []kio.Reader{in},
-		Filters: []kio.Filter{kio.FilterAll(fltr)},
-		Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}},
-	}.Execute()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// apiVersion: example.com/v1
-	// kind: Foo
-	// metadata:
-	//   name: instance
-	// a:
-	//   b: green
-	// ---
-	// apiVersion: example.com/v1
-	// kind: Bar
-	// metadata:
-	//   name: instance
-	// a:
-	//   b: green
-}

api/filters/fieldspec/fieldspec.go

@@ -1,176 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package fieldspec
-
-import (
-	"strings"
-
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/errors"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-var _ yaml.Filter = Filter{}
-
-// Filter applies a single fieldSpec to a single object
-// Filter stores internal state and should not be reused
-type Filter struct {
-	// FieldSpec contains the path to the value to set.
-	FieldSpec types.FieldSpec `yaml:"fieldSpec"`
-
-	// Set the field using this function
-	SetValue filtersutil.SetFn
-
-	// CreateKind defines the type of node to create if the field is not found
-	CreateKind yaml.Kind
-
-	CreateTag string
-
-	// path keeps internal state about the current path
-	path []string
-}
-
-func (fltr Filter) Filter(obj *yaml.RNode) (*yaml.RNode, error) {
-	// check if the FieldSpec applies to the object
-	if match, err := isMatchGVK(fltr.FieldSpec, obj); !match || err != nil {
-		return obj, errors.Wrap(err)
-	}
-	fltr.path = splitPath(fltr.FieldSpec.Path)
-	if err := fltr.filter(obj); err != nil {
-		s, _ := obj.String()
-		return nil, errors.WrapPrefixf(err,
-			"obj '%s' at path '%v'", s, fltr.FieldSpec.Path)
-	}
-	return obj, nil
-}
-
-func (fltr Filter) filter(obj *yaml.RNode) error {
-	if len(fltr.path) == 0 {
-		// found the field -- set its value
-		return fltr.SetValue(obj)
-	}
-	switch obj.YNode().Kind {
-	case yaml.SequenceNode:
-		return fltr.seq(obj)
-	case yaml.MappingNode:
-		return fltr.field(obj)
-	default:
-		return errors.Errorf("expected sequence or mapping node")
-	}
-}
-
-// field calls filter on the field matching the next path element
-func (fltr Filter) field(obj *yaml.RNode) error {
-	fieldName, isSeq := isSequenceField(fltr.path[0])
-	// lookup the field matching the next path element
-	var lookupField yaml.Filter
-	var kind yaml.Kind
-	tag := "" // TODO: change to yaml.NodeTagEmpty
-	switch {
-	case !fltr.FieldSpec.CreateIfNotPresent || fltr.CreateKind == 0 || isSeq:
-		// dont' create the field if we don't find it
-		lookupField = yaml.Lookup(fieldName)
-		if isSeq {
-			// The query path thinks this field should be a sequence;
-			// accept this hint for use later if the tag is NodeTagNull.
-			kind = yaml.SequenceNode
-		}
-	case len(fltr.path) <= 1:
-		// create the field if it is missing: use the provided node kind
-		lookupField = yaml.LookupCreate(fltr.CreateKind, fieldName)
-		kind = fltr.CreateKind
-		tag = fltr.CreateTag
-	default:
-		// create the field if it is missing: must be a mapping node
-		lookupField = yaml.LookupCreate(yaml.MappingNode, fieldName)
-		kind = yaml.MappingNode
-		tag = yaml.NodeTagMap
-	}
-
-	// locate (or maybe create) the field
-	field, err := obj.Pipe(lookupField)
-	if err != nil || field == nil {
-		return errors.WrapPrefixf(err, "fieldName: %s", fieldName)
-	}
-
-	// if the value exists, but is null, then change it to the creation type
-	// TODO: update yaml.LookupCreate to support this
-	if field.YNode().Tag == yaml.NodeTagNull {
-		field.YNode().Kind = kind
-		field.YNode().Tag = tag
-	}
-
-	// copy the current fltr and change the path on the copy
-	var next = fltr
-	// call filter for the next path element on the matching field
-	next.path = fltr.path[1:]
-	return next.filter(field)
-}
-
-// seq calls filter on all sequence elements
-func (fltr Filter) seq(obj *yaml.RNode) error {
-	if err := obj.VisitElements(func(node *yaml.RNode) error {
-		// recurse on each element -- re-allocating a Filter is
-		// not strictly required, but is more consistent with field
-		// and less likely to have side effects
-		// keep the entire path -- it does not contain parts for sequences
-		return fltr.filter(node)
-	}); err != nil {
-		return errors.WrapPrefixf(err,
-			"visit traversal on path: %v", fltr.path)
-	}
-
-	return nil
-}
-
-// isSequenceField returns true if the path element is for a sequence field.
-// isSequence also returns the path element with the '[]' suffix trimmed
-func isSequenceField(name string) (string, bool) {
-	isSeq := strings.HasSuffix(name, "[]")
-	name = strings.TrimSuffix(name, "[]")
-	return name, isSeq
-}
-
-// isMatchGVK returns true if the fs.GVK matches the obj GVK.
-func isMatchGVK(fs types.FieldSpec, obj *yaml.RNode) (bool, error) {
-	meta, err := obj.GetMeta()
-	if err != nil {
-		return false, err
-	}
-	if fs.Kind != "" && fs.Kind != meta.Kind {
-		// kind doesn't match
-		return false, err
-	}
-
-	// parse the group and version from the apiVersion field
-	group, version := parseGV(meta.APIVersion)
-
-	if fs.Group != "" && fs.Group != group {
-		// group doesn't match
-		return false, nil
-	}
-
-	if fs.Version != "" && fs.Version != version {
-		// version doesn't match
-		return false, nil
-	}
-
-	return true, nil
-}
-
-func splitPath(path string) []string {
-	ps := strings.Split(path, "/")
-	var res []string
-	res = append(res, ps[0])
-	for i := 1; i < len(ps); i++ {
-		lastIndex := len(res) - 1
-		if strings.HasSuffix(res[lastIndex], "\\") {
-			res[lastIndex] = strings.TrimSuffix(res[lastIndex], "\\") + "/" + ps[i]
-		} else {
-			res = append(res, ps[i])
-		}
-	}
-	return res
-}

api/filters/fieldspec/fieldspec_test.go

@@ -1,536 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package fieldspec_test
-
-import (
-	"bytes"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-type TestCase struct {
-	name      string
-	input     string
-	expected  string
-	filter    fieldspec.Filter
-	fieldSpec string
-	error     string
-}
-
-var tests = []TestCase{
-	{
-		name: "update",
-		fieldSpec: `
-path: a/b
-group: foo
-kind: Bar
-`,
-		input: `
-apiVersion: foo/v1beta1
-kind: Bar
-a:
-  b: c
-`,
-		expected: `
-apiVersion: foo/v1beta1
-kind: Bar
-a:
-  b: e
-`,
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-	},
-
-	{
-		name: "update-kind-not-match",
-		fieldSpec: `
-path: a/b
-group: foo
-kind: Bar1
-`,
-		input: `
-apiVersion: foo/v1beta1
-kind: Bar2
-a:
-  b: c
-`,
-		expected: `
-apiVersion: foo/v1beta1
-kind: Bar2
-a:
-  b: c
-`,
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-	},
-
-	{
-		name: "update-group-not-match",
-		fieldSpec: `
-path: a/b
-group: foo1
-kind: Bar
-`,
-		input: `
-apiVersion: foo2/v1beta1
-kind: Bar
-a:
-  b: c
-`,
-		expected: `
-apiVersion: foo2/v1beta1
-kind: Bar
-a:
-  b: c
-`,
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-	},
-
-	{
-		name: "update-version-not-match",
-		fieldSpec: `
-path: a/b
-group: foo
-version: v1beta1
-kind: Bar
-`,
-		input: `
-apiVersion: foo/v1beta2
-kind: Bar
-a:
-  b: c
-`,
-		expected: `
-apiVersion: foo/v1beta2
-kind: Bar
-a:
-  b: c
-`,
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-	},
-
-	{
-		name: "bad-version",
-		fieldSpec: `
-path: a/b
-group: foo
-version: v1beta1
-kind: Bar
-`,
-		input: `
-apiVersion: foo/v1beta2/something
-kind: Bar
-a:
-  b: c
-`,
-		expected: `
-apiVersion: foo/v1beta2/something
-kind: Bar
-a:
-  b: c
-`,
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-	},
-
-	{
-		name: "bad-meta",
-		fieldSpec: `
-path: a/b
-group: foo
-version: v1beta1
-kind: Bar
-`,
-		input: `
-a:
-  b: c
-`,
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-		error: "missing Resource metadata",
-	},
-
-	{
-		name: "miss-match-type",
-		fieldSpec: `
-path: a/b/c
-kind: Bar
-`,
-		input: `
-kind: Bar
-a:
-  b: a
-`,
-		error: "obj 'kind: Bar\na:\n  b: a\n' at path 'a/b/c': " +
-			"expected sequence or mapping node",
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-	},
-
-	{
-		name: "add",
-		fieldSpec: `
-path: a/b/c/d
-group: foo
-create: true
-kind: Bar
-`,
-		input: `
-apiVersion: foo/v1beta1
-kind: Bar
-a: {}
-`,
-		expected: `
-apiVersion: foo/v1beta1
-kind: Bar
-a: {b: {c: {d: e}}}
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("e"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-
-	{
-		name: "update-in-sequence",
-		fieldSpec: `
-path: a/b[]/c/d
-group: foo
-kind: Bar
-`,
-		input: `
-apiVersion: foo/v1beta1
-kind: Bar
-a:
-  b:
-  - c:
-      d: a
-`,
-		expected: `
-apiVersion: foo/v1beta1
-kind: Bar
-a:
-  b:
-  - c:
-      d: e
-`,
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-	},
-
-	// Don't create a sequence
-	{
-		name: "empty-sequence-no-create",
-		fieldSpec: `
-path: a/b[]/c/d
-group: foo
-create: true
-kind: Bar
-`,
-		input: `
-apiVersion: foo/v1beta1
-kind: Bar
-a: {}
-`,
-		expected: `
-apiVersion: foo/v1beta1
-kind: Bar
-a: {}
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("e"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-
-	// Create a new field for an element in a sequence
-	{
-		name: "empty-sequence-create",
-		fieldSpec: `
-path: a/b[]/c/d
-group: foo
-create: true
-kind: Bar
-`,
-		input: `
-apiVersion: foo/v1beta1
-kind: Bar
-a:
-  b:
-  - c: {}
-`,
-		expected: `
-apiVersion: foo/v1beta1
-kind: Bar
-a:
-  b:
-  - c: {d: e}
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("e"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-
-	{
-		name: "group v1",
-		fieldSpec: `
-path: a/b
-group: v1
-create: true
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("e"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-
-	{
-		name: "version v1",
-		fieldSpec: `
-path: a/b
-version: v1
-create: true
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-a:
-  b: e
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("e"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-	{
-		name: "successfully set field on array entry no sequence hint",
-		fieldSpec: `
-path: spec/containers/image
-version: v1
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers:
-  - image: foo
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers:
-  - image: bar
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("bar"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-	{
-		name: "successfully set field on array entry with sequence hint",
-		fieldSpec: `
-path: spec/containers[]/image
-version: v1
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers:
-  - image: foo
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers:
-  - image: bar
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("bar"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-	{
-		name: "failure to set field on array entry with sequence hint in path",
-		fieldSpec: `
-path: spec/containers[]/image
-version: v1
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers:
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers: []
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("bar"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-	{
-		name: "failure to set field on array entry, no sequence hint in path",
-		fieldSpec: `
-path: spec/containers/image
-version: v1
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers:
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers:
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("bar"),
-			CreateKind: yaml.ScalarNode,
-		},
-		error: "obj '' at path 'spec/containers/image': expected sequence or mapping node",
-	},
-	{
-		name: "filedname with slash '/'",
-		fieldSpec: `
-path: a/b\/c/d
-version: v1
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-a:
-  b/c:
-    d: foo
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-a:
-  b/c:
-    d: bar
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("bar"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-	{
-		name: "filedname with multiple '/'",
-		fieldSpec: `
-path: a/b\/c/d\/e/f
-version: v1
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-a:
-  b/c:
-    d/e:
-      f: foo
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-a:
-  b/c:
-    d/e:
-      f: bar
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("bar"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-}
-
-func TestFilter_Filter(t *testing.T) {
-	for i := range tests {
-		test := tests[i]
-		t.Run(test.name, func(t *testing.T) {
-			err := yaml.Unmarshal([]byte(test.fieldSpec), &test.filter.FieldSpec)
-			if !assert.NoError(t, err) {
-				t.FailNow()
-			}
-
-			out := &bytes.Buffer{}
-			rw := &kio.ByteReadWriter{
-				Reader:                bytes.NewBufferString(test.input),
-				Writer:                out,
-				OmitReaderAnnotations: true,
-			}
-
-			// run the filter
-			err = kio.Pipeline{
-				Inputs:  []kio.Reader{rw},
-				Filters: []kio.Filter{kio.FilterAll(test.filter)},
-				Outputs: []kio.Writer{rw},
-			}.Execute()
-			if test.error != "" {
-				if !assert.EqualError(t, err, test.error) {
-					t.FailNow()
-				}
-				// stop rest of test
-				return
-			}
-
-			if !assert.NoError(t, err) {
-				t.FailNow()
-			}
-
-			// check results
-			if !assert.Equal(t,
-				strings.TrimSpace(test.expected),
-				strings.TrimSpace(out.String())) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/fieldspec/gvk.go

@@ -1,49 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-package fieldspec
-
-import (
-	"strings"
-
-	"sigs.k8s.io/kustomize/api/resid"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// Return true for 'v' followed by a 1 or 2, and don't look at rest.
-// I.e. 'v1', 'v1beta1', 'v2', would return true.
-func looksLikeACoreApiVersion(s string) bool {
-	if len(s) < 2 {
-		return false
-	}
-	if s[0:1] != "v" {
-		return false
-	}
-	return s[1:2] == "1" || s[1:2] == "2"
-}
-
-// parseGV parses apiVersion field into group and version.
-func parseGV(apiVersion string) (group, version string) {
-	// parse the group and version from the apiVersion field
-	parts := strings.SplitN(apiVersion, "/", 2)
-	group = parts[0]
-	if len(parts) > 1 {
-		version = parts[1]
-	}
-	// Special case the original "apiVersion" of what
-	// we now call the "core" (empty) group.
-	if version == "" && looksLikeACoreApiVersion(group) {
-		version = group
-		group = ""
-	}
-	return
-}
-
-// GetGVK parses the metadata into a GVK
-func GetGVK(meta yaml.ResourceMeta) resid.Gvk {
-	group, version := parseGV(meta.APIVersion)
-	return resid.Gvk{
-		Group:   group,
-		Version: version,
-		Kind:    meta.Kind,
-	}
-}

api/filters/fieldspec/gvk_test.go

@@ -1,156 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-package fieldspec
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/resid"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-func TestParseGV(t *testing.T) {
-	testCases := map[string]struct {
-		input           string
-		expectedGroup   string
-		expectedVersion string
-	}{
-		"empty": {
-			input:           "",
-			expectedGroup:   "",
-			expectedVersion: "",
-		},
-		"certSigning": {
-			input:           "certificates.k8s.io/v1beta1",
-			expectedGroup:   "certificates.k8s.io",
-			expectedVersion: "v1beta1",
-		},
-		"extensions": {
-			input:           "extensions/v1beta1",
-			expectedGroup:   "extensions",
-			expectedVersion: "v1beta1",
-		},
-		"normal": {
-			input:           "apps/v1",
-			expectedGroup:   "apps",
-			expectedVersion: "v1",
-		},
-		"justApps": {
-			input:           "apps",
-			expectedGroup:   "apps",
-			expectedVersion: "",
-		},
-		"coreV1": {
-			input:           "v1",
-			expectedGroup:   "",
-			expectedVersion: "v1",
-		},
-		"coreV2": {
-			input:           "v2",
-			expectedGroup:   "",
-			expectedVersion: "v2",
-		},
-		"coreV2Beta1": {
-			input:           "v2beta1",
-			expectedGroup:   "",
-			expectedVersion: "v2beta1",
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			group, version := parseGV(tc.input)
-			if !assert.Equal(t, tc.expectedGroup, group) {
-				t.FailNow()
-			}
-			if !assert.Equal(t, tc.expectedVersion, version) {
-				t.FailNow()
-			}
-		})
-	}
-}
-
-func TestGetGVK(t *testing.T) {
-	testCases := map[string]struct {
-		input      string
-		expected   resid.Gvk
-		parseError string
-		metaError  string
-	}{
-		"empty": {
-			input: `
-`,
-			parseError: "EOF",
-		},
-		"junk": {
-			input: `
-congress: effective
-`,
-			metaError: "missing Resource metadata",
-		},
-		"normal": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-`,
-			expected: resid.Gvk{Group: "apps", Version: "v1", Kind: "Deployment"},
-		},
-		"apiVersionOnlyWithSlash": {
-			input: `
-apiVersion: apps/v1
-`,
-			expected: resid.Gvk{Group: "apps", Version: "v1", Kind: ""},
-		},
-		"apiVersionOnlyNoSlash1": {
-			input: `
-apiVersion: apps
-`,
-			expected: resid.Gvk{Group: "apps", Version: "", Kind: ""},
-		},
-		"apiVersionOnlyNoSlash2": {
-			input: `
-apiVersion: v1
-`,
-			expected: resid.Gvk{Group: "", Version: "v1", Kind: ""},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			obj, err := yaml.Parse(tc.input)
-			if len(tc.parseError) != 0 {
-				if err == nil {
-					t.Error("expected parse error")
-					return
-				}
-				if !strings.Contains(err.Error(), tc.parseError) {
-					t.Errorf("expected parse err '%s', got '%v'", tc.parseError, err)
-				}
-				return
-			}
-			if !assert.NoError(t, err) {
-				t.FailNow()
-			}
-			meta, err := obj.GetMeta()
-			if len(tc.metaError) != 0 {
-				if err == nil {
-					t.Error("expected meta error")
-					return
-				}
-				if !strings.Contains(err.Error(), tc.metaError) {
-					t.Errorf("expected meta err '%s', got '%v'", tc.metaError, err)
-				}
-				return
-			}
-			if !assert.NoError(t, err) {
-				t.FailNow()
-			}
-			gvk := GetGVK(meta)
-			if !assert.Equal(t, tc.expected, gvk) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/filtersutil/filtersutil.go

@@ -1,21 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package filtersutil
-
-import (
-	"sort"
-)
-
-// SortedMapKeys returns a sorted slice of keys to the given map.
-// Writing this function never gets old.
-func SortedMapKeys(m map[string]string) []string {
-	keys := make([]string, len(m))
-	i := 0
-	for k := range m {
-		keys[i] = k
-		i++
-	}
-	sort.Strings(keys)
-	return keys
-}

api/filters/filtersutil/filtersutil_test.go

@@ -1,34 +0,0 @@
-package filtersutil_test
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-)
-
-func TestSortedKeys(t *testing.T) {
-	testCases := map[string]struct {
-		input    map[string]string
-		expected []string
-	}{
-		"empty": {
-			input:    map[string]string{},
-			expected: []string{}},
-		"one": {
-			input:    map[string]string{"a": "aaa"},
-			expected: []string{"a"}},
-		"three": {
-			input:    map[string]string{"c": "ccc", "b": "bbb", "a": "aaa"},
-			expected: []string{"a", "b", "c"}},
-	}
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			if !assert.Equal(t,
-				filtersutil.SortedMapKeys(tc.input),
-				tc.expected) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/filtersutil/setters.go

@@ -1,33 +0,0 @@
-package filtersutil
-
-import (
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// SetFn is a function that accepts an RNode to possibly modify.
-type SetFn func(*yaml.RNode) error
-
-// SetScalar returns a SetFn to set a scalar value
-func SetScalar(value string) SetFn {
-	return func(node *yaml.RNode) error {
-		return node.PipeE(yaml.FieldSetter{StringValue: value})
-	}
-}
-
-// SetEntry returns a SetFn to set an entry in a map
-func SetEntry(key, value, tag string) SetFn {
-	n := &yaml.Node{
-		Kind:  yaml.ScalarNode,
-		Value: value,
-		Tag:   tag,
-	}
-	if tag == yaml.NodeTagString && yaml.IsYaml1_1NonString(n) {
-		n.Style = yaml.DoubleQuotedStyle
-	}
-	return func(node *yaml.RNode) error {
-		return node.PipeE(yaml.FieldSetter{
-			Name:  key,
-			Value: yaml.NewRNode(n),
-		})
-	}
-}

api/filters/fsslice/doc.go

@@ -1,6 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package fsslice contains a yaml.Filter to modify a resource if
-// it matches one or more FieldSpec entries.
-package fsslice

api/filters/fsslice/example_test.go

@@ -1,63 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package fsslice_test
-
-import (
-	"bytes"
-	"log"
-	"os"
-
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/filters/fsslice"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-func ExampleFilter() {
-	in := &kio.ByteReader{
-		Reader: bytes.NewBufferString(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-`),
-	}
-	fltr := fsslice.Filter{
-		CreateKind: yaml.ScalarNode,
-		SetValue:   filtersutil.SetScalar("green"),
-		FsSlice: []types.FieldSpec{
-			{Path: "a/b", CreateIfNotPresent: true},
-		},
-	}
-
-	err := kio.Pipeline{
-		Inputs:  []kio.Reader{in},
-		Filters: []kio.Filter{kio.FilterAll(fltr)},
-		Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}},
-	}.Execute()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// apiVersion: example.com/v1
-	// kind: Foo
-	// metadata:
-	//   name: instance
-	// a:
-	//   b: green
-	// ---
-	// apiVersion: example.com/v1
-	// kind: Bar
-	// metadata:
-	//   name: instance
-	// a:
-	//   b: green
-}

api/filters/fsslice/fsslice.go

@@ -1,47 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package fsslice
-
-import (
-	"sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-var _ yaml.Filter = Filter{}
-
-// Filter ranges over an FsSlice to modify fields on a single object.
-// An FsSlice is a range of FieldSpecs. A FieldSpec is a GVK plus a path.
-type Filter struct {
-	// FieldSpecList list of FieldSpecs to set
-	FsSlice types.FsSlice `yaml:"fsSlice"`
-
-	// SetValue is called on each field that matches one of the FieldSpecs
-	SetValue filtersutil.SetFn
-
-	// CreateKind is used to create fields that do not exist
-	CreateKind yaml.Kind
-
-	// CreateTag is used to set the tag if encountering a null field
-	CreateTag string
-}
-
-func (fltr Filter) Filter(obj *yaml.RNode) (*yaml.RNode, error) {
-	for i := range fltr.FsSlice {
-		// apply this FieldSpec
-		// create a new filter for each iteration because they
-		// store internal state about the field paths
-		_, err := (&fieldspec.Filter{
-			FieldSpec:  fltr.FsSlice[i],
-			SetValue:   fltr.SetValue,
-			CreateKind: fltr.CreateKind,
-			CreateTag:  fltr.CreateTag,
-		}).Filter(obj)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return obj, nil
-}

api/filters/fsslice/fsslice_test.go

@@ -1,121 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package fsslice_test
-
-import (
-	"bytes"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	. "sigs.k8s.io/kustomize/api/filters/fsslice"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-type TestCase struct {
-	input    string
-	expected string
-	filter   Filter
-	fsSlice  string
-	error    string
-}
-
-var tests = map[string]TestCase{
-	"empty": {
-		fsSlice: `
-`,
-		input: `
-apiVersion: foo/v1
-kind: Bar
-`,
-		expected: `
-apiVersion: foo/v1
-kind: Bar
-`,
-		filter: Filter{
-			SetValue:   filtersutil.SetScalar("e"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-	"two": {
-		fsSlice: `
-- path: a/b
-  group: foo
-  version: v1
-  create: true
-  kind: Bar
-- path: q/r[]/s/t
-  group: foo
-  version: v1
-  create: true
-  kind: Bar
-`,
-		input: `
-apiVersion: foo/v1
-kind: Bar
-q:
-  r:
-  - s: {}
-`,
-		expected: `
-apiVersion: foo/v1
-kind: Bar
-q:
-  r:
-  - s: {t: e}
-a:
-  b: e
-`,
-		filter: Filter{
-			SetValue:   filtersutil.SetScalar("e"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-}
-
-func TestFilter(t *testing.T) {
-	for name := range tests {
-		test := tests[name]
-		t.Run(name, func(t *testing.T) {
-			err := yaml.Unmarshal([]byte(test.fsSlice), &test.filter.FsSlice)
-			if !assert.NoError(t, err) {
-				t.FailNow()
-			}
-
-			out := &bytes.Buffer{}
-			rw := &kio.ByteReadWriter{
-				Reader:                bytes.NewBufferString(test.input),
-				Writer:                out,
-				OmitReaderAnnotations: true,
-			}
-
-			// run the filter
-			err = kio.Pipeline{
-				Inputs:  []kio.Reader{rw},
-				Filters: []kio.Filter{kio.FilterAll(test.filter)},
-				Outputs: []kio.Writer{rw},
-			}.Execute()
-			if test.error != "" {
-				if !assert.EqualError(t, err, test.error) {
-					t.FailNow()
-				}
-				// stop rest of test
-				return
-			}
-
-			if !assert.NoError(t, err) {
-				t.FailNow()
-			}
-
-			// check results
-			if !assert.Equal(t,
-				strings.TrimSpace(test.expected),
-				strings.TrimSpace(out.String())) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/imagetag/doc.go

@@ -1,12 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package imagetag contains two kio.Filter implementations to cover the
-// functionality of the kustomize imagetag transformer.
-//
-// Filter updates fields based on a FieldSpec and an ImageTag.
-//
-// LegacyFilter doesn't use a FieldSpec, and instead only updates image
-// references if the field is name image and it is underneath a field called
-// either containers or initContainers.
-package imagetag

api/filters/imagetag/example_test.go

@@ -1,126 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package imagetag
-
-import (
-	"bytes"
-	"log"
-	"os"
-
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-)
-
-func ExampleFilter() {
-	err := kio.Pipeline{
-		Inputs: []kio.Reader{&kio.ByteReader{Reader: bytes.NewBufferString(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - name: FooBar
-    image: nginx
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-spec:
-  containers:
-  - name: BarFoo
-    image: nginx:1.2.1
-`)}},
-		Filters: []kio.Filter{Filter{
-			ImageTag: types.Image{
-				Name:    "nginx",
-				NewName: "apache",
-				Digest:  "12345",
-			},
-			FsSlice: []types.FieldSpec{
-				{
-					Path: "spec/containers[]/image",
-				},
-			},
-		}},
-		Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}},
-	}.Execute()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// apiVersion: example.com/v1
-	// kind: Foo
-	// metadata:
-	//   name: instance
-	// spec:
-	//   containers:
-	//   - name: FooBar
-	//     image: apache@12345
-	// ---
-	// apiVersion: example.com/v1
-	// kind: Bar
-	// metadata:
-	//   name: instance
-	// spec:
-	//   containers:
-	//   - name: BarFoo
-	//     image: apache@12345
-}
-
-func ExampleLegacyFilter() {
-	err := kio.Pipeline{
-		Inputs: []kio.Reader{&kio.ByteReader{Reader: bytes.NewBufferString(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - name: FooBar
-    image: nginx
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-spec:
-  containers:
-  - name: BarFoo
-    image: nginx:1.2.1
-`)}},
-		Filters: []kio.Filter{LegacyFilter{
-			ImageTag: types.Image{
-				Name:    "nginx",
-				NewName: "apache",
-				Digest:  "12345",
-			},
-		}},
-		Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}},
-	}.Execute()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// apiVersion: example.com/v1
-	// kind: Foo
-	// metadata:
-	//   name: instance
-	// spec:
-	//   containers:
-	//   - name: FooBar
-	//     image: apache@12345
-	// ---
-	// apiVersion: example.com/v1
-	// kind: Bar
-	// metadata:
-	//   name: instance
-	// spec:
-	//   containers:
-	//   - name: BarFoo
-	//     image: apache@12345
-}

api/filters/imagetag/imagetag.go

@@ -1,69 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package imagetag
-
-import (
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/filters/fsslice"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// Filter modifies an "image tag", the value used to specify the
-// name, tag, version digest etc. of (docker) container images
-// used by a pod template.
-type Filter struct {
-	// imageTag is the tag we want to apply to the inputs
-	// The name of the image is used as a key, and other fields
-	// can specify a new name, tag, etc.
-	ImageTag types.Image `json:"imageTag,omitempty" yaml:"imageTag,omitempty"`
-
-	// FsSlice contains the FieldSpecs to locate an image field,
-	// e.g. Path: "spec/myContainers[]/image"
-	FsSlice types.FsSlice `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
-}
-
-var _ kio.Filter = Filter{}
-
-func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	_, err := kio.FilterAll(yaml.FilterFunc(f.filter)).Filter(nodes)
-	return nodes, err
-}
-
-func (f Filter) filter(node *yaml.RNode) (*yaml.RNode, error) {
-	// FsSlice is an allowlist, not a denyList, so to deny
-	// something via configuration a new config mechanism is
-	// needed. Until then, hardcode it.
-	if f.isOnDenyList(node) {
-		return node, nil
-	}
-	if err := node.PipeE(fsslice.Filter{
-		FsSlice:  f.FsSlice,
-		SetValue: updateImageTagFn(f.ImageTag),
-	}); err != nil {
-		return nil, err
-	}
-	return node, nil
-}
-
-func (f Filter) isOnDenyList(node *yaml.RNode) bool {
-	meta, err := node.GetMeta()
-	if err != nil {
-		// A missing 'meta' field will cause problems elsewhere;
-		// ignore it here to keep the signature simple.
-		return false
-	}
-	// Ignore CRDs
-	// https://github.com/kubernetes-sigs/kustomize/issues/890
-	return meta.Kind == `CustomResourceDefinition`
-}
-
-func updateImageTagFn(imageTag types.Image) filtersutil.SetFn {
-	return func(node *yaml.RNode) error {
-		return node.PipeE(imageTagUpdater{
-			ImageTag: imageTag,
-		})
-	}
-}

api/filters/imagetag/imagetag_test.go

@@ -1,674 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package imagetag
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	filtertest "sigs.k8s.io/kustomize/api/testutils/filtertest"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-func TestImageTagUpdater_Filter(t *testing.T) {
-	testCases := map[string]struct {
-		input          string
-		expectedOutput string
-		filter         Filter
-		fsSlice        types.FsSlice
-	}{
-		"ignore CustomResourceDefinition": {
-			input: `
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: whatever
-spec:
-  containers:
-  - image: whatever
-`,
-			expectedOutput: `
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: whatever
-spec:
-  containers:
-  - image: whatever
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "whatever",
-					NewName: "theImageShouldNotChangeInACrd",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/containers/image",
-				},
-			},
-		},
-
-		"legacy multiple images in containers": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: nginx:1.2.1
-  - image: nginx:2.1.2
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: apache@12345
-  - image: apache@12345
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "apache",
-					Digest:  "12345",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/containers/image",
-				},
-			},
-		},
-		"legacy both containers and initContainers": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: nginx:1.2.1
-  - image: tomcat:1.2.3
-  initContainers:
-  - image: nginx:1.2.1
-  - image: apache:1.2.3
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: apache:3.2.1
-  - image: tomcat:1.2.3
-  initContainers:
-  - image: apache:3.2.1
-  - image: apache:1.2.3
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "apache",
-					NewTag:  "3.2.1",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/containers/image",
-				},
-				{
-					Path: "spec/initContainers/image",
-				},
-			},
-		},
-		"legacy updates at multiple depths": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: nginx:1.2.1
-  - image: tomcat:1.2.3
-  template:
-    spec:
-      initContainers:
-      - image: nginx:1.2.1
-      - image: apache:1.2.3
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: apache:3.2.1
-  - image: tomcat:1.2.3
-  template:
-    spec:
-      initContainers:
-      - image: apache:3.2.1
-      - image: apache:1.2.3
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "apache",
-					NewTag:  "3.2.1",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/containers/image",
-				},
-				{
-					Path: "spec/template/spec/initContainers/image",
-				},
-			},
-		},
-		"update with digest": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  image: nginx:1.2.1
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  image: apache@12345
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "apache",
-					Digest:  "12345",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/image",
-				},
-			},
-		},
-
-		"multiple matches in sequence": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: nginx:1.2.1
-  - image: not_nginx@54321
-  - image: nginx:1.2.1
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: apache:3.2.1
-  - image: not_nginx@54321
-  - image: apache:3.2.1
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "apache",
-					NewTag:  "3.2.1",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/containers/image",
-				},
-			},
-		},
-
-		"new Tag": {
-			input: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx:1.7.9
-        name: nginx-tagged
-      - image: nginx:latest
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: nginx
-        name: nginx-notag
-      - image: nginx@sha256:111111111111111111
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine`,
-			expectedOutput: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx:v2
-        name: nginx-tagged
-      - image: nginx:v2
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: nginx:v2
-        name: nginx-notag
-      - image: nginx:v2
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:   "nginx",
-					NewTag: "v2",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/template/spec/containers[]/image",
-				},
-				{
-					Path: "spec/template/spec/initContainers[]/image",
-				},
-			},
-		},
-		"newImage": {
-			input: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx:1.7.9
-        name: nginx-tagged
-      - image: nginx:latest
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: nginx
-        name: nginx-notag
-      - image: nginx@sha256:111111111111111111
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			expectedOutput: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: busybox:1.7.9
-        name: nginx-tagged
-      - image: busybox:latest
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: busybox
-        name: nginx-notag
-      - image: busybox@sha256:111111111111111111
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "busybox",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/template/spec/containers[]/image",
-				},
-				{
-					Path: "spec/template/spec/initContainers[]/image",
-				},
-			},
-		},
-		"newImageAndTag": {
-			input: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx:1.7.9
-        name: nginx-tagged
-      - image: nginx:latest
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: nginx
-        name: nginx-notag
-      - image: nginx@sha256:111111111111111111
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			expectedOutput: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: busybox:v3
-        name: nginx-tagged
-      - image: busybox:v3
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: busybox:v3
-        name: nginx-notag
-      - image: busybox:v3
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "busybox",
-					NewTag:  "v3",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/template/spec/containers[]/image",
-				},
-				{
-					Path: "spec/template/spec/initContainers[]/image",
-				},
-			},
-		},
-		"newDigest": {
-			input: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx:1.7.9
-        name: nginx-tagged
-      - image: nginx:latest
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: nginx
-        name: nginx-notag
-      - image: nginx@sha256:111111111111111111
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			expectedOutput: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx@sha256:222222222222222222
-        name: nginx-tagged
-      - image: nginx@sha256:222222222222222222
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: nginx@sha256:222222222222222222
-        name: nginx-notag
-      - image: nginx@sha256:222222222222222222
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:   "nginx",
-					Digest: "sha256:222222222222222222",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/template/spec/containers/image",
-				},
-				{
-					Path: "spec/template/spec/initContainers/image",
-				},
-			},
-		},
-		"newImageAndDigest": {
-			input: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx:1.7.9
-        name: nginx-tagged
-      - image: nginx:latest
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: nginx
-        name: nginx-notag
-      - image: nginx@sha256:111111111111111111
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			expectedOutput: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: busybox@sha256:222222222222222222
-        name: nginx-tagged
-      - image: busybox@sha256:222222222222222222
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: busybox@sha256:222222222222222222
-        name: nginx-notag
-      - image: busybox@sha256:222222222222222222
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "busybox",
-					Digest:  "sha256:222222222222222222",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/template/spec/containers[]/image",
-				},
-				{
-					Path: "spec/template/spec/initContainers[]/image",
-				},
-			},
-		},
-		"emptyContainers": {
-			input: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  containers:
-`,
-			expectedOutput: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  containers: []
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:   "nginx",
-					NewTag: "v2",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/containers[]/image",
-					//					CreateIfNotPresent: true,
-				},
-			},
-		},
-		"tagWithBraces": {
-			input: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: some.registry.io/my-image:{GENERATED_TAG}
-        name: my-image
-`,
-			expectedOutput: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: some.registry.io/my-image:my-fixed-tag
-        name: my-image
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:   "some.registry.io/my-image",
-					NewTag: "my-fixed-tag",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/template/spec/containers[]/image",
-				},
-				{
-					Path: "spec/template/spec/initContainers[]/image",
-				},
-			},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			filter := tc.filter
-			filter.FsSlice = tc.fsSlice
-			if !assert.Equal(t,
-				strings.TrimSpace(tc.expectedOutput),
-				strings.TrimSpace(filtertest.RunFilter(t, tc.input, filter))) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/imagetag/legacy.go

@@ -1,113 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package imagetag
-
-import (
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// LegacyFilter is an implementation of the kio.Filter interface
-// that scans through the provided kyaml data structure and updates
-// any values of any image fields that is inside a sequence under
-// a field called either containers or initContainers. The field is only
-// update if it has a value that matches and image reference and the name
-// of the image is a match with the provided ImageTag.
-type LegacyFilter struct {
-	ImageTag types.Image `json:"imageTag,omitempty" yaml:"imageTag,omitempty"`
-}
-
-var _ kio.Filter = LegacyFilter{}
-
-func (lf LegacyFilter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	return kio.FilterAll(yaml.FilterFunc(lf.filter)).Filter(nodes)
-}
-
-func (lf LegacyFilter) filter(node *yaml.RNode) (*yaml.RNode, error) {
-	meta, err := node.GetMeta()
-	if err != nil {
-		return nil, err
-	}
-
-	// We do not make any changes if the type of the resource
-	// is CustomResourceDefinition.
-	if meta.Kind == `CustomResourceDefinition` {
-		return node, nil
-	}
-
-	fff := findFieldsFilter{
-		fields:        []string{"containers", "initContainers"},
-		fieldCallback: checkImageTagsFn(lf.ImageTag),
-	}
-	if err := node.PipeE(fff); err != nil {
-		return nil, err
-	}
-	return node, nil
-}
-
-type fieldCallback func(node *yaml.RNode) error
-
-// findFieldsFilter is an implementation of the kio.Filter
-// interface. It will walk the data structure and look for fields
-// that matches the provided list of field names. For each match,
-// the value of the field will be passed in as a parameter to the
-// provided fieldCallback.
-// TODO: move this to kyaml/filterutils
-type findFieldsFilter struct {
-	fields []string
-
-	fieldCallback fieldCallback
-}
-
-func (f findFieldsFilter) Filter(obj *yaml.RNode) (*yaml.RNode, error) {
-	return obj, f.walk(obj)
-}
-
-func (f findFieldsFilter) walk(node *yaml.RNode) error {
-	switch node.YNode().Kind {
-	case yaml.MappingNode:
-		return node.VisitFields(func(n *yaml.MapNode) error {
-			err := f.walk(n.Value)
-			if err != nil {
-				return err
-			}
-			key := n.Key.YNode().Value
-			if contains(f.fields, key) {
-				return f.fieldCallback(n.Value)
-			}
-			return nil
-		})
-	case yaml.SequenceNode:
-		return node.VisitElements(func(n *yaml.RNode) error {
-			return f.walk(n)
-		})
-	}
-	return nil
-}
-
-func contains(slice []string, str string) bool {
-	for _, s := range slice {
-		if s == str {
-			return true
-		}
-	}
-	return false
-}
-
-func checkImageTagsFn(imageTag types.Image) fieldCallback {
-	return func(node *yaml.RNode) error {
-		if node.YNode().Kind != yaml.SequenceNode {
-			return nil
-		}
-
-		return node.VisitElements(func(n *yaml.RNode) error {
-			// Look up any fields on the provided node that is named
-			// image.
-			return n.PipeE(yaml.Get("image"), imageTagUpdater{
-				ImageTag: imageTag,
-			})
-		})
-	}
-}

api/filters/imagetag/legacy_test.go

@@ -1,136 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package imagetag
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	filtertest "sigs.k8s.io/kustomize/api/testutils/filtertest"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-func TestLegacyImageTag_Filter(t *testing.T) {
-	testCases := map[string]struct {
-		input          string
-		expectedOutput string
-		filter         LegacyFilter
-	}{
-		"updates multiple images inside containers": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: nginx:1.2.1
-  - image: nginx:2.1.2
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: apache@12345
-  - image: apache@12345
-`,
-			filter: LegacyFilter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "apache",
-					Digest:  "12345",
-				},
-			},
-		},
-		"updates inside both containers and initContainers": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: nginx:1.2.1
-  - image: tomcat:1.2.3
-  initContainers:
-  - image: nginx:1.2.1
-  - image: apache:1.2.3
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: apache:3.2.1
-  - image: tomcat:1.2.3
-  initContainers:
-  - image: apache:3.2.1
-  - image: apache:1.2.3
-`,
-			filter: LegacyFilter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "apache",
-					NewTag:  "3.2.1",
-				},
-			},
-		},
-		"updates on multiple depths": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: nginx:1.2.1
-  - image: tomcat:1.2.3
-  template:
-    spec: 
-      initContainers:
-      - image: nginx:1.2.1
-      - image: apache:1.2.3
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: apache:3.2.1
-  - image: tomcat:1.2.3
-  template:
-    spec:
-      initContainers:
-      - image: apache:3.2.1
-      - image: apache:1.2.3
-`,
-			filter: LegacyFilter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "apache",
-					NewTag:  "3.2.1",
-				},
-			},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			filter := tc.filter
-			if !assert.Equal(t,
-				strings.TrimSpace(tc.expectedOutput),
-				strings.TrimSpace(filtertest.RunFilter(t, tc.input, filter))) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/imagetag/updater.go

@@ -1,43 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package imagetag
-
-import (
-	"sigs.k8s.io/kustomize/api/image"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// imageTagUpdater is an implementation of the kio.Filter interface
-// that will update the value of the yaml node based on the provided
-// ImageTag if the current value matches the format of an image reference.
-type imageTagUpdater struct {
-	Kind     string      `yaml:"kind,omitempty"`
-	ImageTag types.Image `yaml:"imageTag,omitempty"`
-}
-
-func (u imageTagUpdater) Filter(rn *yaml.RNode) (*yaml.RNode, error) {
-	if err := yaml.ErrorIfInvalid(rn, yaml.ScalarNode); err != nil {
-		return nil, err
-	}
-
-	value := rn.YNode().Value
-
-	if !image.IsImageMatched(value, u.ImageTag.Name) {
-		return rn, nil
-	}
-
-	name, tag := image.Split(value)
-	if u.ImageTag.NewName != "" {
-		name = u.ImageTag.NewName
-	}
-	if u.ImageTag.NewTag != "" {
-		tag = ":" + u.ImageTag.NewTag
-	}
-	if u.ImageTag.Digest != "" {
-		tag = "@" + u.ImageTag.Digest
-	}
-
-	return rn.Pipe(yaml.FieldSetter{StringValue: name + tag})
-}

api/filters/labels/doc.go

@@ -1,6 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package labels contains a kio.Filter implementation of the kustomize
-// labels transformer.
-package labels

api/filters/labels/example_test.go

@@ -1,55 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package labels
-
-import (
-	"bytes"
-	"log"
-	"os"
-
-	"sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-)
-
-func ExampleFilter() {
-	fss := builtinconfig.MakeDefaultConfig().CommonLabels
-	err := kio.Pipeline{
-		Inputs: []kio.Reader{&kio.ByteReader{Reader: bytes.NewBufferString(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-`)}},
-		Filters: []kio.Filter{Filter{
-			Labels: map[string]string{
-				"foo": "bar",
-			},
-			FsSlice: fss,
-		}},
-		Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}},
-	}.Execute()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// apiVersion: example.com/v1
-	// kind: Foo
-	// metadata:
-	//   name: instance
-	//   labels:
-	//     foo: bar
-	// ---
-	// apiVersion: example.com/v1
-	// kind: Bar
-	// metadata:
-	//   name: instance
-	//   labels:
-	//     foo: bar
-}

api/filters/labels/labels.go

@@ -1,45 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package labels
-
-import (
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/filters/fsslice"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-type labelMap map[string]string
-
-// Filter sets labels.
-type Filter struct {
-	// Labels is the set of labels to apply to the inputs
-	Labels labelMap `yaml:"labels,omitempty"`
-
-	// FsSlice identifies the label fields.
-	FsSlice types.FsSlice
-}
-
-var _ kio.Filter = Filter{}
-
-func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	keys := filtersutil.SortedMapKeys(f.Labels)
-	_, err := kio.FilterAll(yaml.FilterFunc(
-		func(node *yaml.RNode) (*yaml.RNode, error) {
-			for _, k := range keys {
-				if err := node.PipeE(fsslice.Filter{
-					FsSlice: f.FsSlice,
-					SetValue: filtersutil.SetEntry(
-						k, f.Labels[k], yaml.NodeTagString),
-					CreateKind: yaml.MappingNode, // Labels are MappingNodes.
-					CreateTag:  yaml.NodeTagMap,
-				}); err != nil {
-					return nil, err
-				}
-			}
-			return node, nil
-		})).Filter(nodes)
-	return nodes, err
-}

api/filters/labels/labels_test.go

@@ -1,413 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package labels
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/resid"
-	filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-func TestLabels_Filter(t *testing.T) {
-	testCases := map[string]struct {
-		input          string
-		expectedOutput string
-		filter         Filter
-	}{
-		"add": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  labels:
-    hero: batman
-    fiend: riddler
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  labels:
-    hero: batman
-    fiend: riddler
-    auto: ford
-    bean: cannellini
-    clown: emmett kelley
-    dragon: smaug
-`,
-			filter: Filter{
-				Labels: labelMap{
-					"clown":  "emmett kelley",
-					"auto":   "ford",
-					"dragon": "smaug",
-					"bean":   "cannellini",
-				},
-				FsSlice: []types.FieldSpec{
-					{
-						Path:               "metadata/labels",
-						CreateIfNotPresent: true,
-					},
-				},
-			},
-		},
-		"update": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  labels:
-    hero: batman
-    fiend: riddler
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  labels:
-    hero: superman
-    fiend: luthor
-    bean: cannellini
-    clown: emmett kelley
-`,
-			filter: Filter{
-				Labels: labelMap{
-					"clown": "emmett kelley",
-					"hero":  "superman",
-					"fiend": "luthor",
-					"bean":  "cannellini",
-				}, FsSlice: []types.FieldSpec{
-					{
-						Path:               "metadata/labels",
-						CreateIfNotPresent: true,
-					},
-				},
-			},
-		},
-
-		"data-fieldspecs": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  labels:
-    sleater: kinney
-a:
-  b:
-    sleater: kinney
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-  labels:
-    sleater: kinney
-a:
-  b:
-    sleater: kinney
-`,
-			filter: Filter{
-				Labels: labelMap{
-					"sleater": "kinney",
-				},
-				FsSlice: []types.FieldSpec{
-					{
-						Path:               "metadata/labels",
-						CreateIfNotPresent: true,
-					},
-					{
-						Path:               "a/b",
-						CreateIfNotPresent: true,
-					},
-				},
-			},
-		},
-
-		"fieldSpecWithKind": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v2
-kind: Bar
-metadata:
-  name: instance
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  labels:
-    cheese: cheddar
----
-apiVersion: example.com/v2
-kind: Bar
-metadata:
-  name: instance
-  labels:
-    cheese: cheddar
-a:
-  b:
-    cheese: cheddar
-`,
-			filter: Filter{
-				Labels: labelMap{
-					"cheese": "cheddar",
-				},
-				FsSlice: []types.FieldSpec{
-					{
-						Path:               "metadata/labels",
-						CreateIfNotPresent: true,
-					},
-					{
-						Gvk: resid.Gvk{
-							Kind: "Bar",
-						},
-						Path:               "a/b",
-						CreateIfNotPresent: true,
-					},
-				},
-			},
-		},
-
-		"fieldSpecWithVersion": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v2
-kind: Bar
-metadata:
-  name: instance
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  labels:
-    cheese: cheddar
-a:
-  b:
-    cheese: cheddar
----
-apiVersion: example.com/v2
-kind: Bar
-metadata:
-  name: instance
-  labels:
-    cheese: cheddar
-`,
-			filter: Filter{
-				Labels: labelMap{
-					"cheese": "cheddar",
-				},
-				FsSlice: []types.FieldSpec{
-					{
-						Path:               "metadata/labels",
-						CreateIfNotPresent: true,
-					},
-					{
-						Gvk: resid.Gvk{
-							Version: "v1",
-						},
-						Path:               "a/b",
-						CreateIfNotPresent: true,
-					},
-				},
-			},
-		},
-		"fieldSpecWithVersionInConfigButNoGroupInData": {
-			input: `
-apiVersion: v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: v2
-kind: Bar
-metadata:
-  name: instance
-`,
-			expectedOutput: `
-apiVersion: v1
-kind: Foo
-metadata:
-  name: instance
-  labels:
-    cheese: cheddar
-a:
-  b:
-    cheese: cheddar
----
-apiVersion: v2
-kind: Bar
-metadata:
-  name: instance
-  labels:
-    cheese: cheddar
-`,
-			filter: Filter{
-				Labels: labelMap{
-					"cheese": "cheddar",
-				},
-				FsSlice: []types.FieldSpec{
-					{
-						Path:               "metadata/labels",
-						CreateIfNotPresent: true,
-					},
-					{
-						Gvk: resid.Gvk{
-							Version: "v1",
-						},
-						Path:               "a/b",
-						CreateIfNotPresent: true,
-					},
-				},
-			},
-		},
-
-		"number": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  labels:
-    hero: batman
-    fiend: riddler
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  labels:
-    hero: batman
-    fiend: riddler
-    1: emmett kelley
-    auto: "2"
-`,
-			filter: Filter{
-				Labels: labelMap{
-					"1":    "emmett kelley",
-					"auto": "2",
-				},
-				FsSlice: []types.FieldSpec{
-					{
-						Path:               "metadata/labels",
-						CreateIfNotPresent: true,
-					},
-				},
-			},
-		},
-
-		// test quoting of values which are not considered strings in yaml 1.1
-		"yaml_1_1_compatibility": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  labels:
-    hero: batman
-    fiend: riddler
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  labels:
-    hero: batman
-    fiend: riddler
-    a: "y"
-    b: y1
-    c: "yes"
-    d: yes1
-    e: "true"
-    f: true1
-`,
-			filter: Filter{
-				Labels: labelMap{
-					"a": "y",
-					"b": "y1",
-					"c": "yes",
-					"d": "yes1",
-					"e": "true",
-					"f": "true1",
-				},
-				FsSlice: []types.FieldSpec{
-					{
-						Path:               "metadata/labels",
-						CreateIfNotPresent: true,
-					},
-				},
-			},
-		},
-
-		"null_labels": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  labels: null
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  labels:
-    a: a1
-`,
-			filter: Filter{
-				Labels: labelMap{
-					"a": "a1",
-				},
-				FsSlice: []types.FieldSpec{
-					{
-						Path:               "metadata/labels",
-						CreateIfNotPresent: true,
-					},
-				},
-			},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			if !assert.Equal(t,
-				strings.TrimSpace(tc.expectedOutput),
-				strings.TrimSpace(filtertest_test.RunFilter(t, tc.input, tc.filter))) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/nameref/doc.go

@@ -1,3 +0,0 @@
-// Package nameref contains a kio.Filter implementation of the kustomize
-// name reference transformer.
-package nameref

api/filters/nameref/nameref.go

@@ -1,233 +0,0 @@
-package nameref
-
-import (
-	"fmt"
-
-	"sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/resid"
-	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/resource"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// Filter will update the name reference
-type Filter struct {
-	FieldSpec          types.FieldSpec `json:"fieldSpec,omitempty" yaml:"fieldSpec,omitempty"`
-	Referrer           *resource.Resource
-	Target             resid.Gvk
-	ReferralCandidates resmap.ResMap
-}
-
-func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	return kio.FilterAll(yaml.FilterFunc(f.run)).Filter(nodes)
-}
-
-func (f Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
-	err := node.PipeE(fieldspec.Filter{
-		FieldSpec: f.FieldSpec,
-		SetValue:  f.set,
-	})
-	return node, err
-}
-
-func (f Filter) set(node *yaml.RNode) error {
-	if yaml.IsMissingOrNull(node) {
-		return nil
-	}
-	switch node.YNode().Kind {
-	case yaml.ScalarNode:
-		return f.setScalar(node)
-	case yaml.MappingNode:
-		// Kind: ValidatingWebhookConfiguration
-		// FieldSpec is webhooks/clientConfig/service
-		return f.setMapping(node)
-	case yaml.SequenceNode:
-		return f.setSequence(node)
-	default:
-		return fmt.Errorf(
-			"node is expected to be either a string or a slice of string or a map of string")
-	}
-}
-
-func (f Filter) setSequence(node *yaml.RNode) error {
-	return applyFilterToSeq(seqFilter{
-		setScalarFn:  f.setScalar,
-		setMappingFn: f.setMapping,
-	}, node)
-}
-
-func (f Filter) setMapping(node *yaml.RNode) error {
-	return setNameAndNs(
-		node,
-		f.Referrer,
-		f.Target,
-		f.ReferralCandidates,
-	)
-}
-
-func (f Filter) setScalar(node *yaml.RNode) error {
-	newValue, err := getSimpleNameField(
-		node.YNode().Value,
-		f.Referrer,
-		f.Target,
-		f.ReferralCandidates,
-		f.ReferralCandidates.Resources(),
-	)
-	if err != nil {
-		return err
-	}
-	err = filtersutil.SetScalar(newValue)(node)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func filterReferralCandidates(
-	referrer *resource.Resource,
-	matches []*resource.Resource) []*resource.Resource {
-	var ret []*resource.Resource
-	for _, m := range matches {
-		if referrer.PrefixesSuffixesEquals(m) {
-			ret = append(ret, m)
-		}
-	}
-	return ret
-}
-
-// selectReferral picks the referral among a subset of candidates.
-// It returns the current name and namespace of the selected candidate.
-// Note that the content of the referricalCandidateSubset slice is most of the time
-// identical to the referralCandidates resmap. Still in some cases, such
-// as ClusterRoleBinding, the subset only contains the resources of a specific
-// namespace.
-func selectReferral(
-	oldName string,
-	referrer *resource.Resource,
-	target resid.Gvk,
-	referralCandidates resmap.ResMap,
-	referralCandidateSubset []*resource.Resource) (string, string, error) {
-
-	for _, res := range referralCandidateSubset {
-		id := res.OrgId()
-		if id.IsSelected(&target) && res.GetOriginalName() == oldName {
-			matches := referralCandidates.GetMatchingResourcesByOriginalId(id.Equals)
-			// If there's more than one match,
-			// filter the matches by prefix and suffix
-			if len(matches) > 1 {
-				filteredMatches := filterReferralCandidates(referrer, matches)
-				if len(filteredMatches) > 1 {
-					return "", "", fmt.Errorf(
-						"multiple matches for %s:\n  %v",
-						id, getIds(filteredMatches))
-				}
-				// Check is the match the resource we are working on
-				if len(filteredMatches) == 0 || res != filteredMatches[0] {
-					continue
-				}
-			}
-			// In the resource, note that it is referenced
-			// by the referrer.
-			res.AppendRefBy(referrer.CurId())
-			// Return transformed name of the object,
-			// complete with prefixes, hashes, etc.
-			return res.GetName(), res.GetNamespace(), nil
-		}
-	}
-
-	return oldName, "", nil
-}
-
-// utility function to replace a simple string by the new name
-func getSimpleNameField(
-	oldName string,
-	referrer *resource.Resource,
-	target resid.Gvk,
-	referralCandidates resmap.ResMap,
-	referralCandidateSubset []*resource.Resource) (string, error) {
-
-	newName, _, err := selectReferral(oldName, referrer, target,
-		referralCandidates, referralCandidateSubset)
-
-	return newName, err
-}
-
-func getIds(rs []*resource.Resource) []string {
-	var result []string
-	for _, r := range rs {
-		result = append(result, r.CurId().String()+"\n")
-	}
-	return result
-}
-
-// utility function to replace name field within a map RNode
-// and leverage the namespace field.
-func setNameAndNs(
-	in *yaml.RNode,
-	referrer *resource.Resource,
-	target resid.Gvk,
-	referralCandidates resmap.ResMap) error {
-
-	if in.YNode().Kind != yaml.MappingNode {
-		return fmt.Errorf("expect a mapping node")
-	}
-
-	// Get name field
-	nameNode, err := in.Pipe(yaml.FieldMatcher{
-		Name: "name",
-	})
-	if err != nil || nameNode == nil {
-		return fmt.Errorf("cannot find field 'name' in node")
-	}
-
-	// Get namespace field
-	namespaceNode, err := in.Pipe(yaml.FieldMatcher{
-		Name: "namespace",
-	})
-	if err != nil {
-		return fmt.Errorf("error when find field 'namespace'")
-	}
-
-	// check is namespace matched
-	// name will bot be updated if the namespace doesn't match
-	subset := referralCandidates.Resources()
-	if namespaceNode != nil {
-		namespace := namespaceNode.YNode().Value
-		bynamespace := referralCandidates.GroupedByOriginalNamespace()
-		if _, ok := bynamespace[namespace]; !ok {
-			return nil
-		}
-		subset = bynamespace[namespace]
-	}
-
-	oldName := nameNode.YNode().Value
-	newname, newnamespace, err := selectReferral(oldName, referrer, target,
-		referralCandidates, subset)
-	if err != nil {
-		return err
-	}
-
-	if (newname == oldName) && (newnamespace == "") {
-		// no candidate found.
-		return nil
-	}
-
-	// set name
-	in.Pipe(yaml.FieldSetter{
-		Name:        "name",
-		StringValue: newname,
-	})
-	if newnamespace != "" {
-		// We don't want value "" to replace value "default" since
-		// the empty string is handled as a wild card here not default namespace
-		// by kubernetes.
-		in.Pipe(yaml.FieldSetter{
-			Name:        "namespace",
-			StringValue: newnamespace,
-		})
-	}
-	return nil
-}

api/filters/nameref/nameref_test.go

@@ -1,764 +0,0 @@
-package nameref
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/api/resid"
-	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/resource"
-	filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-func TestNamerefFilter(t *testing.T) {
-	testCases := map[string]struct {
-		input         string
-		candidates    string
-		expected      string
-		filter        Filter
-		originalNames []string
-	}{
-		"simple scalar": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: NotSecret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", ""},
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: newName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-		},
-		"sequence": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-seq:
-- oldName1
-- oldName2
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: NotSecret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName1", ""},
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-seq:
-- newName
-- oldName2
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "seq"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-		},
-		"mapping": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-map:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: NotSecret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", ""},
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-map:
-  name: newName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "map"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-		},
-		"mapping with namespace": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-map:
-  name: oldName
-  namespace: oldNs
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
-  namespace: oldNs
----
-apiVersion: apps/v1
-kind: NotSecret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", ""},
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-map:
-  name: newName
-  namespace: oldNs
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "map"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			factory := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
-			referrer, err := factory.FromBytes([]byte(tc.input))
-			if err != nil {
-				t.Fatal(err)
-			}
-			tc.filter.Referrer = referrer
-
-			resMapFactory := resmap.NewFactory(factory, nil)
-			candidatesRes, err := factory.SliceFromBytesWithNames(
-				tc.originalNames, []byte(tc.candidates))
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			candidates := resMapFactory.FromResourceSlice(candidatesRes)
-			tc.filter.ReferralCandidates = candidates
-
-			if !assert.Equal(t,
-				strings.TrimSpace(tc.expected),
-				strings.TrimSpace(
-					filtertest_test.RunFilter(t, tc.input, tc.filter))) {
-				t.FailNow()
-			}
-		})
-	}
-}
-
-func TestNamerefFilterUnhappy(t *testing.T) {
-	testCases := map[string]struct {
-		input         string
-		candidates    string
-		expected      string
-		filter        Filter
-		originalNames []string
-	}{
-		"invalid node type": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: null
-`,
-			candidates:    "",
-			originalNames: []string{},
-			expected:      "obj '' at path 'ref/name': node is expected to be either a string or a slice of string or a map of string",
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-		},
-		"multiple match": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			expected:      "",
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-		},
-		"no name": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  notName: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			expected:      "",
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			factory := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
-			referrer, err := factory.FromBytes([]byte(tc.input))
-			if err != nil {
-				t.Fatal(err)
-			}
-			tc.filter.Referrer = referrer
-
-			resMapFactory := resmap.NewFactory(factory, nil)
-			candidatesRes, err := factory.SliceFromBytesWithNames(
-				tc.originalNames, []byte(tc.candidates))
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			candidates := resMapFactory.FromResourceSlice(candidatesRes)
-			tc.filter.ReferralCandidates = candidates
-
-			_, err = filtertest_test.RunFilterE(t, tc.input, tc.filter)
-			if err == nil {
-				t.Fatalf("expect an error")
-			}
-			if tc.expected != "" && !assert.EqualError(t, err, tc.expected) {
-				t.FailNow()
-			}
-		})
-	}
-}
-
-func TestCandidatesWithDifferentPrefixSuffix(t *testing.T) {
-	testCases := map[string]struct {
-		input         string
-		candidates    string
-		expected      string
-		filter        Filter
-		originalNames []string
-		prefix        []string
-		suffix        []string
-		inputPrefix   string
-		inputSuffix   string
-		err           bool
-	}{
-		"prefix match": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"prefix1", "prefix2"},
-			suffix:        []string{"", "suffix2"},
-			inputPrefix:   "prefix1",
-			inputSuffix:   "",
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: newName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: false,
-		},
-		"suffix match": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"", "prefix2"},
-			suffix:        []string{"suffix1", "suffix2"},
-			inputPrefix:   "",
-			inputSuffix:   "suffix1",
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: newName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: false,
-		},
-		"prefix suffix both match": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"prefix1", "prefix2"},
-			suffix:        []string{"suffix1", "suffix2"},
-			inputPrefix:   "prefix1",
-			inputSuffix:   "suffix1",
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: newName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: false,
-		},
-		"multiple match: both": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"prefix", "prefix"},
-			suffix:        []string{"suffix", "suffix"},
-			inputPrefix:   "prefix",
-			inputSuffix:   "suffix",
-			expected:      "",
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: true,
-		},
-		"multiple match: only prefix": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"prefix", "prefix"},
-			suffix:        []string{"", ""},
-			inputPrefix:   "prefix",
-			inputSuffix:   "",
-			expected:      "",
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: true,
-		},
-		"multiple match: only suffix": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"", ""},
-			suffix:        []string{"suffix", "suffix"},
-			inputPrefix:   "",
-			inputSuffix:   "suffix",
-			expected:      "",
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: true,
-		},
-		"no match: neither match": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"prefix1", "prefix2"},
-			suffix:        []string{"suffix1", "suffix2"},
-			inputPrefix:   "prefix",
-			inputSuffix:   "suffix",
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: false,
-		},
-		"no match: prefix doesn't match": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"prefix1", "prefix2"},
-			suffix:        []string{"suffix", "suffix"},
-			inputPrefix:   "prefix",
-			inputSuffix:   "suffix",
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: false,
-		},
-		"no match: suffix doesn't match": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"prefix", "prefix"},
-			suffix:        []string{"suffix1", "suffix2"},
-			inputPrefix:   "prefix",
-			inputSuffix:   "suffix",
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: false,
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			factory := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
-			referrer, err := factory.FromBytes([]byte(tc.input))
-			if err != nil {
-				t.Fatal(err)
-			}
-			if tc.inputPrefix != "" {
-				referrer.AddNamePrefix(tc.inputPrefix)
-			}
-			if tc.inputSuffix != "" {
-				referrer.AddNameSuffix(tc.inputSuffix)
-			}
-			tc.filter.Referrer = referrer
-
-			resMapFactory := resmap.NewFactory(factory, nil)
-			candidatesRes, err := factory.SliceFromBytesWithNames(
-				tc.originalNames, []byte(tc.candidates))
-			if err != nil {
-				t.Fatal(err)
-			}
-			for i := range candidatesRes {
-				if tc.prefix[i] != "" {
-					candidatesRes[i].AddNamePrefix(tc.prefix[i])
-				}
-				if tc.suffix[i] != "" {
-					candidatesRes[i].AddNameSuffix(tc.suffix[i])
-				}
-			}
-
-			candidates := resMapFactory.FromResourceSlice(candidatesRes)
-			tc.filter.ReferralCandidates = candidates
-
-			if !tc.err {
-				if !assert.Equal(t,
-					strings.TrimSpace(tc.expected),
-					strings.TrimSpace(
-						filtertest_test.RunFilter(t, tc.input, tc.filter))) {
-					t.FailNow()
-				}
-			} else {
-				_, err := filtertest_test.RunFilterE(t, tc.input, tc.filter)
-				if err == nil {
-					t.Fatalf("an error is expected")
-				}
-			}
-		})
-	}
-}

api/filters/nameref/seqfilter.go

@@ -1,57 +0,0 @@
-package nameref
-
-import (
-	"fmt"
-
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-type setFn func(*yaml.RNode) error
-
-type seqFilter struct {
-	setScalarFn  setFn
-	setMappingFn setFn
-}
-
-func (sf seqFilter) Filter(node *yaml.RNode) (*yaml.RNode, error) {
-	if yaml.IsMissingOrNull(node) {
-		return node, nil
-	}
-	switch node.YNode().Kind {
-	case yaml.ScalarNode:
-		// Kind: Role/ClusterRole
-		// FieldSpec is rules.resourceNames
-		err := sf.setScalarFn(node)
-		return node, err
-	case yaml.MappingNode:
-		// Kind: RoleBinding/ClusterRoleBinding
-		// FieldSpec is subjects
-		// Note: The corresponding fieldSpec had been changed from
-		// from path: subjects/name to just path: subjects. This is
-		// what get mutatefield to request the mapping of the whole
-		// map containing namespace and name instead of just a simple
-		// string field containing the name
-		err := sf.setMappingFn(node)
-		return node, err
-	default:
-		return node, fmt.Errorf(
-			"%#v is expected to be either a string or a map of string", node)
-	}
-}
-
-// applyFilterToSeq will apply the filter to each element in the sequence node
-func applyFilterToSeq(filter yaml.Filter, node *yaml.RNode) error {
-	if node.YNode().Kind != yaml.SequenceNode {
-		return fmt.Errorf("expect a sequence node but got %v", node.YNode().Kind)
-	}
-
-	for _, elem := range node.Content() {
-		rnode := yaml.NewRNode(elem)
-		err := rnode.PipeE(filter)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

api/filters/nameref/seqfilter_test.go

@@ -1,80 +0,0 @@
-package nameref
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-func SeqFilter(node *yaml.RNode) (*yaml.RNode, error) {
-	if node.YNode().Value == "aaa" {
-		node.YNode().SetString("ccc")
-	}
-	return node, nil
-}
-
-func TestApplyFilterToSeq(t *testing.T) {
-	fltr := yaml.FilterFunc(SeqFilter)
-
-	testCases := map[string]struct {
-		input  string
-		expect string
-	}{
-		"replace in seq": {
-			input: `
-- aaa
-- bbb`,
-			expect: `
-- ccc
-- bbb`,
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			node, err := yaml.Parse(tc.input)
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = applyFilterToSeq(fltr, node)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if !assert.Equal(t,
-				strings.TrimSpace(tc.expect),
-				strings.TrimSpace(node.MustString())) {
-				t.Fatalf("expect:\n%s\nactual:\n%s",
-					strings.TrimSpace(tc.expect),
-					strings.TrimSpace(node.MustString()))
-			}
-		})
-	}
-}
-
-func TestApplyFilterToSeqUnhappy(t *testing.T) {
-	fltr := yaml.FilterFunc(SeqFilter)
-
-	testCases := map[string]struct {
-		input string
-	}{
-		"replace in seq": {
-			input: `
-aaa`,
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			node, err := yaml.Parse(tc.input)
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = applyFilterToSeq(fltr, node)
-			if err == nil {
-				t.Fatalf("expect an error")
-			}
-		})
-	}
-}

api/filters/namespace/doc.go

@@ -1,9 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package namespace contains a kio.Filter implementation of the kustomize
-// namespace transformer.
-//
-// Special cases for known Kubernetes resources have been hardcoded in addition
-// to those defined by the FsSlice.
-package namespace

api/filters/namespace/example_test.go

@@ -1,50 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package namespace_test
-
-import (
-	"bytes"
-	"log"
-	"os"
-
-	"sigs.k8s.io/kustomize/api/filters/namespace"
-	"sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-)
-
-func ExampleFilter() {
-	fss := builtinconfig.MakeDefaultConfig().NameSpace
-	err := kio.Pipeline{
-		Inputs: []kio.Reader{&kio.ByteReader{Reader: bytes.NewBufferString(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-  namespace: bar
-`)}},
-		Filters: []kio.Filter{namespace.Filter{Namespace: "app", FsSlice: fss}},
-		Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}},
-	}.Execute()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// apiVersion: example.com/v1
-	// kind: Foo
-	// metadata:
-	//   name: instance
-	//   namespace: app
-	// ---
-	// apiVersion: example.com/v1
-	// kind: Bar
-	// metadata:
-	//   name: instance
-	//   namespace: app
-}

api/filters/namespace/namespace.go

@@ -1,169 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package namespace
-
-import (
-	"sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/filters/fsslice"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-type Filter struct {
-	// Namespace is the namespace to apply to the inputs
-	Namespace string `yaml:"namespace,omitempty"`
-
-	// FsSlice contains the FieldSpecs to locate the namespace field
-	FsSlice types.FsSlice `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
-}
-
-var _ kio.Filter = Filter{}
-
-func (ns Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	return kio.FilterAll(yaml.FilterFunc(ns.run)).Filter(nodes)
-}
-
-// Run runs the filter on a single node rather than a slice
-func (ns Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
-	// hacks for hardcoded types -- :(
-	if err := ns.hacks(node); err != nil {
-		return nil, err
-	}
-
-	// Remove the fieldspecs that are for hardcoded fields.  The fieldspecs
-	// exist for backwards compatibility with other implementations
-	// of this transformation.
-	// This implementation of the namespace transformation
-	// Does not use the fieldspecs for implementing cases which
-	// require hardcoded logic.
-	ns.FsSlice = ns.removeFieldSpecsForHacks(ns.FsSlice)
-
-	// transformations based on data -- :)
-	err := node.PipeE(fsslice.Filter{
-		FsSlice:    ns.FsSlice,
-		SetValue:   filtersutil.SetScalar(ns.Namespace),
-		CreateKind: yaml.ScalarNode, // Namespace is a ScalarNode
-		CreateTag:  yaml.NodeTagString,
-	})
-	return node, err
-}
-
-// hacks applies the namespace transforms that are hardcoded rather
-// than specified through FieldSpecs.
-func (ns Filter) hacks(obj *yaml.RNode) error {
-	meta, err := obj.GetMeta()
-	if err != nil {
-		return err
-	}
-
-	if err := ns.metaNamespaceHack(obj, meta); err != nil {
-		return err
-	}
-
-	return ns.roleBindingHack(obj, meta)
-}
-
-// metaNamespaceHack is a hack for implementing the namespace transform
-// for the metadata.namespace field on namespace scoped resources.
-// namespace scoped resources are determined by NOT being present
-// in a blacklist of cluster-scoped resource types (by apiVersion and kind).
-//
-// This hack should be updated to allow individual resources to specify
-// if they are cluster scoped through either an annotation on the resources,
-// or through inlined OpenAPI on the resource as a YAML comment.
-func (ns Filter) metaNamespaceHack(obj *yaml.RNode, meta yaml.ResourceMeta) error {
-	gvk := fieldspec.GetGVK(meta)
-	if !gvk.IsNamespaceableKind() {
-		return nil
-	}
-	f := fsslice.Filter{
-		FsSlice: []types.FieldSpec{
-			{Path: types.MetadataNamespacePath, CreateIfNotPresent: true},
-		},
-		SetValue:   filtersutil.SetScalar(ns.Namespace),
-		CreateKind: yaml.ScalarNode, // Namespace is a ScalarNode
-	}
-	_, err := f.Filter(obj)
-	return err
-}
-
-// roleBindingHack is a hack for implementing the namespace transform
-// for RoleBinding and ClusterRoleBinding resource types.
-// RoleBinding and ClusterRoleBinding have namespace set on
-// elements of the "subjects" field if and only if the subject elements
-// "name" is "default".  Otherwise the namespace is not set.
-//
-// Example:
-//
-// kind: RoleBinding
-// subjects:
-// - name: "default" # this will have the namespace set
-//   ...
-// - name: "something-else" # this will not have the namespace set
-//   ...
-func (ns Filter) roleBindingHack(obj *yaml.RNode, meta yaml.ResourceMeta) error {
-	if meta.Kind != roleBindingKind && meta.Kind != clusterRoleBindingKind {
-		return nil
-	}
-
-	// Lookup the namespace field on all elements.
-	// We should change the fieldspec so this isn't necessary.
-	obj, err := obj.Pipe(yaml.Lookup(subjectsField))
-	if err != nil || yaml.IsMissingOrNull(obj) {
-		return err
-	}
-
-	// add the namespace to each "subject" with name: default
-	err = obj.VisitElements(func(o *yaml.RNode) error {
-		// copied from kunstruct based kustomize NamespaceTransformer plugin
-		// The only case we need to force the namespace
-		// if for the "service account". "default" is
-		// kind of hardcoded here for right now.
-		name, err := o.Pipe(
-			yaml.Lookup("name"), yaml.Match("default"),
-		)
-		if err != nil || yaml.IsMissingOrNull(name) {
-			return err
-		}
-
-		// set the namespace for the default account
-		v := yaml.NewScalarRNode(ns.Namespace)
-		return o.PipeE(
-			yaml.LookupCreate(yaml.ScalarNode, "namespace"),
-			yaml.FieldSetter{Value: v},
-		)
-	})
-
-	return err
-}
-
-// removeFieldSpecsForHacks removes from the list fieldspecs that
-// have hardcoded implementations
-func (ns Filter) removeFieldSpecsForHacks(fs types.FsSlice) types.FsSlice {
-	var val types.FsSlice
-	for i := range fs {
-		// implemented by metaNamespaceHack
-		if fs[i].Path == types.MetadataNamespacePath {
-			continue
-		}
-		// implemented by roleBindingHack
-		if fs[i].Kind == roleBindingKind && fs[i].Path == subjectsField {
-			continue
-		}
-		// implemented by roleBindingHack
-		if fs[i].Kind == clusterRoleBindingKind && fs[i].Path == subjectsField {
-			continue
-		}
-		val = append(val, fs[i])
-	}
-	return val
-}
-
-const (
-	subjectsField          = "subjects"
-	roleBindingKind        = "RoleBinding"
-	clusterRoleBindingKind = "ClusterRoleBinding"
-)

api/filters/namespace/namespace_test.go

@@ -1,311 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package namespace_test
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/filters/namespace"
-	"sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig"
-	filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-var tests = []TestCase{
-	{
-		name: "add",
-		input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-`,
-		expected: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  namespace: foo
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-  namespace: foo
-`,
-		filter: namespace.Filter{Namespace: "foo"},
-	},
-
-	{
-		name: "null_ns",
-		input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  namespace: null
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-  namespace: null
-`,
-		expected: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  namespace: foo
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-  namespace: foo
-`,
-		filter: namespace.Filter{Namespace: "foo"},
-	},
-
-	{
-		name: "add-recurse",
-		input: `
-apiVersion: example.com/v1
-kind: Foo
----
-apiVersion: example.com/v1
-kind: Bar
-`,
-		expected: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  namespace: foo
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  namespace: foo
-`,
-		filter: namespace.Filter{Namespace: "foo"},
-	},
-
-	{
-		name: "update",
-		input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  # update this namespace
-  namespace: bar
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-  namespace: bar
-`,
-		expected: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  # update this namespace
-  namespace: foo
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-  namespace: foo
-`,
-		filter: namespace.Filter{Namespace: "foo"},
-	},
-
-	{
-		name: "update-rolebinding",
-		input: `
-apiVersion: example.com/v1
-kind: RoleBinding
-subjects:
-- name: default
----
-apiVersion: example.com/v1
-kind: RoleBinding
-subjects:
-- name: default
-  namespace: foo
----
-apiVersion: example.com/v1
-kind: RoleBinding
-subjects:
-- name: something
----
-apiVersion: example.com/v1
-kind: RoleBinding
-subjects:
-- name: something
-  namespace: foo
-`,
-		expected: `
-apiVersion: example.com/v1
-kind: RoleBinding
-subjects:
-- name: default
-  namespace: bar
-metadata:
-  namespace: bar
----
-apiVersion: example.com/v1
-kind: RoleBinding
-subjects:
-- name: default
-  namespace: bar
-metadata:
-  namespace: bar
----
-apiVersion: example.com/v1
-kind: RoleBinding
-subjects:
-- name: something
-metadata:
-  namespace: bar
----
-apiVersion: example.com/v1
-kind: RoleBinding
-subjects:
-- name: something
-  namespace: foo
-metadata:
-  namespace: bar
-`,
-		filter: namespace.Filter{Namespace: "bar"},
-	},
-
-	{
-		name: "update-clusterrolebinding",
-		input: `
-apiVersion: example.com/v1
-kind: ClusterRoleBinding
-subjects:
-- name: default
----
-apiVersion: example.com/v1
-kind: ClusterRoleBinding
-subjects:
-- name: default
-  namespace: foo
----
-apiVersion: example.com/v1
-kind: ClusterRoleBinding
-subjects:
-- name: something
----
-apiVersion: example.com/v1
-kind: ClusterRoleBinding
-subjects:
-- name: something
-  namespace: foo
-`,
-		expected: `
-apiVersion: example.com/v1
-kind: ClusterRoleBinding
-subjects:
-- name: default
-  namespace: bar
----
-apiVersion: example.com/v1
-kind: ClusterRoleBinding
-subjects:
-- name: default
-  namespace: bar
----
-apiVersion: example.com/v1
-kind: ClusterRoleBinding
-subjects:
-- name: something
----
-apiVersion: example.com/v1
-kind: ClusterRoleBinding
-subjects:
-- name: something
-  namespace: foo
-`,
-		filter: namespace.Filter{Namespace: "bar"},
-	},
-
-	{
-		name: "data-fieldspecs",
-		input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-`,
-		expected: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-  namespace: foo
-a:
-  b:
-    c: foo
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-  namespace: foo
-a:
-  b:
-    c: foo
-`,
-		filter: namespace.Filter{Namespace: "foo"},
-		fsslice: []types.FieldSpec{
-			{
-				Path:               "a/b/c",
-				CreateIfNotPresent: true,
-			},
-		},
-	},
-}
-
-type TestCase struct {
-	name     string
-	input    string
-	expected string
-	filter   namespace.Filter
-	fsslice  types.FsSlice
-}
-
-var config = builtinconfig.MakeDefaultConfig()
-
-func TestNamespace_Filter(t *testing.T) {
-	for i := range tests {
-		test := tests[i]
-		t.Run(test.name, func(t *testing.T) {
-			test.filter.FsSlice = append(config.NameSpace, test.fsslice...)
-			if !assert.Equal(t,
-				strings.TrimSpace(test.expected),
-				strings.TrimSpace(
-					filtertest_test.RunFilter(t, test.input, test.filter))) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/patchjson6902/doc.go

@@ -1,6 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package namespace contains a kio.Filter implementation of the kustomize
-// patchjson6902 transformer
-package patchjson6902

api/filters/patchjson6902/example_test.go

@@ -1,55 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package patchjson6902
-
-import (
-	"bytes"
-	"log"
-	"os"
-
-	"sigs.k8s.io/kustomize/kyaml/kio"
-)
-
-func ExampleFilter() {
-	err := kio.Pipeline{
-		Inputs: []kio.Reader{&kio.ByteReader{Reader: bytes.NewBufferString(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-  namespace: bar
-`)}},
-		Filters: []kio.Filter{
-			Filter{
-				Patch: `
-- op: replace
-  path: /metadata/namespace
-  value: "ns"
-`,
-			},
-		},
-		Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}},
-	}.Execute()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// apiVersion: example.com/v1
-	// kind: Foo
-	// metadata:
-	//   name: instance
-	//   namespace: ns
-	// ---
-	// apiVersion: example.com/v1
-	// kind: Bar
-	// metadata:
-	//   name: instance
-	//   namespace: ns
-}

api/filters/patchjson6902/patchjson6902.go

@@ -1,65 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package patchjson6902
-
-import (
-	"strings"
-
-	jsonpatch "github.com/evanphx/json-patch"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-	k8syaml "sigs.k8s.io/yaml"
-)
-
-type Filter struct {
-	Patch string
-
-	decodedPatch jsonpatch.Patch
-}
-
-var _ kio.Filter = Filter{}
-
-func (pf Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	decodedPatch, err := pf.decodePatch()
-	if err != nil {
-		return nil, err
-	}
-	pf.decodedPatch = decodedPatch
-	return kio.FilterAll(yaml.FilterFunc(pf.run)).Filter(nodes)
-}
-
-func (pf Filter) decodePatch() (jsonpatch.Patch, error) {
-	patch := pf.Patch
-	// If the patch doesn't look like a JSON6902 patch, we
-	// try to parse it to json.
-	if !strings.HasPrefix(pf.Patch, "[") {
-		p, err := k8syaml.YAMLToJSON([]byte(patch))
-		if err != nil {
-			return nil, err
-		}
-		patch = string(p)
-	}
-	decodedPatch, err := jsonpatch.DecodePatch([]byte(patch))
-	if err != nil {
-		return nil, err
-	}
-	return decodedPatch, nil
-}
-
-func (pf Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
-	// We don't actually use the kyaml library for manipulating the
-	// yaml here. We just marshal it to json and rely on the
-	// jsonpatch library to take care of applying the patch.
-	// This means ordering might not be preserved with this filter.
-	b, err := node.MarshalJSON()
-	if err != nil {
-		return nil, err
-	}
-	res, err := pf.decodedPatch.Apply(b)
-	if err != nil {
-		return nil, err
-	}
-	err = node.UnmarshalJSON(res)
-	return node, err
-}

api/filters/patchjson6902/patchjson6902_test.go

@@ -1,173 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package patchjson6902
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	filtertest "sigs.k8s.io/kustomize/api/testutils/filtertest"
-)
-
-const input = `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: myDeploy
-spec:
-  replica: 2
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`
-
-func TestSomething(t *testing.T) {
-	testCases := []struct {
-		testName       string
-		input          string
-		filter         Filter
-		expectedOutput string
-	}{
-		{
-			testName: "single operation, json",
-			input:    input,
-			filter: Filter{
-				Patch: `[
-{"op": "replace", "path": "/spec/replica", "value": 5}
-]`,
-			},
-			expectedOutput: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: myDeploy
-spec:
-  replica: 5
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`,
-		},
-		{
-			testName: "multiple operations, json",
-			input:    input,
-			filter: Filter{
-				Patch: `[
-{"op": "replace", "path": "/spec/template/spec/containers/0/name", "value": "my-nginx"},
-{"op": "add", "path": "/spec/replica", "value": 999},
-{"op": "add", "path": "/spec/template/spec/containers/0/command", "value": ["arg1", "arg2", "arg3"]}
-]`,
-			},
-			expectedOutput: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: myDeploy
-spec:
-  replica: 999
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-    spec:
-      containers:
-      - command:
-        - arg1
-        - arg2
-        - arg3
-        image: nginx
-        name: my-nginx
-`,
-		},
-		{
-			testName: "single operation, yaml",
-			input:    input,
-			filter: Filter{
-				Patch: `
-- op: replace
-  path: /spec/replica
-  value: 5
-`,
-			},
-			expectedOutput: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: myDeploy
-spec:
-  replica: 5
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`,
-		},
-		{
-			testName: "multiple operations, yaml",
-			input:    input,
-			filter: Filter{
-				Patch: `
-- op: replace
-  path: /spec/template/spec/containers/0/name
-  value: my-nginx
-- op: add
-  path: /spec/replica
-  value: 999
-- op: add
-  path: /spec/template/spec/containers/0/command
-  value:
-  - arg1
-  - arg2
-  - arg3
-`,
-			},
-			expectedOutput: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: myDeploy
-spec:
-  replica: 999
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-    spec:
-      containers:
-      - command:
-        - arg1
-        - arg2
-        - arg3
-        image: nginx
-        name: my-nginx
-`,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.testName, func(t *testing.T) {
-			if !assert.Equal(t,
-				strings.TrimSpace(tc.expectedOutput),
-				strings.TrimSpace(
-					filtertest.RunFilter(t, tc.input, tc.filter))) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/patchstrategicmerge/doc.go

@@ -1,6 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package patchstrategicmerge contains a kio.Filter implementation of the
-// kustomize strategic merge patch transformer.
-package patchstrategicmerge

api/filters/patchstrategicmerge/example_test.go

@@ -1,49 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package patchstrategicmerge
-
-import (
-	"bytes"
-	"log"
-	"os"
-
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-func ExampleFilter() {
-	err := kio.Pipeline{
-		Inputs: []kio.Reader{&kio.ByteReader{Reader: bytes.NewBufferString(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  replicas: 3
-`)}},
-		Filters: []kio.Filter{Filter{
-			Patch: yaml.MustParse(`
-spec:
-  template:
-    containers:
-    - image: nginx
-`),
-		}},
-		Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}},
-	}.Execute()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// apiVersion: example.com/v1
-	// kind: Foo
-	// metadata:
-	//   name: instance
-	// spec:
-	//   replicas: 3
-	//   template:
-	//     containers:
-	//     - image: nginx
-}

api/filters/patchstrategicmerge/patchstrategicmerge.go

@@ -1,28 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package patchstrategicmerge
-
-import (
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-	"sigs.k8s.io/kustomize/kyaml/yaml/merge2"
-)
-
-type Filter struct {
-	Patch *yaml.RNode
-}
-
-var _ kio.Filter = Filter{}
-
-func (pf Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	var result []*yaml.RNode
-	for i := range nodes {
-		r, err := merge2.Merge(pf.Patch, nodes[i])
-		if err != nil {
-			return nil, err
-		}
-		result = append(result, r)
-	}
-	return result, nil
-}

api/filters/patchstrategicmerge/patchstrategicmerge_test.go

@@ -1,162 +0,0 @@
-package patchstrategicmerge
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	filtertest "sigs.k8s.io/kustomize/api/testutils/filtertest"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-func TestFilter(t *testing.T) {
-	testCases := map[string]struct {
-		input    string
-		patch    *yaml.RNode
-		expected string
-	}{
-		"simple patch": {
-			input: `
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-`,
-			patch: yaml.MustParse(`
-metadata:
-  name: yourDeploy
-`),
-			expected: `
-apiVersion: apps/v1
-metadata:
-  name: yourDeploy
-kind: Deployment
-`,
-		},
-		"container patch": {
-			input: `
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  template:
-    spec:
-      containers:
-      - name: foo1
-      - name: foo2
-      - name: foo3
-`,
-			patch: yaml.MustParse(`
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  template:
-    spec:
-      containers:
-      - name: foo0
-`),
-			expected: `
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  template:
-    spec:
-      containers:
-      - name: foo1
-      - name: foo2
-      - name: foo3
-      - name: foo0
-`,
-		},
-		"volumes patch": {
-			input: `
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  template:
-    spec:
-      volumes:
-      - name: foo1
-      - name: foo2
-      - name: foo3
-`,
-			patch: yaml.MustParse(`
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  template:
-    spec:
-      volumes:
-      - name: foo0
-`),
-			expected: `
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  template:
-    spec:
-      volumes:
-      - name: foo1
-      - name: foo2
-      - name: foo3
-      - name: foo0
-`,
-		},
-		"nested patch": {
-			input: `
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  containers:
-  - name: nginx
-    args:
-    - abc
-`,
-			patch: yaml.MustParse(`
-spec:
-  containers:
-  - name: nginx
-    args:
-    - def
-`),
-			expected: `
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  containers:
-  - name: nginx
-    args:
-    - def
-`,
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			f := Filter{
-				Patch: tc.patch,
-			}
-			if !assert.Equal(t,
-				strings.TrimSpace(tc.expected),
-				strings.TrimSpace(
-					filtertest.RunFilter(t, tc.input, f))) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/prefixsuffix/doc.go

@@ -1,6 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package prefixsuffix contains a kio.Filter implementation of the kustomize
-// PrefixSuffixTransformer.
-package prefixsuffix

api/filters/prefixsuffix/example_test.go

@@ -1,47 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package prefixsuffix_test
-
-import (
-	"bytes"
-	"log"
-	"os"
-
-	"sigs.k8s.io/kustomize/api/filters/prefixsuffix"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-)
-
-func ExampleFilter() {
-	err := kio.Pipeline{
-		Inputs: []kio.Reader{&kio.ByteReader{Reader: bytes.NewBufferString(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-`)}},
-		Filters: []kio.Filter{prefixsuffix.Filter{
-			Prefix: "baz-", FieldSpec: types.FieldSpec{Path: "metadata/name"}}},
-		Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}},
-	}.Execute()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// apiVersion: example.com/v1
-	// kind: Foo
-	// metadata:
-	//   name: baz-instance
-	// ---
-	// apiVersion: example.com/v1
-	// kind: Bar
-	// metadata:
-	//   name: baz-instance
-}

api/filters/prefixsuffix/prefixsuffix.go

@@ -1,43 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package prefixsuffix
-
-import (
-	"fmt"
-
-	"sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// Filter applies resource name prefix's and suffix's using the fieldSpecs
-type Filter struct {
-	Prefix string `json:"prefix,omitempty" yaml:"prefix,omitempty"`
-	Suffix string `json:"suffix,omitempty" yaml:"suffix,omitempty"`
-
-	FieldSpec types.FieldSpec `json:"fieldSpec,omitempty" yaml:"fieldSpec,omitempty"`
-}
-
-var _ kio.Filter = Filter{}
-
-func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	return kio.FilterAll(yaml.FilterFunc(f.run)).Filter(nodes)
-}
-
-func (f Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
-	err := node.PipeE(fieldspec.Filter{
-		FieldSpec:  f.FieldSpec,
-		SetValue:   f.evaluateField,
-		CreateKind: yaml.ScalarNode, // Name is a ScalarNode
-		CreateTag:  yaml.NodeTagString,
-	})
-	return node, err
-}
-
-func (f Filter) evaluateField(node *yaml.RNode) error {
-	return filtersutil.SetScalar(fmt.Sprintf(
-		"%s%s%s", f.Prefix, node.YNode().Value, f.Suffix))(node)
-}

api/filters/prefixsuffix/prefixsuffix_test.go

@@ -1,158 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package prefixsuffix_test
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/filters/prefixsuffix"
-	filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-var tests = map[string]TestCase{
-	"prefix": {
-		input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-`,
-		expected: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: foo-instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: foo-instance
-`,
-		filter: prefixsuffix.Filter{Prefix: "foo-"},
-		fs:     types.FieldSpec{Path: "metadata/name"},
-	},
-
-	"suffix": {
-		input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-`,
-		expected: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance-foo
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance-foo
-`,
-		filter: prefixsuffix.Filter{Suffix: "-foo"},
-		fs:     types.FieldSpec{Path: "metadata/name"},
-	},
-
-	"prefix-suffix": {
-		input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-`,
-		expected: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: bar-instance-foo
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: bar-instance-foo
-`,
-		filter: prefixsuffix.Filter{Prefix: "bar-", Suffix: "-foo"},
-		fs:     types.FieldSpec{Path: "metadata/name"},
-	},
-
-	"data-fieldspecs": {
-		input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-a:
-  b:
-    c: d
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-a:
-  b:
-    c: d
-`,
-		expected: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-a:
-  b:
-    c: foo-d
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-a:
-  b:
-    c: foo-d
-`,
-		filter: prefixsuffix.Filter{Prefix: "foo-"},
-		fs:     types.FieldSpec{Path: "a/b/c"},
-	},
-}
-
-type TestCase struct {
-	input    string
-	expected string
-	filter   prefixsuffix.Filter
-	fs       types.FieldSpec
-}
-
-func TestFilter(t *testing.T) {
-	for name := range tests {
-		test := tests[name]
-		t.Run(name, func(t *testing.T) {
-			test.filter.FieldSpec = test.fs
-			if !assert.Equal(t,
-				strings.TrimSpace(test.expected),
-				strings.TrimSpace(
-					filtertest_test.RunFilter(t, test.input, test.filter))) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/refvar/doc.go

@@ -1,3 +0,0 @@
-// Package refvar contains a kio.Filter implementation of the kustomize
-// refvar transformer.
-package refvar

api/filters/refvar/refvar.go

@@ -1,101 +0,0 @@
-package refvar
-
-import (
-	"fmt"
-	"strconv"
-
-	"sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-
-	expansion2 "sigs.k8s.io/kustomize/api/internal/accumulator/expansion"
-)
-
-// Filter updates $(VAR) style variables with values.
-// The fieldSpecs are the places to look for occurrences of $(VAR).
-type Filter struct {
-	MappingFunc func(string) interface{} `json:"mappingFunc,omitempty" yaml:"mappingFunc,omitempty"`
-	FieldSpec   types.FieldSpec          `json:"fieldSpec,omitempty" yaml:"fieldSpec,omitempty"`
-}
-
-func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	return kio.FilterAll(yaml.FilterFunc(f.run)).Filter(nodes)
-}
-
-func (f Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
-	err := node.PipeE(fieldspec.Filter{
-		FieldSpec: f.FieldSpec,
-		SetValue:  f.set,
-	})
-	return node, err
-}
-
-func (f Filter) set(node *yaml.RNode) error {
-	if yaml.IsMissingOrNull(node) {
-		return nil
-	}
-	switch node.YNode().Kind {
-	case yaml.ScalarNode:
-		return f.setScalar(node)
-	case yaml.MappingNode:
-		return f.setMap(node)
-	case yaml.SequenceNode:
-		return f.setSeq(node)
-	default:
-		return fmt.Errorf("invalid type encountered %v", node.YNode().Kind)
-	}
-}
-
-func updateNodeValue(node *yaml.Node, newValue interface{}) {
-	switch newValue := newValue.(type) {
-	case int64:
-		node.Value = strconv.FormatInt(newValue, 10)
-		node.Tag = yaml.NodeTagInt
-	case bool:
-		node.SetString(strconv.FormatBool(newValue))
-		node.Tag = yaml.NodeTagBool
-	case float64:
-		node.SetString(strconv.FormatFloat(newValue, 'f', -1, 64))
-		node.Tag = yaml.NodeTagFloat
-	default:
-		node.SetString(newValue.(string))
-		node.Tag = yaml.NodeTagString
-	}
-	node.Style = 0
-}
-
-func (f Filter) setScalar(node *yaml.RNode) error {
-	if !yaml.IsYNodeString(node.YNode()) {
-		return nil
-	}
-	v := expansion2.Expand(node.YNode().Value, f.MappingFunc)
-	updateNodeValue(node.YNode(), v)
-	return nil
-}
-
-func (f Filter) setMap(node *yaml.RNode) error {
-	contents := node.YNode().Content
-	for i := 0; i < len(contents); i += 2 {
-		if !yaml.IsYNodeString(contents[i]) {
-			return fmt.Errorf("invalid map key: %s, type: %s", contents[i].Value, contents[i].Tag)
-		}
-		if !yaml.IsYNodeString(contents[i+1]) {
-			continue
-		}
-		newValue := expansion2.Expand(contents[i+1].Value, f.MappingFunc)
-		updateNodeValue(contents[i+1], newValue)
-	}
-	return nil
-}
-
-func (f Filter) setSeq(node *yaml.RNode) error {
-	for _, item := range node.YNode().Content {
-		if !yaml.IsYNodeString(item) {
-			return fmt.Errorf("invalid value type expect a string")
-		}
-		newValue := expansion2.Expand(item.Value, f.MappingFunc)
-		updateNodeValue(item, newValue)
-	}
-	return nil
-}

api/filters/refvar/refvar_test.go

@@ -1,287 +0,0 @@
-package refvar
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	expansion2 "sigs.k8s.io/kustomize/api/internal/accumulator/expansion"
-	filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-func TestFilter(t *testing.T) {
-	replacementCounts := make(map[string]int)
-
-	testCases := map[string]struct {
-		input    string
-		expected string
-		filter   Filter
-	}{
-		"simple scalar": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-spec:
-  replicas: $(VAR)`,
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-spec:
-  replicas: 5`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"VAR": int64(5),
-				}),
-				FieldSpec: types.FieldSpec{Path: "spec/replicas"},
-			},
-		},
-		"non-string scalar": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-spec:
-  replicas: 1`,
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-spec:
-  replicas: 1`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"VAR": int64(5),
-				}),
-				FieldSpec: types.FieldSpec{Path: "spec/replicas"},
-			},
-		},
-		"wrong path": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-spec:
-  replicas: 1`,
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-spec:
-  replicas: 1`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"VAR": int64(5),
-				}),
-				FieldSpec: types.FieldSpec{Path: "a/b/c"},
-			},
-		},
-		"sequence": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-- $(FOO)
-- $(BAR)
-- $(BAZ)
-- $(FOO)+$(BAR)
-- $(BOOL)
-- $(FLOAT)`,
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-- foo
-- bar
-- $(BAZ)
-- foo+bar
-- false
-- 1.23`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"FOO":   "foo",
-					"BAR":   "bar",
-					"BOOL":  false,
-					"FLOAT": 1.23,
-				}),
-				FieldSpec: types.FieldSpec{Path: "data"},
-			},
-		},
-		"maps": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  FOO: $(FOO)
-  BAR: $(BAR)
-  BAZ: $(BAZ)
-  PLUS: $(FOO)+$(BAR)`,
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  FOO: foo
-  BAR: bar
-  BAZ: $(BAZ)
-  PLUS: foo+bar`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"FOO": "foo",
-					"BAR": "bar",
-				}),
-				FieldSpec: types.FieldSpec{Path: "data"},
-			},
-		},
-		"complicated case": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  slice1:
-  - $(FOO)
-  slice2:
-    FOO: $(FOO)
-    BAR: $(BAR)
-    BOOL: false
-    INT: 0
-    SLICE:
-    - $(FOO)`,
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  slice1:
-  - $(FOO)
-  slice2:
-    FOO: foo
-    BAR: bar
-    BOOL: false
-    INT: 0
-    SLICE:
-    - $(FOO)`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"FOO": "foo",
-					"BAR": "bar",
-				}),
-				FieldSpec: types.FieldSpec{Path: "data/slice2"},
-			},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			if !assert.Equal(t,
-				strings.TrimSpace(tc.expected),
-				strings.TrimSpace(
-					filtertest_test.RunFilter(t, tc.input, tc.filter))) {
-				t.FailNow()
-			}
-		})
-	}
-}
-
-func TestFilterUnhappy(t *testing.T) {
-	replacementCounts := make(map[string]int)
-
-	testCases := map[string]struct {
-		input         string
-		expectedError string
-		filter        Filter
-	}{
-		"non-string in sequence": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  slice:
-  - false`,
-			expectedError: `obj 'apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-  annotations:
-    config.kubernetes.io/index: '0'
-data:
-  slice:
-  - false
-' at path 'data/slice': invalid value type expect a string`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"VAR": int64(5),
-				}),
-				FieldSpec: types.FieldSpec{Path: "data/slice"},
-			},
-		},
-		"invalid key in map": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  1: str`,
-			expectedError: `obj 'apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-  annotations:
-    config.kubernetes.io/index: '0'
-data:
-  1: str
-' at path 'data': invalid map key: 1, type: ` + yaml.NodeTagInt,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"VAR": int64(5),
-				}),
-				FieldSpec: types.FieldSpec{Path: "data"},
-			},
-		},
-		"null input": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  FOO: null`,
-			expectedError: "obj '' at path 'data/FOO': invalid type encountered 0",
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{}),
-				FieldSpec:   types.FieldSpec{Path: "data/FOO"},
-			},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			_, err := filtertest_test.RunFilterE(t, tc.input, tc.filter)
-			if !assert.EqualError(t, err, tc.expectedError) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/replicacount/doc.go

@@ -1,6 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package replicacount contains a kio.Filter implementation of the kustomize
-// ReplicaCountTransformer.
-package replicacount

api/filters/replicacount/example_test.go

@@ -1,62 +0,0 @@
-package replicacount
-
-import (
-	"bytes"
-	"log"
-	"os"
-
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-)
-
-func ExampleFilter() {
-	err := kio.Pipeline{
-		Inputs: []kio.Reader{&kio.ByteReader{Reader: bytes.NewBufferString(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  template:
-    replicas: 5
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-spec:
-  template:
-    replicas: 5
-`)}},
-		Filters: []kio.Filter{Filter{
-			Replica: types.Replica{
-				Count: 42,
-				Name:  "instance",
-			},
-			FieldSpec: types.FieldSpec{
-				Path: "spec/template/replicas",
-			},
-		}},
-		Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}},
-	}.Execute()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// apiVersion: example.com/v1
-	// kind: Foo
-	// metadata:
-	//   name: instance
-	// spec:
-	//   template:
-	//     replicas: 42
-	// ---
-	// apiVersion: example.com/v1
-	// kind: Bar
-	// metadata:
-	//   name: instance
-	// spec:
-	//   template:
-	//     replicas: 42
-}

api/filters/replicacount/replicacount.go

@@ -1,37 +0,0 @@
-package replicacount
-
-import (
-	"strconv"
-
-	"sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// Filter updates/sets replicas fields using the fieldSpecs
-type Filter struct {
-	Replica   types.Replica   `json:"replica,omitempty" yaml:"replica,omitempty"`
-	FieldSpec types.FieldSpec `json:"fieldSpec,omitempty" yaml:"fieldSpec,omitempty"`
-}
-
-var _ kio.Filter = Filter{}
-
-func (rc Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	return kio.FilterAll(yaml.FilterFunc(rc.run)).Filter(nodes)
-}
-
-func (rc Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
-	err := node.PipeE(fieldspec.Filter{
-		FieldSpec:  rc.FieldSpec,
-		SetValue:   rc.set,
-		CreateKind: yaml.ScalarNode, // replicas is a ScalarNode
-		CreateTag:  yaml.NodeTagInt,
-	})
-	return node, err
-}
-
-func (rc Filter) set(node *yaml.RNode) error {
-	return filtersutil.SetScalar(strconv.FormatInt(rc.Replica.Count, 10))(node)
-}

api/filters/replicacount/replicacount_test.go

@@ -1,176 +0,0 @@
-package replicacount
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-func TestFilter(t *testing.T) {
-
-	testCases := map[string]struct {
-		input    string
-		expected string
-		filter   Filter
-	}{
-		"update field": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-spec:
-  replicas: 5
-`,
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-spec:
-  replicas: 42
-`,
-			filter: Filter{
-				Replica: types.Replica{
-					Name:  "dep",
-					Count: 42,
-				},
-				FieldSpec: types.FieldSpec{Path: "spec/replicas"},
-			},
-		},
-		"add field": {
-			input: `
-apiVersion: custom/v1
-kind: Custom
-metadata:
-  name: cus
-spec:
-  template:
-    other: something
-`,
-			expected: `
-apiVersion: custom/v1
-kind: Custom
-metadata:
-  name: cus
-spec:
-  template:
-    other: something
-    replicas: 42
-`,
-			filter: Filter{
-				Replica: types.Replica{
-					Name:  "cus",
-					Count: 42,
-				},
-				FieldSpec: types.FieldSpec{
-					Path:               "spec/template/replicas",
-					CreateIfNotPresent: true,
-				},
-			},
-		},
-
-		"add_field_null": {
-			input: `
-apiVersion: custom/v1
-kind: Custom
-metadata:
-  name: cus
-spec:
-  template:
-    other: something
-    replicas: null
-`,
-			expected: `
-apiVersion: custom/v1
-kind: Custom
-metadata:
-  name: cus
-spec:
-  template:
-    other: something
-    replicas: 42
-`,
-			filter: Filter{
-				Replica: types.Replica{
-					Name:  "cus",
-					Count: 42,
-				},
-				FieldSpec: types.FieldSpec{
-					Path:               "spec/template/replicas",
-					CreateIfNotPresent: true,
-				},
-			},
-		},
-		"no update if CreateIfNotPresent is false": {
-			input: `
-apiVersion: custom/v1
-kind: Custom
-metadata:
-  name: cus
-spec:
-  template:
-    other: something
-`,
-			expected: `
-apiVersion: custom/v1
-kind: Custom
-metadata:
-  name: cus
-spec:
-  template:
-    other: something
-`,
-			filter: Filter{
-				Replica: types.Replica{
-					Name:  "cus",
-					Count: 42,
-				},
-				FieldSpec: types.FieldSpec{
-					Path: "spec/template/replicas",
-				},
-			},
-		},
-		"update multiple fields": {
-			input: `
-apiVersion: custom/v1
-kind: Custom
-metadata:
-  name: cus
-spec:
-  template:
-    replicas: 5
-`,
-			expected: `
-apiVersion: custom/v1
-kind: Custom
-metadata:
-  name: cus
-spec:
-  template:
-    replicas: 42
-`,
-			filter: Filter{
-				Replica: types.Replica{
-					Name:  "cus",
-					Count: 42,
-				},
-				FieldSpec: types.FieldSpec{Path: "spec/template/replicas"},
-			},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			if !assert.Equal(t,
-				strings.TrimSpace(tc.expected),
-				strings.TrimSpace(
-					filtertest_test.RunFilter(t, tc.input, tc.filter))) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/valueadd/valueadd.go

@@ -1,124 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package valueadd
-
-import (
-	"strings"
-
-	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// An 'Add' operation aspiring to IETF RFC 6902 JSON.
-//
-// The filter tries to add a value to a node at a particular field path.
-//
-// Kinds of target fields:
-//
-// - Non-existent target field.
-//
-//   The field will be added and the value inserted.
-//
-// - Existing field, scalar or map.
-//
-//   E.g. 'spec/template/spec/containers/[name:nginx]/image'
-//
-//   This behaves like an IETF RFC 6902 Replace operation would;
-//   the existing value is replaced without complaint, even though
-//   this  is an Add operation.  In contrast, a Replace operation
-//   must fail (report an error) if the field doesn't exist.
-//
-// - Existing field, list (array)
-//   Not supported yet.
-//   TODO: Honor fields with RFC-6902-style array indices
-//   TODO: like 'spec/template/spec/containers/2'
-//   TODO: Modify kyaml/yaml/PathGetter to allow this.
-//   The value will be inserted into the array at the given position,
-//   shifting other contents. To instead replace an array entry, use
-//   an implementation of an IETF RFC 6902 Replace operation.
-//
-// For the common case of a filepath in the field value, and a desire
-// to add the value to the filepath (rather than replace the filepath),
-// use a non-zero value of FilePathPosition (see below).
-type Filter struct {
-	// Value is the value to add.
-	//
-	// Empty values are disallowed, i.e. this filter isn't intended
-	// for use in erasing or removing fields. For that, use a filter
-	// more aligned with the IETF RFC 6902 JSON Remove operation.
-	//
-	// At the time of writing, Value's value should be a simple string,
-	// not a JSON document.  This particular filter focuses on easing
-	// injection of a single-sourced cloud project and/or cluster name
-	// into various fields, especially namespace and various filepath
-	// specifications.
-	Value string
-
-	// FieldPath is a JSON-style path to the field intended to hold the value.
-	FieldPath string
-
-	// FilePathPosition is a filepath field index.
-	//
-	// Call the value of this field _i_.
-	//
-	//   If _i_ is zero, negative or unspecified, this field has no effect.
-	//
-	//   If _i_ is > 0, then it's assumed that
-	//   - 'Value' is a string that can work as a directory or file name,
-	//   - the field value intended for replacement holds a filepath.
-	//
-	// The filepath is split into a string slice, the value is inserted
-	// at position [i-1], shifting the rest of the path to the right.
-	// A value of i==1 puts the new value at the start of the path.
-	// This change never converts an absolute path to a relative path,
-	// meaning adding a new field at position i==1 will preserve a
-	// leading slash. E.g. if Value == 'PEACH'
-	//
-	//                  OLD : NEW                    : FilePathPosition
-	//      --------------------------------------------------------
-	//              {empty} : PEACH                  : irrelevant
-	//                    / : /PEACH                 : irrelevant
-	//                  pie : PEACH/pie              : 1 (or less to prefix)
-	//                 /pie : /PEACH/pie             : 1 (or less to prefix)
-	//                  raw : raw/PEACH              : 2 (or more to postfix)
-	//                 /raw : /raw/PEACH             : 2 (or more to postfix)
-	//      a/nice/warm/pie : a/nice/warm/PEACH/pie  : 4
-	//     /a/nice/warm/pie : /a/nice/warm/PEACH/pie : 4
-	//
-	// For robustness (liberal input, conservative output) FilePathPosition
-	// values that that are too large to index the split filepath result in a
-	// postfix rather than an error.  So use 1 to prefix, 9999 to postfix.
-	FilePathPosition int `json:"filePathPosition,omitempty" yaml:"filePathPosition,omitempty"`
-}
-
-var _ kio.Filter = Filter{}
-
-func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	_, err := kio.FilterAll(yaml.FilterFunc(
-		func(node *yaml.RNode) (*yaml.RNode, error) {
-			fields := strings.Split(f.FieldPath, "/")
-			// TODO: support SequenceNode.
-			// Presumably here one could look for array indices (digits) at
-			// the end of the field path (as described in IETF RFC 6902 JSON),
-			// and if found, take it as a signal that this should be a
-			// SequenceNode instead of a ScalarNode, and insert the value
-			// into the proper slot, shifting every over.
-			n, err := node.Pipe(yaml.LookupCreate(yaml.ScalarNode, fields...))
-			if err != nil {
-				return node, err
-			}
-			// TODO: allow more kinds
-			if err := yaml.ErrorIfInvalid(n, yaml.ScalarNode); err != nil {
-				return nil, err
-			}
-			newValue := f.Value
-			if f.FilePathPosition > 0 {
-				newValue = filesys.InsertPathPart(
-					n.YNode().Value, f.FilePathPosition-1, newValue)
-			}
-			return n.Pipe(yaml.FieldSetter{StringValue: newValue})
-		})).Filter(nodes)
-	return nodes, err
-}

api/filters/valueadd/valueadd_test.go

@@ -1,109 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package valueadd
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest"
-)
-
-const someResource = `
-kind: SomeKind
-spec:
-  resourceRef:
-    external: projects/whatever
-`
-
-func TestValueAddFilter(t *testing.T) {
-	testCases := map[string]struct {
-		input          string
-		expectedOutput string
-		filter         Filter
-	}{
-		"simpleAdd": {
-			input: `
-kind: SomeKind
-`,
-			expectedOutput: `
-kind: SomeKind
-spec:
-  resourceRef:
-    external: valueAdded
-`,
-			filter: Filter{
-				Value:     "valueAdded",
-				FieldPath: "spec/resourceRef/external",
-			},
-		},
-		"replaceExisting": {
-			input: someResource,
-			expectedOutput: `
-kind: SomeKind
-spec:
-  resourceRef:
-    external: valueAdded
-`,
-			filter: Filter{
-				Value:     "valueAdded",
-				FieldPath: "spec/resourceRef/external",
-			},
-		},
-		"prefixExisting": {
-			input: someResource,
-			expectedOutput: `
-kind: SomeKind
-spec:
-  resourceRef:
-    external: valueAdded/projects/whatever
-`,
-			filter: Filter{
-				Value:            "valueAdded",
-				FieldPath:        "spec/resourceRef/external",
-				FilePathPosition: 1,
-			},
-		},
-		"postfixExisting": {
-			input: someResource,
-			expectedOutput: `
-kind: SomeKind
-spec:
-  resourceRef:
-    external: projects/whatever/valueAdded
-`,
-			filter: Filter{
-				Value:            "valueAdded",
-				FieldPath:        "spec/resourceRef/external",
-				FilePathPosition: 99,
-			},
-		},
-		"placeInMiddleOfExisting": {
-			input: someResource,
-			expectedOutput: `
-kind: SomeKind
-spec:
-  resourceRef:
-    external: projects/valueAdded/whatever
-`,
-			filter: Filter{
-				Value:            "valueAdded",
-				FieldPath:        "spec/resourceRef/external",
-				FilePathPosition: 2,
-			},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			filter := tc.filter
-			if !assert.Equal(t,
-				strings.TrimSpace(tc.expectedOutput),
-				strings.TrimSpace(filtertest_test.RunFilter(t, tc.input, filter))) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/go.mod

@@ -1,24 +1,18 @@
 module sigs.k8s.io/kustomize/api
 
-go 1.14
+go 1.13
 
 require (
 	github.com/evanphx/json-patch v4.5.0+incompatible
-	github.com/go-openapi/spec v0.19.5
+	github.com/go-openapi/spec v0.19.4
 	github.com/golangci/golangci-lint v1.21.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/pkg/errors v0.8.1
-	github.com/stretchr/testify v1.4.0
-	github.com/yujunz/go-getter v1.4.1-lite
 	golang.org/x/tools v0.0.0-20191010075000-0337d82405ff
-	gopkg.in/yaml.v2 v2.3.0
-	gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71
+	gopkg.in/yaml.v2 v2.2.4
 	k8s.io/api v0.17.0
 	k8s.io/apimachinery v0.17.0
 	k8s.io/client-go v0.17.0
 	k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
-	sigs.k8s.io/kustomize/kyaml v0.6.1
-	sigs.k8s.io/yaml v1.2.0
+	sigs.k8s.io/yaml v1.1.0
 )
-
-replace sigs.k8s.io/kustomize/kyaml v0.6.1 => ../kyaml

api/go.sum

@@ -1,7 +1,6 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-github.com/360EntSecGroup-Skylar/excelize v1.4.1/go.mod h1:vnax29X2usfl7HHkBrX5EvSCJcmH3dT9luvxzu8iGAE=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
 github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
@@ -15,33 +14,21 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/OpenPeeDeeP/depguard v1.0.1 h1:VlW4R6jmBIv3/u1JNlawEvJMM4J+dPORPaZasQee8Us=
 github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM=
-github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
-github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
-github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
-github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
 github.com/bombsimon/wsl v1.2.5 h1:9gTOkIwVtoDZywvX802SDHokeX4kW1cKnV8ZTVAPkRs=
 github.com/bombsimon/wsl v1.2.5/go.mod h1:43lEF/i0kpXbLCeDXL9LMT8c92HyBywXb0AsgMHYngM=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -50,7 +37,6 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
-github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -58,10 +44,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
-github.com/dustmop/soup v1.1.2-0.20190516214245-38228baa104e/go.mod h1:CgNC6SGbT+Xb8wGGvzilttZL1mc5sQ/5KkcxsZttMIk=
 github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 h1:H2pdYOb3KQ1/YsqVWoWNLQO+fusocsw354rqGTZtAgw=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
@@ -74,12 +57,8 @@ github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/go-critic/go-critic v0.3.5-0.20190904082202-d79a9f0c64db h1:GYXWx7Vr3+zv833u+8IoXbNnQY0AdXsxAgI0kX7xcwA=
 github.com/go-critic/go-critic v0.3.5-0.20190904082202-d79a9f0c64db/go.mod h1:+sE8vrLDS2M0pZkBk0wy6+nLdKexVDrl/jBqQOTDThA=
-github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
-github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-lintpack/lintpack v0.5.2 h1:DI5mA3+eKdWeJ40nU4d6Wc26qmdG8RCi/btYq0TuRN0=
 github.com/go-lintpack/lintpack v0.5.2/go.mod h1:NwZuYi2nUHho8XEIZ6SIxihrnPoqBTDqfpXvXAN0sXM=
@@ -87,55 +66,20 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
-github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
-github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
-github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
-github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
-github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU=
-github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
-github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
-github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
 github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
-github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
-github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
-github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
-github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
-github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
-github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
-github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
-github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk=
-github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
-github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
-github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4=
 github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
-github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
-github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
-github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
-github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
-github.com/go-openapi/spec v0.19.5 h1:Xm0Ao53uqnk9QE/LlYV5DEU09UAgpliA85QoT9LzqPw=
-github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
-github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
-github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
-github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
-github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
-github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk=
+github.com/go-openapi/spec v0.19.4 h1:ixzUSnHTd6hCemgtAJgluaTSGYpLNpJY4mA2DIkdOAo=
+github.com/go-openapi/spec v0.19.4/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
 github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
-github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
-github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
-github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
-github.com/go-openapi/validate v0.19.8/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g=
 github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4=
@@ -166,6 +110,7 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -219,7 +164,6 @@ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OI
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
-github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d h1:7XGaL1e6bYS1yIonGp9761ExpPPV1ui0SAC59Yube9k=
@@ -232,14 +176,7 @@ github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:Fecb
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/hashicorp/go-cleanhttp v0.5.0 h1:wvCrVc9TjDls6+YGAF2hAifE1E5U1+b4tH6KdvN3Gig=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
-github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I=
-github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0=
-github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
@@ -277,12 +214,9 @@ github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQ
 github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
-github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb h1:RHba4YImhrUVQDHUCe2BNSOz4tVy2yGyXhvYDvxGgeE=
 github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s=
 github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
@@ -291,12 +225,9 @@ github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk=
-github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -306,7 +237,6 @@ github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -321,8 +251,6 @@ github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/paulmach/orb v0.1.3/go.mod h1:VFlX/8C+IQ1p6FTRRKzKoOPJnvEtA5G0Veuqwbu//Vk=
-github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
@@ -341,25 +269,18 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d h1:K6eOUihrFLdZjZnA4XlRp864fmWXv9YTIk7VPLhRacA=
-github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod h1:7DPO4domFU579Ga6E61sB9VFNaniPVwJP5C4bBCu3wA=
 github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/securego/gosec v0.0.0-20191002120514-e680875ea14d h1:BzRvVq1EHuIjxpijCEKpAxzKUUMurOQ4sknehIATRh8=
 github.com/securego/gosec v0.0.0-20191002120514-e680875ea14d/go.mod h1:w5+eXa0mYznDkHaMCXA4XYffjlH+cy1oyKbfzJXa2Do=
-github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc=
 github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
 github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e h1:MZM7FHLqUHYI0Y/mQAt3d2aYa0SiNms/hFqC9qJYolM=
 github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
 github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041 h1:llrF3Fs4018ePo4+G/HV/uQUqEI1HMDjCeOf2V6puPc=
 github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
@@ -372,9 +293,8 @@ github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
-github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8=
-github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
 github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -390,18 +310,14 @@ github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok=
-github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/ultraware/funlen v0.0.2 h1:Av96YVBwwNSe4MLR7iI/BIa3VyI7/djnto/pK3Uxbdo=
 github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
 github.com/ultraware/whitespace v0.0.4 h1:If7Va4cM03mpgrNH9k49/VOicWpGoG70XPBFFODYDsg=
@@ -412,21 +328,10 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC
 github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s=
 github.com/valyala/quicktemplate v1.2.0/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4=
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
-github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca h1:1CFlNzQhALwjS9mBAUkycX616GzgsuYUOCHA5+HSlXI=
-github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yujunz/go-getter v1.4.1-lite h1:FhvNc94AXMZkfqUwfMKhnQEC9phkphSGdPTL7tIdhOM=
-github.com/yujunz/go-getter v1.4.1-lite/go.mod h1:sbmqxXjyLunH1PkF3n7zSlnVeMvmYUuIl9ZVs/7NyCc=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.starlark.net v0.0.0-20190528202925-30ae18b8564f/go.mod h1:c1/X6cHgvdXj6pUlmWKMkuqRnW4K8x2vwt6JAaaircg=
-go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc=
-go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
@@ -434,12 +339,9 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 h1:ACG4HJsFiNMf47Y4PeRoebLNy/2lXT9EtprMuTFWt1M=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -448,18 +350,15 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -470,7 +369,6 @@ golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ym
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -487,21 +385,18 @@ golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190922100055-0a153f010e69 h1:rOhMmluY6kLMhdnrivzec6lLgaVbMHMn2ISQXJeJ5EM=
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c h1:Vco5b+cuG5NNfORVxZy6bYZQ7rsigisU1WQFkvQ0L5E=
-golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -511,15 +406,14 @@ golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190521203540-521d6ed310dd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59 h1:QjA/9ArTfVTLfEhClDCG7SGrZkZixxWpwNCDiwJfh88=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -552,13 +446,8 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 h1:Xe2gvTZUJpsvOWUnvmL/tmhVBZUmHSvLbMjRj6NUUKo=
-gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
@@ -576,7 +465,6 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLyy7rfbeuf1PYyBf973pgyU=
 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
-k8s.io/utils v0.0.0-20191114184206-e782cd3c129f h1:GiPwtSzdP43eI1hpPCbROQCCIgCuiMMNF8YUVLF3vJo=
 k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
@@ -585,8 +473,7 @@ mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jC
 mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f h1:Cq7MalBHYACRd6EesksG1Q8EoIAKOsiZviGKbOLIej4=
 mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
-sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4 h1:JPJh2pk3+X4lXAkZIk2RuE/7/FoK9maXw+TNPJhVS/c=
 sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=

api/hasher/hasher.go

@@ -8,8 +8,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"sort"
-
-	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
 // SortArrayAndComputeHash sorts a string array and
@@ -52,105 +50,3 @@ func Encode(hex string) (string, error) {
 func Hash(data string) string {
 	return fmt.Sprintf("%x", sha256.Sum256([]byte(data)))
 }
-
-// HashRNode returns the hash value of input RNode
-func HashRNode(node *yaml.RNode) (string, error) {
-	// get node kind
-	kindNode, err := node.Pipe(yaml.FieldMatcher{Name: "kind"})
-	if err != nil {
-		return "", err
-	}
-	kind := kindNode.YNode().Value
-
-	// calculate hash for different kinds
-	encoded := ""
-	switch kind {
-	case "ConfigMap":
-		encoded, err = encodeConfigMap(node)
-	case "Secret":
-		encoded, err = encodeSecret(node)
-	default:
-		var encodedBytes []byte
-		encodedBytes, err = json.Marshal(node.YNode())
-		encoded = string(encodedBytes)
-	}
-	if err != nil {
-		return "", err
-	}
-	return Encode(Hash(encoded))
-}
-
-func getNodeValues(node *yaml.RNode, paths []string) (map[string]interface{}, error) {
-	values := make(map[string]interface{})
-	for _, p := range paths {
-		vn, err := node.Pipe(yaml.Lookup(p))
-		if err != nil {
-			return map[string]interface{}{}, err
-		}
-		if vn == nil {
-			values[p] = ""
-			continue
-		}
-		if vn.YNode().Kind != yaml.ScalarNode {
-			vs, err := vn.MarshalJSON()
-			if err != nil {
-				return map[string]interface{}{}, err
-			}
-			// data, binaryData and stringData are all maps
-			var v map[string]interface{}
-			json.Unmarshal(vs, &v)
-			values[p] = v
-		} else {
-			values[p] = vn.YNode().Value
-		}
-	}
-	return values, nil
-}
-
-// encodeConfigMap encodes a ConfigMap.
-// Data, Kind, and Name are taken into account.
-// BinaryData is included if it's not empty to avoid useless key in output.
-func encodeConfigMap(node *yaml.RNode) (string, error) {
-	// get fields
-	paths := []string{"metadata/name", "data", "binaryData"}
-	values, err := getNodeValues(node, paths)
-	if err != nil {
-		return "", err
-	}
-	m := map[string]interface{}{"kind": "ConfigMap", "name": values["metadata/name"],
-		"data": values["data"]}
-	if _, ok := values["binaryData"].(map[string]interface{}); ok {
-		m["binaryData"] = values["binaryData"]
-	}
-
-	// json.Marshal sorts the keys in a stable order in the encoding
-	data, err := json.Marshal(m)
-	if err != nil {
-		return "", err
-	}
-	return string(data), nil
-}
-
-// encodeSecret encodes a Secret.
-// Data, Kind, Name, and Type are taken into account.
-// StringData is included if it's not empty to avoid useless key in output.
-func encodeSecret(node *yaml.RNode) (string, error) {
-	// get fields
-	paths := []string{"type", "metadata/name", "data", "stringData"}
-	values, err := getNodeValues(node, paths)
-	if err != nil {
-		return "", err
-	}
-	m := map[string]interface{}{"kind": "Secret", "type": values["type"],
-		"name": values["metadata/name"], "data": values["data"]}
-	if _, ok := values["stringData"].(map[string]interface{}); ok {
-		m["stringData"] = values["stringData"]
-	}
-
-	// json.Marshal sorts the keys in a stable order in the encoding
-	data, err := json.Marshal(m)
-	if err != nil {
-		return "", err
-	}
-	return string(data), nil
-}

api/hasher/hasher_test.go

@@ -1,13 +1,12 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package hasher
+package hasher_test
 
 import (
-	"strings"
 	"testing"
 
-	"sigs.k8s.io/kustomize/kyaml/yaml"
+	. "sigs.k8s.io/kustomize/api/hasher"
 )
 
 func TestSortArrayAndComputeHash(t *testing.T) {
@@ -40,314 +39,3 @@ func TestHash(t *testing.T) {
 		t.Errorf("expected hash %q but got %q", expect, sum)
 	}
 }
-
-func TestConfigMapHash(t *testing.T) {
-	cases := []struct {
-		desc   string
-		cmYaml string
-		hash   string
-		err    string
-	}{
-		// empty map
-		{"empty data", `
-apiVersion: v1
-kind: ConfigMap`, "6ct58987ht", ""},
-		// one key
-		{"one key", `
-apiVersion: v1
-kind: ConfigMap
-data: 
-  one: ""`, "9g67k2htb6", ""},
-		// three keys (tests sorting order)
-		{"three keys", `
-apiVersion: v1
-kind: ConfigMap
-data:
-  two: 2
-  one: ""
-  three: 3`, "7757f9kkct", ""},
-		// empty binary data map
-		{"empty binary data", `
-apiVersion: v1
-kind: ConfigMap`, "6ct58987ht", ""},
-		// one key with binary data
-		{"one key with binary data", `
-apiVersion: v1
-kind: ConfigMap
-binaryData:
-  one: ""`, "6mtk2m274t", ""},
-		// three keys with binary data (tests sorting order)
-		{"three keys with binary data", `
-apiVersion: v1
-kind: ConfigMap
-binaryData:
-  two: 2
-  one: ""
-  three: 3`, "9th7kc28dg", ""},
-		// two keys, one with string and another with binary data
-		{"two keys with one each", `
-apiVersion: v1
-kind: ConfigMap
-data:
-  one: ""
-binaryData:
-  two: ""`, "698h7c7t9m", ""},
-	}
-
-	for _, c := range cases {
-		node, err := yaml.Parse(c.cmYaml)
-		if err != nil {
-			t.Fatal(err)
-		}
-		h, err := HashRNode(node)
-		if SkipRest(t, c.desc, err, c.err) {
-			continue
-		}
-		if c.hash != h {
-			t.Errorf("case %q, expect hash %q but got %q", c.desc, c.hash, h)
-		}
-	}
-}
-
-func TestSecretHash(t *testing.T) {
-	cases := []struct {
-		desc       string
-		secretYaml string
-		hash       string
-		err        string
-	}{
-		// empty map
-		{"empty data", `
-apiVersion: v1
-kind: Secret
-type: my-type`, "5gmgkf8578", ""},
-		// one key
-		{"one key", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  one: ""`, "74bd68bm66", ""},
-		// three keys (tests sorting order)
-		{"three keys", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  two: 2
-  one: ""
-  three: 3`, "4gf75c7476", ""},
-		// with stringdata
-		{"stringdata", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  one: ""
-stringData:
-  two: 2`, "c4h4264gdb", ""},
-		// empty stringdata
-		{"empty stringdata", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  one: ""`, "74bd68bm66", ""},
-	}
-
-	for _, c := range cases {
-		node, err := yaml.Parse(c.secretYaml)
-		if err != nil {
-			t.Fatal(err)
-		}
-		h, err := HashRNode(node)
-		if SkipRest(t, c.desc, err, c.err) {
-			continue
-		}
-		if c.hash != h {
-			t.Errorf("case %q, expect hash %q but got %q", c.desc, c.hash, h)
-		}
-	}
-}
-
-func TestUnstructuredHash(t *testing.T) {
-	cases := []struct {
-		desc         string
-		unstructured string
-		hash         string
-		err          string
-	}{
-		{"minimal", `
-apiVersion: test/v1
-kind: TestResource
-metadata:
-  name: my-resource`, "244782mkb7", ""},
-		{"with spec", `
-apiVersion: test/v1
-kind: TestResource
-metadata:
-  name: my-resource
-spec:
-  foo: 1
-  bar: abc`, "59m2mdccg4", ""},
-	}
-
-	for _, c := range cases {
-		node, err := yaml.Parse(c.unstructured)
-		if err != nil {
-			t.Fatal(err)
-		}
-		h, err := HashRNode(node)
-		if SkipRest(t, c.desc, err, c.err) {
-			continue
-		}
-		if c.hash != h {
-			t.Errorf("case %q, expect hash %q but got %q", c.desc, c.hash, h)
-		}
-	}
-}
-
-func TestEncodeConfigMap(t *testing.T) {
-	cases := []struct {
-		desc   string
-		cmYaml string
-		expect string
-		err    string
-	}{
-		// empty map
-		{"empty data", `
-apiVersion: v1
-kind: ConfigMap`, `{"data":"","kind":"ConfigMap","name":""}`, ""},
-		// one key
-		{"one key", `
-apiVersion: v1
-kind: ConfigMap
-data: 
-  one: ""`, `{"data":{"one":""},"kind":"ConfigMap","name":""}`, ""},
-		// three keys (tests sorting order)
-		{"three keys", `
-apiVersion: v1
-kind: ConfigMap
-data:
-  two: 2
-  one: ""
-  three: 3`, `{"data":{"one":"","three":3,"two":2},"kind":"ConfigMap","name":""}`, ""},
-		// empty binary map
-		{"empty data", `
-apiVersion: v1
-kind: ConfigMap`, `{"data":"","kind":"ConfigMap","name":""}`, ""},
-		// one key with binary data
-		{"one key", `
-apiVersion: v1
-kind: ConfigMap
-binaryData:
-  one: ""`, `{"binaryData":{"one":""},"data":"","kind":"ConfigMap","name":""}`, ""},
-		// three keys with binary data (tests sorting order)
-		{"three keys", `
-apiVersion: v1
-kind: ConfigMap
-binaryData:
-  two: 2
-  one: ""
-  three: 3`, `{"binaryData":{"one":"","three":3,"two":2},"data":"","kind":"ConfigMap","name":""}`, ""},
-		// two keys, one string and one binary values
-		{"two keys with one each", `
-apiVersion: v1
-kind: ConfigMap
-data:
-  one: ""
-binaryData:
-  two: ""`, `{"binaryData":{"two":""},"data":{"one":""},"kind":"ConfigMap","name":""}`, ""},
-	}
-	for _, c := range cases {
-		node, err := yaml.Parse(c.cmYaml)
-		if err != nil {
-			t.Fatal(err)
-		}
-		s, err := encodeConfigMap(node)
-		if SkipRest(t, c.desc, err, c.err) {
-			continue
-		}
-		if s != c.expect {
-			t.Errorf("case %q, expect %q but got %q from encode %#v", c.desc, c.expect, s, c.cmYaml)
-		}
-	}
-}
-
-func TestEncodeSecret(t *testing.T) {
-	cases := []struct {
-		desc       string
-		secretYaml string
-		expect     string
-		err        string
-	}{
-		// empty map
-		{"empty data", `
-apiVersion: v1
-kind: Secret
-type: my-type`, `{"data":"","kind":"Secret","name":"","type":"my-type"}`, ""},
-		// one key
-		{"one key", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  one: ""`, `{"data":{"one":""},"kind":"Secret","name":"","type":"my-type"}`, ""},
-		// three keys (tests sorting order) - note json.Marshal base64 encodes the values because they come in as []byte
-		{"three keys", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  two: 2
-  one: ""
-  three: 3`, `{"data":{"one":"","three":3,"two":2},"kind":"Secret","name":"","type":"my-type"}`, ""},
-		// with stringdata
-		{"stringdata", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  one: ""
-stringData:
-  two: 2`, `{"data":{"one":""},"kind":"Secret","name":"","stringData":{"two":2},"type":"my-type"}`, ""},
-		// empty stringdata
-		{"empty stringdata", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  one: ""`, `{"data":{"one":""},"kind":"Secret","name":"","type":"my-type"}`, ""},
-	}
-	for _, c := range cases {
-		node, err := yaml.Parse(c.secretYaml)
-		if err != nil {
-			t.Fatal(err)
-		}
-		s, err := encodeSecret(node)
-		if SkipRest(t, c.desc, err, c.err) {
-			continue
-		}
-		if s != c.expect {
-			t.Errorf("case %q, expect %q but got %q from encode %#v", c.desc, c.expect, s, c.secretYaml)
-		}
-	}
-}
-
-// SkipRest returns true if there was a non-nil error or if we expected an error that didn't happen,
-// and logs the appropriate error on the test object.
-// The return value indicates whether we should skip the rest of the test case due to the error result.
-func SkipRest(t *testing.T, desc string, err error, contains string) bool {
-	if err != nil {
-		if len(contains) == 0 {
-			t.Errorf("case %q, expect nil error but got %q", desc, err.Error())
-		} else if !strings.Contains(err.Error(), contains) {
-			t.Errorf("case %q, expect error to contain %q but got %q", desc, contains, err.Error())
-		}
-		return true
-	} else if len(contains) > 0 {
-		t.Errorf("case %q, expect error to contain %q but got nil error", desc, contains)
-		return true
-	}
-	return false
-}

api/ifc/ifc.go

@@ -38,69 +38,36 @@ type Loader interface {
 	Cleanup() error
 }
 
-// Kunstructured represents a Kubernetes Resource Model object.
+// Kunstructured allows manipulation of k8s objects
+// that do not have Golang structs.
 type Kunstructured interface {
-	// Several uses.
-	Copy() Kunstructured
-
-	// Used by Resource.Replace, which in turn is used in many places, e.g.
-	//  - resource.Resource.Merge
-	//  - resWrangler.appendReplaceOrMerge (AbsorbAll)
-	//  - api.internal.k8sdeps.transformer.patch.conflictdetector
-	GetAnnotations() map[string]string
-
-	// Used by ResAccumulator and ReplacementTransformer.
-	GetFieldValue(string) (interface{}, error)
-
-	// Used by Resource.OrgId
-	GetGvk() resid.Gvk
-
-	// Used by resource.Factory.SliceFromBytes
-	GetKind() string
-
-	// Used by Resource.Replace
-	GetLabels() map[string]string
-
-	// Used by Resource.CurId and resource factory.
-	GetName() string
-
-	// Used by special case code in
-	// ResMap.SubsetThatCouldBeReferencedByResource
-	GetSlice(path string) ([]interface{}, error)
-
-	// GetString returns the value of a string field.
-	// Used by Resource.GetNamespace
-	GetString(string) (string, error)
-
-	// Several uses.
 	Map() map[string]interface{}
-
-	// Used by Resource.AsYAML and Resource.String
+	SetMap(map[string]interface{})
+	Copy() Kunstructured
+	GetFieldValue(string) (interface{}, error)
+	GetString(string) (string, error)
+	GetStringSlice(string) ([]string, error)
+	GetBool(path string) (bool, error)
+	GetFloat64(path string) (float64, error)
+	GetInt64(path string) (int64, error)
+	GetSlice(path string) ([]interface{}, error)
+	GetStringMap(path string) (map[string]string, error)
+	GetMap(path string) (map[string]interface{}, error)
 	MarshalJSON() ([]byte, error)
-
-	// Used by resWrangler.Select
-	MatchesAnnotationSelector(selector string) (bool, error)
-
-	// Used by resWrangler.Select
-	MatchesLabelSelector(selector string) (bool, error)
-
-	// Used by Resource.Replace.
-	SetAnnotations(map[string]string)
-
-	// Used by PatchStrategicMergeTransformer.
-	SetGvk(resid.Gvk)
-
-	// Used by Resource.Replace and used to remove "validated by" labels.
-	SetLabels(map[string]string)
-
-	// Used by Resource.Replace.
-	SetName(string)
-
-	// Used by Resource.Replace.
-	SetNamespace(string)
-
-	// Needed, for now, by kyaml/filtersutil.ApplyToJSON.
 	UnmarshalJSON([]byte) error
+	GetGvk() resid.Gvk
+	SetGvk(resid.Gvk)
+	GetKind() string
+	GetName() string
+	SetName(string)
+	SetNamespace(string)
+	GetLabels() map[string]string
+	SetLabels(map[string]string)
+	GetAnnotations() map[string]string
+	SetAnnotations(map[string]string)
+	MatchesLabelSelector(selector string) (bool, error)
+	MatchesAnnotationSelector(selector string) (bool, error)
+	Patch(Kunstructured) error
 }
 
 // KunstructuredFactory makes instances of Kunstructured.
@@ -108,8 +75,14 @@ type KunstructuredFactory interface {
 	SliceFromBytes([]byte) ([]Kunstructured, error)
 	FromMap(m map[string]interface{}) Kunstructured
 	Hasher() KunstructuredHasher
-	MakeConfigMap(kvLdr KvLoader, args *types.ConfigMapArgs) (Kunstructured, error)
-	MakeSecret(kvLdr KvLoader, args *types.SecretArgs) (Kunstructured, error)
+	MakeConfigMap(
+		kvLdr KvLoader,
+		options *types.GeneratorOptions,
+		args *types.ConfigMapArgs) (Kunstructured, error)
+	MakeSecret(
+		kvLdr KvLoader,
+		options *types.GeneratorOptions,
+		args *types.SecretArgs) (Kunstructured, error)
 }
 
 // KunstructuredHasher returns a hash of the argument

api/image/image.go

@@ -1,50 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package image
-
-import (
-	"regexp"
-	"strings"
-)
-
-// IsImageMatched returns true if the value of t is identical to the
-// image name in the full image name and tag as given by s.
-func IsImageMatched(s, t string) bool {
-	// Tag values are limited to [a-zA-Z0-9_.{}-].
-	// Some tools like Bazel rules_k8s allow tag patterns with {} characters.
-	// More info: https://github.com/bazelbuild/rules_k8s/pull/423
-	pattern, _ := regexp.Compile("^" + t + "(@sha256)?(:[a-zA-Z0-9_.{}-]*)?$")
-	return pattern.MatchString(s)
-}
-
-// Split separates and returns the name and tag parts
-// from the image string using either colon `:` or at `@` separators.
-// Note that the returned tag keeps its separator.
-func Split(imageName string) (name string, tag string) {
-	// check if image name contains a domain
-	// if domain is present, ignore domain and check for `:`
-	ic := -1
-	if slashIndex := strings.Index(imageName, "/"); slashIndex < 0 {
-		ic = strings.LastIndex(imageName, ":")
-	} else {
-		lastIc := strings.LastIndex(imageName[slashIndex:], ":")
-		// set ic only if `:` is present
-		if lastIc > 0 {
-			ic = slashIndex + lastIc
-		}
-	}
-	ia := strings.LastIndex(imageName, "@")
-	if ic < 0 && ia < 0 {
-		return imageName, ""
-	}
-
-	i := ic
-	if ia > 0 {
-		i = ia
-	}
-
-	name = imageName[:i]
-	tag = imageName[i:]
-	return
-}

api/image/image_test.go

@@ -1,80 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package image
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestIsImageMatched(t *testing.T) {
-	testCases := []struct {
-		testName  string
-		value     string
-		name      string
-		isMatched bool
-	}{
-		{
-			testName:  "identical",
-			value:     "nginx",
-			name:      "nginx",
-			isMatched: true,
-		},
-		{
-			testName:  "name is match",
-			value:     "nginx:12345",
-			name:      "nginx",
-			isMatched: true,
-		},
-		{
-			testName:  "name is not a match",
-			value:     "apache:12345",
-			name:      "nginx",
-			isMatched: false,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.testName, func(t *testing.T) {
-			assert.Equal(t, tc.isMatched, IsImageMatched(tc.value, tc.name))
-		})
-	}
-}
-
-func TestSplit(t *testing.T) {
-	testCases := []struct {
-		testName string
-		value    string
-		name     string
-		tag      string
-	}{
-		{
-			testName: "no tag",
-			value:    "nginx",
-			name:     "nginx",
-			tag:      "",
-		},
-		{
-			testName: "with tag",
-			value:    "nginx:1.2.3",
-			name:     "nginx",
-			tag:      ":1.2.3",
-		},
-		{
-			testName: "with digest",
-			value:    "nginx@12345",
-			name:     "nginx",
-			tag:      "@12345",
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.testName, func(t *testing.T) {
-			name, tag := Split(tc.value)
-			assert.Equal(t, tc.name, name)
-			assert.Equal(t, tc.tag, tag)
-		})
-	}
-}

api/internal/accumulator/namereferencetransformer.go

@@ -4,12 +4,14 @@
 package accumulator
 
 import (
+	"fmt"
 	"log"
 
-	"sigs.k8s.io/kustomize/api/filters/nameref"
 	"sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig"
+	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
+	"sigs.k8s.io/kustomize/api/resource"
+	"sigs.k8s.io/kustomize/api/transform"
 )
 
 type nameReferenceTransformer struct {
@@ -84,12 +86,16 @@ func (o *nameReferenceTransformer) Transform(m resmap.ResMap) error {
 					if candidates == nil {
 						candidates = m.SubsetThatCouldBeReferencedByResource(referrer)
 					}
-					err := filtersutil.ApplyToJSON(nameref.Filter{
-						FieldSpec:          fSpec,
-						Referrer:           referrer,
-						Target:             target.Gvk,
-						ReferralCandidates: candidates,
-					}, referrer)
+					err := transform.MutateField(
+						referrer.Map(),
+						fSpec.PathSlice(),
+						fSpec.CreateIfNotPresent,
+						o.getNewNameFunc(
+							// referrer could be an HPA instance,
+							// target could be Gvk for Deployment,
+							// candidate a list of resources "reachable"
+							// from the HPA.
+							referrer, target.Gvk, candidates))
 					if err != nil {
 						return err
 					}
@@ -99,3 +105,165 @@ func (o *nameReferenceTransformer) Transform(m resmap.ResMap) error {
 	}
 	return nil
 }
+
+// selectReferral picks the referral among a subset of candidates.
+// It returns the current name and namespace of the selected candidate.
+// Note that the content of the referricalCandidateSubset slice is most of the time
+// identical to the referralCandidates resmap. Still in some cases, such
+// as ClusterRoleBinding, the subset only contains the resources of a specific
+// namespace.
+func (o *nameReferenceTransformer) selectReferral(
+	oldName string,
+	referrer *resource.Resource,
+	target resid.Gvk,
+	referralCandidates resmap.ResMap,
+	referralCandidateSubset []*resource.Resource) (interface{}, interface{}, error) {
+
+	for _, res := range referralCandidateSubset {
+		id := res.OrgId()
+		if id.IsSelected(&target) && res.GetOriginalName() == oldName {
+			matches := referralCandidates.GetMatchingResourcesByOriginalId(id.Equals)
+			// If there's more than one match, there's no way
+			// to know which one to pick, so emit error.
+			if len(matches) > 1 {
+				return nil, nil, fmt.Errorf(
+					"multiple matches for %s:\n  %v",
+					id, getIds(matches))
+			}
+			// In the resource, note that it is referenced
+			// by the referrer.
+			res.AppendRefBy(referrer.CurId())
+			// Return transformed name of the object,
+			// complete with prefixes, hashes, etc.
+			return res.GetName(), res.GetNamespace(), nil
+		}
+	}
+
+	return oldName, nil, nil
+}
+
+// utility function to replace a simple string by the new name
+func (o *nameReferenceTransformer) getSimpleNameField(
+	oldName string,
+	referrer *resource.Resource,
+	target resid.Gvk,
+	referralCandidates resmap.ResMap,
+	referralCandidateSubset []*resource.Resource) (interface{}, error) {
+
+	newName, _, err := o.selectReferral(oldName, referrer, target,
+		referralCandidates, referralCandidateSubset)
+
+	return newName, err
+}
+
+// utility function to replace name field within a map[string]interface{}
+// and leverage the namespace field.
+func (o *nameReferenceTransformer) getNameAndNsStruct(
+	inMap map[string]interface{},
+	referrer *resource.Resource,
+	target resid.Gvk,
+	referralCandidates resmap.ResMap) (interface{}, error) {
+
+	// Example:
+	if _, ok := inMap["name"]; !ok {
+		return nil, fmt.Errorf(
+			"%#v is expected to contain a name field", inMap)
+	}
+	oldName, ok := inMap["name"].(string)
+	if !ok {
+		return nil, fmt.Errorf(
+			"%#v is expected to contain a name field of type string", oldName)
+	}
+
+	subset := referralCandidates.Resources()
+	if namespacevalue, ok := inMap["namespace"]; ok {
+		namespace := namespacevalue.(string)
+		bynamespace := referralCandidates.GroupedByOriginalNamespace()
+		if _, ok := bynamespace[namespace]; !ok {
+			return inMap, nil
+		}
+		subset = bynamespace[namespace]
+	}
+
+	newname, newnamespace, err := o.selectReferral(oldName, referrer, target,
+		referralCandidates, subset)
+	if err != nil {
+		return nil, err
+	}
+
+	if (newname == oldName) && (newnamespace == nil) {
+		// no candidate found.
+		return inMap, nil
+	}
+
+	inMap["name"] = newname
+	if newnamespace != "" {
+		// We don't want value "" to replace value "default" since
+		// the empty string is handled as a wild card here not default namespace
+		// by kubernetes.
+		inMap["namespace"] = newnamespace
+	}
+	return inMap, nil
+
+}
+
+func (o *nameReferenceTransformer) getNewNameFunc(
+	referrer *resource.Resource,
+	target resid.Gvk,
+	referralCandidates resmap.ResMap) func(in interface{}) (interface{}, error) {
+	return func(in interface{}) (interface{}, error) {
+		switch thing := in.(type) {
+		case string:
+			return o.getSimpleNameField(thing, referrer, target,
+				referralCandidates, referralCandidates.Resources())
+		case map[string]interface{}:
+			// Kind: ValidatingWebhookConfiguration
+			// FieldSpec is webhooks/clientConfig/service
+			return o.getNameAndNsStruct(thing, referrer, target,
+				referralCandidates)
+		case []interface{}:
+			for idx, item := range thing {
+				switch value := item.(type) {
+				case string:
+					// Kind: Role/ClusterRole
+					// FieldSpec is rules.resourceNames
+					newName, err := o.getSimpleNameField(value, referrer, target,
+						referralCandidates, referralCandidates.Resources())
+					if err != nil {
+						return nil, err
+					}
+					thing[idx] = newName
+				case map[string]interface{}:
+					// Kind: RoleBinding/ClusterRoleBinding
+					// FieldSpec is subjects
+					// Note: The corresponding fieldSpec had been changed from
+					// from path: subjects/name to just path: subjects. This is
+					// what get mutatefield to request the mapping of the whole
+					// map containing namespace and name instead of just a simple
+					// string field containing the name
+					newMap, err := o.getNameAndNsStruct(value, referrer, target,
+						referralCandidates)
+					if err != nil {
+						return nil, err
+					}
+					thing[idx] = newMap
+				default:
+					return nil, fmt.Errorf(
+						"%#v is expected to be either a []string or a []map[string]interface{}", in)
+				}
+			}
+			return in, nil
+		default:
+			return nil, fmt.Errorf(
+				"%#v is expected to be either a string or a []interface{}", in)
+		}
+	}
+}
+
+func getIds(rs []*resource.Resource) []string {
+	var result []string
+	for _, r := range rs {
+		result = append(result, r.CurId().String()+"\n")
+	}
+	return result
+}

api/internal/accumulator/namereferencetransformer_test.go

@@ -520,7 +520,7 @@ func TestNameReferenceUnhappyRun(t *testing.T) {
 						},
 					},
 				}).ResMap(),
-			expectedErr: "cannot find field 'name' in node"},
+			expectedErr: "is expected to contain a name field"},
 	}
 
 	nrt := newNameReferenceTransformer(builtinconfig.MakeDefaultConfig().NameReference)

api/internal/accumulator/refvartransformer.go

@@ -4,12 +4,13 @@
 package accumulator
 
 import (
+	"fmt"
+
 	expansion2 "sigs.k8s.io/kustomize/api/internal/accumulator/expansion"
 
-	"sigs.k8s.io/kustomize/api/filters/refvar"
 	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/transform"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
 )
 
 type refVarTransformer struct {
@@ -30,6 +31,55 @@ func newRefVarTransformer(
 	}
 }
 
+// replaceVars accepts as 'in' a string, or string array, which can have
+// embedded instances of $VAR style variables, e.g. a container command string.
+// The function returns the string with the variables expanded to their final
+// values.
+func (rv *refVarTransformer) replaceVars(in interface{}) (interface{}, error) {
+	switch vt := in.(type) {
+	case []interface{}:
+		var xs []interface{}
+		for _, a := range in.([]interface{}) {
+			xs = append(xs, expansion2.Expand(a.(string), rv.mappingFunc))
+		}
+		return xs, nil
+	case map[string]interface{}:
+		inMap := in.(map[string]interface{})
+		xs := make(map[string]interface{}, len(inMap))
+		for k, v := range inMap {
+			s, ok := v.(string)
+			if !ok {
+				// This field not contain a $(VAR) since it is not
+				// of string type. For instance .spec.replicas: 3 in
+				// a Deployment object
+				xs[k] = v
+			} else {
+				// This field can potentially contains a $(VAR) since it is
+				// of string type. For instance .spec.replicas: $(REPLICAS)
+				// in a Deployment object
+				xs[k] = expansion2.Expand(s, rv.mappingFunc)
+			}
+		}
+		return xs, nil
+	case interface{}:
+		s, ok := in.(string)
+		if !ok {
+			// This field not contain a $(VAR) since it is not of string type.
+			return in, nil
+		}
+		// This field can potentially contain a $(VAR) since it is
+		// of string type.
+		return expansion2.Expand(s, rv.mappingFunc), nil
+	// staticcheck erroneously claims that `case nil`
+	// is unreachable here, so suppressing it.
+	//nolint:staticcheck
+	case nil:
+		return nil, nil
+	default:
+		return "", fmt.Errorf("invalid type encountered %T", vt)
+	}
+}
+
 // UnusedVars returns slice of Var names that were unused
 // after a Transform run.
 func (rv *refVarTransformer) UnusedVars() []string {
@@ -50,12 +100,12 @@ func (rv *refVarTransformer) Transform(m resmap.ResMap) error {
 		rv.replacementCounts, rv.varMap)
 	for _, res := range m.Resources() {
 		for _, fieldSpec := range rv.fieldSpecs {
-			err := filtersutil.ApplyToJSON(refvar.Filter{
-				MappingFunc: rv.mappingFunc,
-				FieldSpec:   fieldSpec,
-			}, res)
-			if err != nil {
-				return err
+			if res.OrgId().IsSelected(&fieldSpec.Gvk) {
+				if err := transform.MutateField(
+					res.Map(), fieldSpec.PathSlice(),
+					false, rv.replaceVars); err != nil {
+					return err
+				}
 			}
 		}
 	}

api/internal/accumulator/refvartransformer_test.go

@@ -29,7 +29,6 @@ func TestRefVarTransformer(t *testing.T) {
 		description string
 		given       given
 		expected    expected
-		errMessage  string
 	}{
 		{
 			description: "var replacement in map[string]",
@@ -44,6 +43,7 @@ func TestRefVarTransformer(t *testing.T) {
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/map"},
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/slice"},
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/interface"},
+					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/nil"},
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/num"},
 				},
 				res: resmaptest_test.NewRmBuilder(
@@ -62,7 +62,7 @@ func TestRefVarTransformer(t *testing.T) {
 								"item4": "$(BAZ)+$(BAZ)",
 								"item5": "$(BOO)",
 								"item6": "if $(BOO)",
-								"item7": int64(2019),
+								"item7": 2019,
 							},
 							"slice": []interface{}{
 								"$(FOO)",
@@ -73,7 +73,8 @@ func TestRefVarTransformer(t *testing.T) {
 								"if $(BOO)",
 							},
 							"interface": "$(FOO)",
-							"num":       int64(2019),
+							"nil":       nil,
+							"num":       2019,
 						}}).ResMap(),
 			},
 			expected: expected{
@@ -93,7 +94,7 @@ func TestRefVarTransformer(t *testing.T) {
 								"item4": "5+5",
 								"item5": true,
 								"item6": "if true",
-								"item7": int64(2019),
+								"item7": 2019,
 							},
 							"slice": []interface{}{
 								"replacementForFoo",
@@ -104,54 +105,12 @@ func TestRefVarTransformer(t *testing.T) {
 								"if true",
 							},
 							"interface": "replacementForFoo",
-							"num":       int64(2019),
+							"nil":       nil,
+							"num":       2019,
 						}}).ResMap(),
 				unused: []string{"BAR"},
 			},
 		},
-		{
-			description: "var replacement panic in map[string]",
-			given: given{
-				varMap: map[string]interface{}{},
-				fs: []types.FieldSpec{
-					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/slice"},
-				},
-				res: resmaptest_test.NewRmBuilder(
-					t, resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())).
-					Add(map[string]interface{}{
-						"apiVersion": "v1",
-						"kind":       "ConfigMap",
-						"metadata": map[string]interface{}{
-							"name": "cm1",
-						},
-						"data": map[string]interface{}{
-							"slice": []interface{}{5}, // noticeably *not* a []string
-						}}).ResMap(),
-			},
-			errMessage: `obj '{"apiVersion": "v1", "data": {"slice": [5]}, "kind": "ConfigMap", "metadata": {"name": "cm1"}}
-' at path 'data/slice': invalid value type expect a string`,
-		},
-		{
-			description: "var replacement panic in nil",
-			given: given{
-				varMap: map[string]interface{}{},
-				fs: []types.FieldSpec{
-					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/nil"},
-				},
-				res: resmaptest_test.NewRmBuilder(
-					t, resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())).
-					Add(map[string]interface{}{
-						"apiVersion": "v1",
-						"kind":       "ConfigMap",
-						"metadata": map[string]interface{}{
-							"name": "cm1",
-						},
-						"data": map[string]interface{}{
-							"nil": nil, // noticeably *not* a []string
-						}}).ResMap(),
-			},
-			errMessage: `obj '' at path 'data/nil': invalid type encountered 0`,
-		},
 	}
 
 	for _, tc := range testCases {
@@ -163,23 +122,16 @@ func TestRefVarTransformer(t *testing.T) {
 			err := tr.Transform(tc.given.res)
 
 			// assert
-			if tc.errMessage != "" {
-				if err == nil {
-					t.Fatalf("missing expected error %v", tc.errMessage)
-				} else if err.Error() != tc.errMessage {
-					t.Fatalf("actual error doesn't match expected error: \nACTUAL: %v\nEXPECTED: %v", err.Error(), tc.errMessage)
-				}
-			} else {
-				if err != nil {
-					t.Errorf("unexpected error: %v", err)
-				}
-
-				a, e := tc.given.res, tc.expected.res
-				if !reflect.DeepEqual(a, e) {
-					err = e.ErrorIfNotEqualLists(a)
-					t.Fatalf("actual doesn't match expected: \nACTUAL:\n%v\nEXPECTED:\n%v\nERR: %v", a, e, err)
-				}
+			if err != nil {
+				t.Errorf("unexpected error: %v", err)
 			}
+
+			a, e := tc.given.res, tc.expected.res
+			if !reflect.DeepEqual(a, e) {
+				err = e.ErrorIfNotEqualLists(a)
+				t.Fatalf("actual doesn't match expected: \nACTUAL:\n%v\nEXPECTED:\n%v\nERR: %v", a, e, err)
+			}
+
 		})
 	}
 }

api/internal/crawl/README.md

@@ -209,7 +209,7 @@ but they are functional.
 
 ## Technical details
 
-### Overall design and implementations
+### Overall design and imlpementation
 
 There are a few components that are all running together in order to get
 the overall application to work smoothly. This section will provide a brief

api/internal/crawl/backend/search_backend.go

@@ -44,7 +44,7 @@ type kustomizeSearch struct {
 // /register: not implemented, but meant as an endpoint for adding new
 // kustomization files to the corpus.
 func NewKustomizeSearch(ctx context.Context) (*kustomizeSearch, error) {
-	idx, err := index.NewKustomizeIndex(ctx, "kustomize")
+	idx, err := index.NewKustomizeIndex(ctx)
 	if err != nil {
 		return nil, err
 	}

api/internal/crawl/cmd/crawler/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14 AS build
+FROM golang:1.11 AS build
 
 ARG GO111MODULE=on
 

api/internal/crawl/cmd/crawler/crawler.go

@@ -2,15 +2,12 @@ package main
 
 import (
 	"context"
-	"flag"
 	"fmt"
 	"log"
 	"net/http"
 	"os"
 	"time"
 
-	"sigs.k8s.io/kustomize/api/internal/crawl/utils"
-
 	"sigs.k8s.io/kustomize/api/internal/crawl/crawler"
 	"sigs.k8s.io/kustomize/api/internal/crawl/crawler/github"
 	"sigs.k8s.io/kustomize/api/internal/crawl/doc"
@@ -28,7 +25,6 @@ const (
 )
 
 type CrawlMode int
-
 const (
 	CrawlUnknown CrawlMode = iota
 	// Crawl all the kustomization files in all the repositories of a Github user
@@ -49,7 +45,7 @@ func NewCrawlMode(s string) CrawlMode {
 		return CrawlUser
 	case "github-repo":
 		return CrawlRepo
-	case "index+github":
+	case "":
 		return CrawlIndexAndGithub
 	case "index":
 		return CrawlIndex
@@ -60,33 +56,30 @@ func NewCrawlMode(s string) CrawlMode {
 	}
 }
 
-func main() {
-	indexNamePtr := flag.String(
-		"index", "kustomize", "The name of the ElasticSearch index.")
-	modePtr := flag.String("mode", "index+github",
-		`The crawling mode, which can be one of [github-user, github-repo, index, github, index+github].
-  * github-user: crawl all the kustomization files in all the repositories of a Github user (--github-user must be specified for this mode).
-  * github-repo: crawl all the kustomization files in a Github repository (--github-repo must be specified for this mode).
-  * index: crawl all the documents in the index.
-  * gihub: crawl all the kustomization files on Github.
-  * index+github: crawl all the documents in the index and crawling all the kustomization files on Github.`)
-	githubUserPtr := flag.String("github-user", "",
-		"A github user name (e.g., kubernetes-sigs). This flag is required for the `github-user` mode.")
-	githubRepoPtr := flag.String("github-repo", "",
-		"A github repository name (e.g., kubernetes-sigs/kustomize). This flag is required for the `github-repo` mode.")
-	flag.Parse()
+func Usage() {
+	fmt.Printf("Usage: %s [mode] [githubUser|githubRepo]\n", os.Args[0])
+	fmt.Printf("\tmode can be one of [github-user, github-repo, index, github]\n")
+	fmt.Printf("%s: crawl all the documents in the index and crawling all the kustomization files on Github\n", os.Args[0])
+	fmt.Printf("%s index: crawl all the documents in the index\n", os.Args[0])
+	fmt.Printf("%s gihub: crawl all the kustomization files on Github\n", os.Args[0])
+	fmt.Printf("%s github-user <github-user>: Crawl all the kustomization files in all the repositories of a Github user\n", os.Args[0])
+	fmt.Printf("\tFor example, %s github-user kubernetes-sigs\n", os.Args[0])
+	fmt.Printf("%s github-repo <github-repo>: Crawl all the kustomization files in a Github repo\n", os.Args[0])
+	fmt.Printf("\tFor example, %s github-repo kubernetes-sigs/kustomize\n", os.Args[0])
+}
 
+func main() {
 	githubToken := os.Getenv(githubAccessTokenVar)
 	if githubToken == "" {
-		log.Printf("Must set the variable '%s' to make github requests.\n",
+		fmt.Printf("Must set the variable '%s' to make github requests.\n",
 			githubAccessTokenVar)
 		return
 	}
 
 	ctx := context.Background()
-	idx, err := index.NewKustomizeIndex(ctx, *indexNamePtr)
+	idx, err := index.NewKustomizeIndex(ctx)
 	if err != nil {
-		log.Printf("Could not create an index: %v\n", err)
+		fmt.Printf("Could not create an index: %v\n", err)
 		return
 	}
 
@@ -94,7 +87,7 @@ func main() {
 	cache, err := redis.DialURL(cacheURL)
 	clientCache := &http.Client{}
 	if err != nil {
-		log.Printf("Error: redis could not make a connection: %v\n", err)
+		fmt.Printf("Error: redis could not make a connection: %v\n", err)
 	} else {
 		clientCache = httpclient.NewClient(cache)
 	}
@@ -115,10 +108,10 @@ func main() {
 		case *doc.KustomizationDocument:
 			switch mode {
 			case index.Delete:
-				log.Printf("Deleting: %v", d)
+				fmt.Println("Deleting: ", d)
 				return idx.Delete(d.ID())
 			default:
-				log.Printf("Inserting: %v", d)
+				fmt.Println("Inserting: ", d)
 				return idx.Put(d.ID(), d)
 			}
 		default:
@@ -126,15 +119,20 @@ func main() {
 		}
 	}
 
-	// seen tracks the IDs of all the documents in the index and their corresponding file types.
+	// seen tracks the IDs of all the documents in the index.
 	// This helps avoid indexing a given document multiple times.
-	seen := utils.NewSeenMap()
+	seen := make(map[string]struct{})
 
-	mode := NewCrawlMode(*modePtr)
+	var mode CrawlMode
+	if len(os.Args) == 1 {
+		mode = CrawlIndexAndGithub
+	} else {
+		mode = NewCrawlMode(os.Args[1])
+	}
 
 	ghCrawlerConstructor := func(user, repo string) crawler.Crawler {
 		if user != "" {
-			return github.NewCrawler(githubToken, retryCount, clientCache,
+			return 	github.NewCrawler(githubToken, retryCount, clientCache,
 				github.QueryWith(
 					github.Filename("kustomization.yaml"),
 					github.Filename("kustomization.yml"),
@@ -159,48 +157,51 @@ func main() {
 		}
 	}
 
-	query := []byte(`{ "query":{ "match_all":{} } }`)
-	it := idx.IterateQuery(query, 10000, 60*time.Second)
+	seedDocs := make(crawler.CrawlSeed, 0)
 
-	switch mode {
-	case CrawlIndexAndGithub:
-		crawlers := []crawler.Crawler{ghCrawlerConstructor("", "")}
-		crawler.CrawlFromSeedIterator(ctx, it, crawlers, docConverter, indexFunc, seen)
-		crawler.CrawlGithub(ctx, crawlers, docConverter, indexFunc, seen)
-	case CrawlIndex:
-		crawlers := []crawler.Crawler{ghCrawlerConstructor("", "")}
-		crawler.CrawlFromSeedIterator(ctx, it, crawlers, docConverter, indexFunc, seen)
-	case CrawlGithub:
-		crawlers := []crawler.Crawler{ghCrawlerConstructor("", "")}
-		// add all the documents in the index into seen.
-		// this greatly reduces the time overhead of CrawlGithub.
+	// get all the documents in the index
+	getSeedDocsFunc := func() {
+		query := []byte(`{ "query":{ "match_all":{} } }`)
+		it := idx.IterateQuery(query, 10000, 60*time.Second)
 		for it.Next() {
 			for _, hit := range it.Value().Hits.Hits {
-				d := hit.Document.Document
-				seen.Set(d.ID(), d.FileType)
+				seedDocs = append(seedDocs, hit.Document.Copy())
 			}
 		}
 		if err := it.Err(); err != nil {
-			log.Fatalf("Error iterating the index: %v\n", err)
+			fmt.Printf("Error iterating: %v\n", err)
 		}
+	}
 
+	switch mode {
+	case CrawlIndexAndGithub:
+		getSeedDocsFunc()
+		crawlers := []crawler.Crawler{ghCrawlerConstructor("", "")}
+		crawler.CrawlFromSeed(ctx, seedDocs, crawlers, docConverter, indexFunc, seen)
+		crawler.CrawlGithub(ctx, crawlers, docConverter, indexFunc, seen)
+	case CrawlIndex:
+		getSeedDocsFunc()
+		crawlers := []crawler.Crawler{ghCrawlerConstructor("", "")}
+		crawler.CrawlFromSeed(ctx, seedDocs, crawlers, docConverter, indexFunc, seen)
+	case CrawlGithub:
+		crawlers := []crawler.Crawler{ghCrawlerConstructor("", "")}
 		crawler.CrawlGithub(ctx, crawlers, docConverter, indexFunc, seen)
 	case CrawlUser:
-		if *githubUserPtr == "" {
-			flag.Usage()
-			log.Fatalf("Please specify a github user with the github-user flag!")
+		if len(os.Args) < 3 {
+			Usage()
+			log.Fatalf("Please specify a github user!")
 		}
-		crawlers := []crawler.Crawler{ghCrawlerConstructor(*githubUserPtr, "")}
+		crawlers := []crawler.Crawler{ghCrawlerConstructor(os.Args[2], "")}
 		crawler.CrawlGithub(ctx, crawlers, docConverter, indexFunc, seen)
 	case CrawlRepo:
-		if *githubRepoPtr == "" {
-			flag.Usage()
-			log.Fatalf("Please specify a github repository with the github-repo flag!")
+		if len(os.Args) < 3 {
+			Usage()
+			log.Fatalf("Please specify a github repo!")
 		}
-		crawlers := []crawler.Crawler{ghCrawlerConstructor("", *githubRepoPtr)}
+		crawlers := []crawler.Crawler{ghCrawlerConstructor("", os.Args[2])}
 		crawler.CrawlGithub(ctx, crawlers, docConverter, indexFunc, seen)
 	case CrawlUnknown:
-		flag.Usage()
-		log.Fatalf("The --mode flag must be one of [github-user, github-repo, index, github, index+github].")
+		Usage()
+		log.Fatalf("The crawler mode must be one of [github-user, github-repo, index, github]")
 	}
 }

api/internal/crawl/cmd/kustomize_stats/main.go

@@ -2,16 +2,15 @@ package main
 
 import (
 	"context"
-	"crypto/sha256"
 	"flag"
 	"fmt"
 	"log"
+	"path/filepath"
 	"sort"
 	"time"
 
-	"sigs.k8s.io/kustomize/api/internal/crawl/doc"
-
 	"sigs.k8s.io/kustomize/api/internal/crawl/index"
+	"sigs.k8s.io/kustomize/api/konfig"
 )
 
 // iterateArr adds each item in arr into countMap.
@@ -26,90 +25,29 @@ func iterateArr(arr []string, countMap map[string]int) {
 
 }
 
-// SortMapKeyByValueInt takes a map as its input, sorts its keys according to their values
-// in the map, and outputs the sorted keys as a slice.
-func SortMapKeyByValueInt(m map[string]int) []string {
-	keys := make([]string, 0, len(m))
-	for key := range m {
-		keys = append(keys, key)
+// isKustomizationFile determines whether a file path is a kustomization file
+func isKustomizationFile(path string) bool {
+	basename := filepath.Base(path)
+	for _, name := range konfig.RecognizedKustomizationFileNames() {
+		if basename == name {
+			return true
+		}
 	}
-	// sort keys according to their values in the map m
-	sort.Slice(keys, func(i, j int) bool { return m[keys[i]] > m[keys[j]] })
-	return keys
+	return false
 }
 
 // SortMapKeyByValue takes a map as its input, sorts its keys according to their values
 // in the map, and outputs the sorted keys as a slice.
-func SortMapKeyByValueLen(m map[string][]string) []string {
+func SortMapKeyByValue(m map[string]int) []string {
 	keys := make([]string, 0, len(m))
 	for key := range m {
 		keys = append(keys, key)
 	}
 	// sort keys according to their values in the map m
-	sort.Slice(keys, func(i, j int) bool { return len(m[keys[i]]) > len(m[keys[j]]) })
+	sort.Slice(keys, func(i, j int) bool {return m[keys[i]] > m[keys[j]]})
 	return keys
 }
 
-func GeneratorOrTransformerStats(docs []*doc.KustomizationDocument) {
-	n := len(docs)
-	if n == 0 {
-		return
-	}
-
-	fileType := docs[0].FileType
-	fmt.Printf("There are totally %d %s files.\n", n, fileType)
-
-	GitRepositorySummary(docs, fileType)
-
-	// key of kindToUrls: a string in the KustomizationDocument.Kinds field
-	// value of kindToUrls: a slice of string urls defining a given kind.
-	kindToUrls := make(map[string][]string)
-
-	for _, d := range docs {
-		url := fmt.Sprintf("%s/blob/%s/%s", d.RepositoryURL, d.DefaultBranch, d.FilePath)
-		for _, kind := range d.Kinds {
-			if _, ok := kindToUrls[kind]; !ok {
-				kindToUrls[kind] = []string{url}
-			} else {
-				kindToUrls[kind] = append(kindToUrls[kind], url)
-			}
-		}
-	}
-	fmt.Printf("There are totally %d kinds of %s\n", len(kindToUrls), fileType)
-	sortedKeys := SortMapKeyByValueLen(kindToUrls)
-	for _, k := range sortedKeys {
-		sort.Strings(kindToUrls[k])
-		fmt.Printf("%s kind %s appears %d times\n", fileType, k, len(kindToUrls[k]))
-		for _, url := range kindToUrls[k] {
-			fmt.Printf("%s\n", url)
-		}
-	}
-}
-
-// GitRepositorySummary counts the distribution of docs:
-// 1) how many git repositories are these docs from?
-// 2) how many docs are from each git repository?
-func GitRepositorySummary(docs []*doc.KustomizationDocument, fileType string) {
-	m := make(map[string]int)
-	for _, d := range docs {
-		if _, ok := m[d.RepositoryURL]; ok {
-			m[d.RepositoryURL]++
-		} else {
-			m[d.RepositoryURL] = 1
-		}
-	}
-	sortedKeys := SortMapKeyByValueInt(m)
-	topN := 10
-	i := 0
-	for _, k := range sortedKeys {
-		if i >= topN {
-			break
-		}
-		fmt.Printf("%d %s are from %s\n", m[k], fileType, k)
-		i++
-	}
-}
-
 func main() {
 	topKindsPtr := flag.Int(
 		"kinds", -1,
@@ -126,12 +64,10 @@ If you only want to list the 10 most popular identifiers, set the flag to 10.`)
 		`the number of kustomize features to be listed according to their popularities.
 By default, all the features will be listed.
 If you only want to list the 10 most popular features, set the flag to 10.`)
-	indexNamePtr := flag.String(
-		"index", "kustomize", "The name of the ElasticSearch index.")
 	flag.Parse()
 
 	ctx := context.Background()
-	idx, err := index.NewKustomizeIndex(ctx, *indexNamePtr)
+	idx, err := index.NewKustomizeIndex(ctx)
 	if err != nil {
 		log.Fatalf("Could not create an index: %v\n", err)
 	}
@@ -149,59 +85,35 @@ If you only want to list the 10 most popular features, set the flag to 10.`)
 	// ids tracks the unique IDs of the documents in the index
 	ids := make(map[string]struct{})
 
-	// generatorFiles include all the non-kustomization files whose FileType is generator
-	generatorFiles := make([]*doc.KustomizationDocument, 0)
-
-	// transformersFiles include all the non-kustomization files whose FileType is transformer
-	transformersFiles := make([]*doc.KustomizationDocument, 0)
-
-	checksums := make(map[string]int)
-
 	// get all the documents in the index
 	query := []byte(`{ "query":{ "match_all":{} } }`)
 	it := idx.IterateQuery(query, 10000, 60*time.Second)
 	for it.Next() {
 		for _, hit := range it.Value().Hits.Hits {
-			sum := fmt.Sprintf("%x", sha256.Sum256([]byte(hit.Document.DocumentData)))
-			if _, ok := checksums[sum]; ok {
-				checksums[sum]++
-			} else {
-				checksums[sum] = 1
-			}
-
 			// check whether there is any duplicate IDs in the index
 			if _, ok := ids[hit.ID]; !ok {
 				ids[hit.ID] = struct{}{}
 			} else {
-				log.Printf("Found duplicate ID (%s)\n", hit.ID)
+				fmt.Printf("Found duplicate ID (%s)\n", hit.ID)
 			}
 
 			count++
 			iterateArr(hit.Document.Kinds, kindsMap)
 			iterateArr(hit.Document.Identifiers, identifiersMap)
 
-			if doc.IsKustomizationFile(hit.Document.FilePath) {
+			if isKustomizationFile(hit.Document.FilePath) {
 				kustomizationFilecount++
 				iterateArr(hit.Document.Identifiers, kustomizeIdentifiersMap)
-
-			} else {
-				switch hit.Document.FileType {
-				case "generator":
-					generatorFiles = append(generatorFiles, hit.Document.Copy())
-				case "transformer":
-					transformersFiles = append(transformersFiles, hit.Document.Copy())
-				}
 			}
 		}
 	}
-
 	if err := it.Err(); err != nil {
-		log.Fatalf("Error iterating: %v\n", err)
+		fmt.Printf("Error iterating: %v\n", err)
 	}
 
-	sortedKindsMapKeys := SortMapKeyByValueInt(kindsMap)
-	sortedIdentifiersMapKeys := SortMapKeyByValueInt(identifiersMap)
-	sortedKustomizeIdentifiersMapKeys := SortMapKeyByValueInt(kustomizeIdentifiersMap)
+	sortedKindsMapKeys := SortMapKeyByValue(kindsMap)
+	sortedIdentifiersMapKeys := SortMapKeyByValue(identifiersMap)
+	sortedKustomizeIdentifiersMapKeys := SortMapKeyByValue(kustomizeIdentifiersMap)
 
 	fmt.Printf(`The count of unique document IDs in the kustomize index: %d
 There are %d documents in the kustomize index.
@@ -235,15 +147,4 @@ There are %d documents in the kustomize index.
 			kustomizeFeatureCount++
 		}
 	}
-
-	GeneratorOrTransformerStats(generatorFiles)
-	GeneratorOrTransformerStats(transformersFiles)
-
-	fmt.Printf("There are total %d checksums of document contents\n", len(checksums))
-	sortedChecksums := SortMapKeyByValueInt(checksums)
-	sortedChecksums = sortedChecksums[:20]
-	fmt.Printf("The top 20 checksums are:\n")
-	for _, key := range sortedChecksums {
-		fmt.Printf("checksum %s apprears %d\n", key, checksums[key])
-	}
 }

api/internal/crawl/cmd/log-parser/kustomize-stats-cmd

@@ -1,7 +0,0 @@
-wget <log-file-url> -O log
-go build .
-./log-parser log >out
-cat out | grep "kind \`" | cut -d\` -f2 | tail -n 50
-cat out | grep "kind \`" | awk '{print $6}' | tail -n 50
-cat out | grep "feature \`" | grep -v "\`resources\`" | grep -v -e "\`apiVersion\`" | grep -v -e "\`apiversion\`" | cut -d\` -f2
-cat out | grep "feature \`" | grep -v "\`resources\`" | grep -v -e "\`apiVersion\`" | grep -v -e "\`apiversion\`" | awk '{print $6}'

api/internal/crawl/cmd/log-parser/main.go

@@ -36,7 +36,6 @@ func main() {
 
 		m := entry.(map[string]interface{})
 		if payload, ok := m["textPayload"]; ok {
-			// use fmt.Printf here instead of log.Printf to avoid the time and code location info the log package provides
 			fmt.Printf("%s", payload)
 		} else {
 			log.Printf("the log entry does not have the `textPayload` field: %s\n", line)

api/internal/crawl/config/base/kustomization.yaml

@@ -2,4 +2,5 @@ configmapGenerator:
 - name: elasticsearch-config
   literals:
   - es-url="http://esbasic-master:9200"
+  - kustomize-index-name="kustomize"
   - plugin-index-name="plugin"

api/internal/crawl/config/crawler/base/.gitignore

@@ -1 +0,0 @@
-github_api_secret.txt