Have kustomize CLI depend on kustomize Go API v3.3.0

.gitignore

@@ -5,9 +5,6 @@
 *.so
 *.dylib
 
-.idea
-*.iml
-
 # Test binary, build with `go test -c`
 *.test
 

.travis.yml

@@ -1,10 +1,7 @@
 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.
+# TODO: Uncomment when tests running on Windows.
 #  - windows
 
 addons:
@@ -23,7 +20,7 @@ git:
 language: go
 
 go:
-  - "1.13"
+  - "1.12"
 
 go_import_path: sigs.k8s.io/kustomize
 
@@ -34,9 +31,7 @@ before_install:
 install: true
 
 script:
-  - ./travis/verify-deps.sh
   - ./travis/pre-commit.sh
-  - ./travis/kyaml-pre-commit.sh
 
 # TBD. Suppressing for now.
 notifications:

CONTRIBUTING.md

@@ -6,10 +6,6 @@ _As contributors and maintainers of this project, and in the interest of fosteri
 
 ## Getting Started
 
-Dev guides:
-
-- [Mac](docs/macDevGuide.md)
-
 We have full documentation on how to get started contributing here:
 
 - [Contributor License Agreement](https://git.k8s.io/community/CLA.md) Kubernetes projects require that you sign a Contributor License Agreement (CLA) before we can accept your pull requests

Makefile

@@ -1,145 +1,37 @@
-# This Makefile is (and must be) used by
-# travis/pre-commit.sh to qualify pull requests.
-#
-# That script generates all the code that needs
-# to be generated, and runs all the tests.
-#
-# Functionality in that script is gradually moving here.
+BIN_NAME=kustomize
 
-MYGOBIN := $(shell go env GOPATH)/bin
-PATH := $(PATH):$(MYGOBIN)
-SHELL := env PATH=$(PATH) /bin/bash
+COVER_FILE=coverage.out
 
-.PHONY: all
-all: pre-commit
+export GO111MODULE=on
 
-# The pre-commit.sh script generates, lints and tests.
-# It uses this makefile.  For more clarity, would like
-# to stop that - any scripts invoked by targets here
-# shouldn't "call back" to the makefile.
-.PHONY: pre-commit
-pre-commit:
-	./travis/pre-commit.sh
+all: test build
 
-# Version pinned by api/go.mod
-$(MYGOBIN)/golangci-lint:
-	cd api; \
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint
+test: generate-code test-lint test-go
 
-# Version pinned by api/go.mod
-$(MYGOBIN)/mdrip:
-	cd api; \
-	go install github.com/monopole/mdrip
+test-go:
+	go test -v ./...
 
-# Version pinned by api/go.mod
-$(MYGOBIN)/stringer:
-	cd api; \
-	go install golang.org/x/tools/cmd/stringer
+test-lint:
+	golangci-lint run ./...
 
-# Version pinned by api/go.mod
-$(MYGOBIN)/goimports:
-	cd api; \
-	go install golang.org/x/tools/cmd/goimports
+generate-code:
+	./plugin/generateBuiltins.sh $(GOPATH)
 
-# TODO: need a new release of the API, followed by a new pluginator.
-# pluginator v1.1.0 is too old for the code currently needed in the API.
-# Can release a new one at any time, just haven't done so.
-# When one has been released,
-#  - uncomment the pluginator line in './api/internal/tools/tools.go'
-#  - pin the version tag in './api/go.mod' to match the new release
-#  - change the following to 'cd api; go install sigs.k8s.io/kustomize/pluginator'
-$(MYGOBIN)/pluginator:
-	cd pluginator; \
-	go install .
+build:
+	go build -o $(BIN_NAME) cmd/kustomize/main.go
 
-.PHONY: install-tools
-install-tools: \
-	$(MYGOBIN)/goimports \
-	$(MYGOBIN)/golangci-lint \
-	$(MYGOBIN)/mdrip \
-	$(MYGOBIN)/pluginator \
-	$(MYGOBIN)/stringer
+install:
+	go install $(PWD)/cmd/kustomize
 
-# Builtin plugins are generated code.
-# Add new items here to create new builtins.
-builtinplugins = \
-	api/builtins/annotationstransformer.go \
-	api/builtins/configmapgenerator.go \
-	api/builtins/hashtransformer.go \
-	api/builtins/imagetagtransformer.go \
-	api/builtins/inventorytransformer.go \
-	api/builtins/labeltransformer.go \
-	api/builtins/legacyordertransformer.go \
-	api/builtins/namespacetransformer.go \
-	api/builtins/patchjson6902transformer.go \
-	api/builtins/patchstrategicmergetransformer.go \
-	api/builtins/patchtransformer.go \
-	api/builtins/prefixsuffixtransformer.go \
-	api/builtins/replicacounttransformer.go \
-	api/builtins/secretgenerator.go
+cover:
+	# The plugin directory eludes coverage, and is therefore omitted
+	go test ./pkg/... ./k8sdeps/... ./internal/... -coverprofile=$(COVER_FILE) && \
+	go tool cover -html=$(COVER_FILE)
 
-.PHONY: lint
-lint: install-tools $(builtinplugins)
-	cd api; $(MYGOBIN)/golangci-lint run ./...
-	cd kustomize; $(MYGOBIN)/golangci-lint run ./...
-	cd pluginator; $(MYGOBIN)/golangci-lint run ./...
 
-api/builtins/%.go: $(MYGOBIN)/pluginator
-	@echo "generating $*"; \
-	cd plugin/builtin/$*; \
-	go generate .; \
-	cd ../../../api/builtins; \
-	$(MYGOBIN)/goimports -w $*.go
-
-.PHONY: generate
-generate: $(builtinplugins)
-
-.PHONY: unit-test-api
-unit-test-api: $(builtinplugins)
-	cd api; go test ./...
-
-.PHONY: unit-test-plugins
-unit-test-plugins:
-	./hack/runPluginUnitTests.sh
-
-.PHONY: unit-test-kustomize
-unit-test-kustomize:
-	cd kustomize; go test ./...
-
-.PHONY: unit-test-all
-unit-test-all: unit-test-api unit-test-kustomize unit-test-plugins
-
-# linux only.
-# This is for testing an example plugin that
-# uses kubeval for validation.
-# Don't want to add a hard dependence in go.mod file
-# to github.com/instrumenta/kubeval.
-# Instead, download the binary.
-$(MYGOBIN)/kubeval:
-	d=$(shell mktemp -d); cd $$d; \
-	wget https://github.com/instrumenta/kubeval/releases/latest/download/kubeval-linux-amd64.tar.gz; \
-	tar xf kubeval-linux-amd64.tar.gz; \
-	mv kubeval $(MYGOBIN); \
-	rm -rf $$d
-
-# 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 binary.
-$(MYGOBIN)/helm:
-	d=$(shell mktemp -d); cd $$d; \
-	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
-
-.PHONY: clean
 clean:
-	rm -f $(builtinplugins)
-	rm -f $(MYGOBIN)/pluginator
+	go clean
+	rm -f $(BIN_NAME)
+	rm -f $(COVER_FILE)
 
-.PHONY: nuke
-nuke: clean
-	sudo rm -rf $(shell go env GOPATH)/pkg/mod/sigs.k8s.io
+.PHONY: test build install clean generate-code test-go test-lint cover

api/builtins/doc.go

@@ -1,8 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package builtins holds code generated from the builtin plugins.
-// The "builtin" plugins are written as normal plugins and can
-// be used as such, but they are also used to generate the code
-// in this package so they can be statically linked to client code.
-package builtins

api/go.mod

@@ -1,18 +0,0 @@
-module sigs.k8s.io/kustomize/api
-
-go 1.13
-
-require (
-	github.com/emicklei/go-restful v2.9.6+incompatible // indirect
-	github.com/evanphx/json-patch v4.5.0+incompatible
-	github.com/go-openapi/spec v0.19.4
-	github.com/golangci/golangci-lint v1.19.1
-	github.com/googleapis/gnostic v0.3.0 // indirect
-	github.com/monopole/mdrip v1.0.0
-	github.com/pkg/errors v0.8.1
-	golang.org/x/tools v0.0.0-20190912215617-3720d1ec3678
-	gopkg.in/yaml.v2 v2.2.4
-	k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
-	sigs.k8s.io/kustomize/pseudo/k8s v0.1.0
-	sigs.k8s.io/yaml v1.1.0
-)

api/internal/plugins/builtinconfig/doc.go

@@ -1,10 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package builtinconfig provides legacy methods for
-// configuring builtin plugins from a common config file.
-// As a user, its best to configure plugins individually
-// with plugin config files specified in the `transformers:`
-// or `generators:` field, than to use this legacy
-// configuration technique.
-package builtinconfig

api/internal/plugins/builtinconfig/loaddefaultconfig.go

@@ -1,42 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package builtinconfig
-
-import (
-	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/yaml"
-)
-
-// loadDefaultConfig returns a TranformerConfig
-// object from a list of files.
-func loadDefaultConfig(
-	ldr ifc.Loader, paths []string) (*TransformerConfig, error) {
-	result := &TransformerConfig{}
-	for _, path := range paths {
-		data, err := ldr.Load(path)
-		if err != nil {
-			return nil, err
-		}
-		t, err := makeTransformerConfigFromBytes(data)
-		if err != nil {
-			return nil, err
-		}
-		result, err = result.Merge(t)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return result, nil
-}
-
-// makeTransformerConfigFromBytes returns a TransformerConfig object from bytes
-func makeTransformerConfigFromBytes(data []byte) (*TransformerConfig, error) {
-	var t TransformerConfig
-	err := yaml.Unmarshal(data, &t)
-	if err != nil {
-		return nil, err
-	}
-	t.sortFields()
-	return &t, nil
-}

api/internal/plugins/builtinconfig/transformerconfig.go

@@ -1,148 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package builtinconfig
-
-import (
-	"log"
-	"sort"
-
-	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/api/konfig/builtinpluginconsts"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-// TransformerConfig holds the data needed to perform transformations.
-type TransformerConfig struct {
-	NamePrefix        types.FsSlice `json:"namePrefix,omitempty" yaml:"namePrefix,omitempty"`
-	NameSuffix        types.FsSlice `json:"nameSuffix,omitempty" yaml:"nameSuffix,omitempty"`
-	NameSpace         types.FsSlice `json:"namespace,omitempty" yaml:"namespace,omitempty"`
-	CommonLabels      types.FsSlice `json:"commonLabels,omitempty" yaml:"commonLabels,omitempty"`
-	CommonAnnotations types.FsSlice `json:"commonAnnotations,omitempty" yaml:"commonAnnotations,omitempty"`
-	NameReference     nbrSlice      `json:"nameReference,omitempty" yaml:"nameReference,omitempty"`
-	VarReference      types.FsSlice `json:"varReference,omitempty" yaml:"varReference,omitempty"`
-	Images            types.FsSlice `json:"images,omitempty" yaml:"images,omitempty"`
-	Replicas          types.FsSlice `json:"replicas,omitempty" yaml:"replicas,omitempty"`
-}
-
-// MakeEmptyConfig returns an empty TransformerConfig object
-func MakeEmptyConfig() *TransformerConfig {
-	return &TransformerConfig{}
-}
-
-// MakeDefaultConfig returns a default TransformerConfig.
-func MakeDefaultConfig() *TransformerConfig {
-	c, err := makeTransformerConfigFromBytes(
-		builtinpluginconsts.GetDefaultFieldSpecs())
-	if err != nil {
-		log.Fatalf("Unable to make default transformconfig: %v", err)
-	}
-	return c
-}
-
-// MakeTransformerConfig returns a merger of custom config,
-// if any, with default config.
-func MakeTransformerConfig(
-	ldr ifc.Loader, paths []string) (*TransformerConfig, error) {
-	t1 := MakeDefaultConfig()
-	if len(paths) == 0 {
-		return t1, nil
-	}
-	t2, err := loadDefaultConfig(ldr, paths)
-	if err != nil {
-		return nil, err
-	}
-	return t1.Merge(t2)
-}
-
-// sortFields provides determinism in logging, tests, etc.
-func (t *TransformerConfig) sortFields() {
-	sort.Sort(t.NamePrefix)
-	sort.Sort(t.NameSpace)
-	sort.Sort(t.CommonLabels)
-	sort.Sort(t.CommonAnnotations)
-	sort.Sort(t.NameReference)
-	sort.Sort(t.VarReference)
-	sort.Sort(t.Images)
-	sort.Sort(t.Replicas)
-}
-
-// AddPrefixFieldSpec adds a FieldSpec to NamePrefix
-func (t *TransformerConfig) AddPrefixFieldSpec(fs types.FieldSpec) (err error) {
-	t.NamePrefix, err = t.NamePrefix.MergeOne(fs)
-	return err
-}
-
-// AddSuffixFieldSpec adds a FieldSpec to NameSuffix
-func (t *TransformerConfig) AddSuffixFieldSpec(fs types.FieldSpec) (err error) {
-	t.NameSuffix, err = t.NameSuffix.MergeOne(fs)
-	return err
-}
-
-// AddLabelFieldSpec adds a FieldSpec to CommonLabels
-func (t *TransformerConfig) AddLabelFieldSpec(fs types.FieldSpec) (err error) {
-	t.CommonLabels, err = t.CommonLabels.MergeOne(fs)
-	return err
-}
-
-// AddAnnotationFieldSpec adds a FieldSpec to CommonAnnotations
-func (t *TransformerConfig) AddAnnotationFieldSpec(fs types.FieldSpec) (err error) {
-	t.CommonAnnotations, err = t.CommonAnnotations.MergeOne(fs)
-	return err
-}
-
-// AddNamereferenceFieldSpec adds a NameBackReferences to NameReference
-func (t *TransformerConfig) AddNamereferenceFieldSpec(
-	nbrs NameBackReferences) (err error) {
-	t.NameReference, err = t.NameReference.mergeOne(nbrs)
-	return err
-}
-
-// Merge merges two TransformerConfigs objects into
-// a new TransformerConfig object
-func (t *TransformerConfig) Merge(input *TransformerConfig) (
-	merged *TransformerConfig, err error) {
-	if input == nil {
-		return t, nil
-	}
-	merged = &TransformerConfig{}
-	merged.NamePrefix, err = t.NamePrefix.MergeAll(input.NamePrefix)
-	if err != nil {
-		return nil, err
-	}
-	merged.NameSuffix, err = t.NameSuffix.MergeAll(input.NameSuffix)
-	if err != nil {
-		return nil, err
-	}
-	merged.NameSpace, err = t.NameSpace.MergeAll(input.NameSpace)
-	if err != nil {
-		return nil, err
-	}
-	merged.CommonAnnotations, err = t.CommonAnnotations.MergeAll(
-		input.CommonAnnotations)
-	if err != nil {
-		return nil, err
-	}
-	merged.CommonLabels, err = t.CommonLabels.MergeAll(input.CommonLabels)
-	if err != nil {
-		return nil, err
-	}
-	merged.VarReference, err = t.VarReference.MergeAll(input.VarReference)
-	if err != nil {
-		return nil, err
-	}
-	merged.NameReference, err = t.NameReference.mergeAll(input.NameReference)
-	if err != nil {
-		return nil, err
-	}
-	merged.Images, err = t.Images.MergeAll(input.Images)
-	if err != nil {
-		return nil, err
-	}
-	merged.Replicas, err = t.Replicas.MergeAll(input.Replicas)
-	if err != nil {
-		return nil, err
-	}
-	merged.sortFields()
-	return merged, nil
-}

api/internal/plugins/builtinhelpers/builtinplugintype_string.go

@@ -1,37 +0,0 @@
-// Code generated by "stringer -type=BuiltinPluginType"; DO NOT EDIT.
-
-package builtinhelpers
-
-import "strconv"
-
-func _() {
-	// An "invalid array index" compiler error signifies that the constant values have changed.
-	// Re-run the stringer command to generate them again.
-	var x [1]struct{}
-	_ = x[Unknown-0]
-	_ = x[AnnotationsTransformer-1]
-	_ = x[ConfigMapGenerator-2]
-	_ = x[HashTransformer-3]
-	_ = x[ImageTagTransformer-4]
-	_ = x[InventoryTransformer-5]
-	_ = x[LabelTransformer-6]
-	_ = x[LegacyOrderTransformer-7]
-	_ = x[NamespaceTransformer-8]
-	_ = x[PatchJson6902Transformer-9]
-	_ = x[PatchStrategicMergeTransformer-10]
-	_ = x[PatchTransformer-11]
-	_ = x[PrefixSuffixTransformer-12]
-	_ = x[ReplicaCountTransformer-13]
-	_ = x[SecretGenerator-14]
-}
-
-const _BuiltinPluginType_name = "UnknownAnnotationsTransformerConfigMapGeneratorHashTransformerImageTagTransformerInventoryTransformerLabelTransformerLegacyOrderTransformerNamespaceTransformerPatchJson6902TransformerPatchStrategicMergeTransformerPatchTransformerPrefixSuffixTransformerReplicaCountTransformerSecretGenerator"
-
-var _BuiltinPluginType_index = [...]uint16{0, 7, 29, 47, 62, 81, 101, 117, 139, 159, 183, 213, 229, 252, 275, 290}
-
-func (i BuiltinPluginType) String() string {
-	if i < 0 || i >= BuiltinPluginType(len(_BuiltinPluginType_index)-1) {
-		return "BuiltinPluginType(" + strconv.FormatInt(int64(i), 10) + ")"
-	}
-	return _BuiltinPluginType_name[_BuiltinPluginType_index[i]:_BuiltinPluginType_index[i+1]]
-}

api/internal/target/accumulation_test.go

@@ -1,60 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package target_test
-
-import (
-	"testing"
-
-	. "sigs.k8s.io/kustomize/api/internal/target"
-	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
-)
-
-func TestTargetMustHaveKustomizationFile(t *testing.T) {
-	th := kusttest_test.NewKustTestHarness(t, "/app")
-	th.WriteF("/app/service.yaml", `
-apiVersion: v1
-kind: Service
-metadata:
-  name: aService
-`)
-	th.WriteF("/app/deeper/service.yaml", `
-apiVersion: v1
-kind: Service
-metadata:
-  name: anotherService
-`)
-	_, err := th.MakeKustTargetOrErr()
-	if err == nil {
-		t.Fatalf("expected an error")
-	}
-	if !IsMissingKustomizationFileError(err) {
-		t.Fatalf("unexpected error: %q", err)
-	}
-}
-
-func TestResourceDirectoryMustHaveKustomizationFile(t *testing.T) {
-	th := kusttest_test.NewKustTestHarness(t, "/app")
-	th.WriteK("/app", `
-resources:
-- base
-`)
-	th.WriteF("/app/base/service.yaml", `
-apiVersion: v1
-kind: Service
-metadata:
-  name: myService
-spec:
-  selector:
-    backend: bungie
-  ports:
-    - port: 7002
-`)
-	_, err := th.MakeKustTarget().MakeCustomizedResMap()
-	if err == nil {
-		t.Fatalf("expected an error")
-	}
-	if !IsMissingKustomizationFileError(err) {
-		t.Fatalf("unexpected error: %q", err)
-	}
-}

api/internal/target/complexcomposition_test.go

@@ -1,557 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package target_test
-
-import (
-	"strings"
-	"testing"
-
-	"sigs.k8s.io/kustomize/api/testutils/kusttest"
-)
-
-const httpsService = `
-apiVersion: v1
-kind: Service
-metadata:
-  name: my-https-svc
-spec:
-  ports:
-  - port: 443
-    protocol: TCP
-    name: https
-  selector:
-    app: my-app
-`
-
-func writeStatefulSetBase(th *kusttest_test.KustTestHarness) {
-	th.WriteK("/app/base", `
-resources:
-- statefulset.yaml
-`)
-	th.WriteF("/app/base/statefulset.yaml", `
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: my-sts
-spec:
-  serviceName: my-svc
-  selector:
-    matchLabels:
-      app: my-app
-  template:
-    metadata:
-      labels:
-        app: my-app
-    spec:
-      containers:
-      - name: app
-        image: my-image
-  volumeClaimTemplates:
-  - spec:
-      storageClassName: default
-`)
-}
-
-func writeHTTPSOverlay(th *kusttest_test.KustTestHarness) {
-	th.WriteK("/app/https", `
-resources:
-- ../base
-- https-svc.yaml
-patchesStrategicMerge:
-- sts-patch.yaml
-`)
-	th.WriteF("/app/https/https-svc.yaml", httpsService)
-	th.WriteF("/app/https/sts-patch.yaml", `
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: my-sts
-spec:
-  serviceName: my-https-svc
-`)
-}
-
-func writeHTTPSTransformerRaw(th *kusttest_test.KustTestHarness) {
-	th.WriteF("/app/https/service/https-svc.yaml", httpsService)
-	th.WriteF("/app/https/transformer/transformer.yaml", `
-apiVersion: builtin
-kind: PatchTransformer
-metadata:
-  name: svcNameTran
-target: 
-  group: apps
-  version: v1
-  kind: StatefulSet
-  name: my-sts
-patch: |-
-  apiVersion: apps/v1
-  kind: StatefulSet
-  metadata:
-    name: my-sts
-  spec:
-    serviceName: my-https-svc
-`)
-}
-
-func writeHTTPSTransformerBase(th *kusttest_test.KustTestHarness) {
-	th.WriteK("/app/https/service", `
-resources:
-- https-svc.yaml
-`)
-	th.WriteK("/app/https/transformer", `
-resources:
-- transformer.yaml
-`)
-	writeHTTPSTransformerRaw(th)
-}
-
-func writeConfigFromEnvOverlay(th *kusttest_test.KustTestHarness) {
-	th.WriteK("/app/config", `
-resources:
-- ../base
-configMapGenerator:
-- name: my-config
-  literals:
-  - MY_ENV=foo
-generatorOptions:
-  disableNameSuffixHash: true
-patchesStrategicMerge:
-- sts-patch.yaml
-`)
-	th.WriteF("/app/config/sts-patch.yaml", `
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: my-sts
-spec:
-  template:
-    spec:
-      containers:
-      - name: app
-        envFrom:
-        - configMapRef:
-            name: my-config
-`)
-}
-
-func writeConfigFromEnvTransformerRaw(th *kusttest_test.KustTestHarness) {
-	th.WriteF("/app/config/map/generator.yaml", `
-apiVersion: builtin
-kind: ConfigMapGenerator
-metadata:
-  name: my-config
-disableNameSuffixHash: true
-literals:
-- MY_ENV=foo
-`)
-	th.WriteF("/app/config/transformer/transformer.yaml", `
-apiVersion: builtin
-kind: PatchTransformer
-metadata:
-  name: envFromConfigTrans
-target: 
-  group: apps
-  version: v1
-  kind: StatefulSet
-  name: my-sts
-patch: |-
-  apiVersion: apps/v1
-  kind: StatefulSet
-  metadata:
-    name: my-sts
-  spec:
-    template:
-      spec:
-        containers:
-        - name: app
-          envFrom:
-          - configMapRef:
-              name: my-config
-`)
-}
-func writeConfigFromEnvTransformerBase(th *kusttest_test.KustTestHarness) {
-	th.WriteK("/app/config/map", `
-resources:
-- generator.yaml
-`)
-	th.WriteK("/app/config/transformer", `
-resources:
-- transformer.yaml
-`)
-	writeConfigFromEnvTransformerRaw(th)
-}
-
-func writeTolerationsOverlay(th *kusttest_test.KustTestHarness) {
-	th.WriteK("/app/tolerations", `
-resources:
-- ../base
-patchesStrategicMerge:
-- sts-patch.yaml
-`)
-	th.WriteF("/app/tolerations/sts-patch.yaml", `
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: my-sts
-spec:
-  template:
-    spec:
-      tolerations:
-      - effect: NoExecute
-        key: node.kubernetes.io/not-ready
-        tolerationSeconds: 30
-`)
-}
-
-func writeTolerationsTransformerRaw(th *kusttest_test.KustTestHarness) {
-	th.WriteF("/app/tolerations/transformer.yaml", `
-apiVersion: builtin
-kind: PatchTransformer
-metadata:
-  name: tolTrans
-target: 
-  group: apps
-  version: v1
-  kind: StatefulSet
-  name: my-sts
-patch: |-
-  apiVersion: apps/v1
-  kind: StatefulSet
-  metadata:
-    name: my-sts
-  spec:
-    template:
-      spec:
-        tolerations:
-        - effect: NoExecute
-          key: node.kubernetes.io/not-ready
-          tolerationSeconds: 30
-`)
-}
-
-func writeTolerationsTransformerBase(th *kusttest_test.KustTestHarness) {
-	th.WriteK("/app/tolerations", `
-resources:
-- transformer.yaml
-`)
-	writeTolerationsTransformerRaw(th)
-}
-
-func writeStorageOverlay(th *kusttest_test.KustTestHarness) {
-	th.WriteK("/app/storage", `
-resources:
-- ../base
-patchesJson6902:
-- target:
-    group: apps
-    version: v1
-    kind: StatefulSet
-    name: my-sts
-  path: sts-patch.json
-`)
-	th.WriteF("/app/storage/sts-patch.json", `
-[{"op": "replace", "path": "/spec/volumeClaimTemplates/0/spec/storageClassName", "value": "my-sc"}]
-`)
-}
-
-func writeStorageTransformerRaw(th *kusttest_test.KustTestHarness) {
-	th.WriteF("/app/storage/transformer.yaml", `
-apiVersion: builtin
-kind: PatchTransformer
-metadata:
-  name: storageTrans
-target: 
-  group: apps
-  version: v1
-  kind: StatefulSet
-  name: my-sts
-patch: |-
-  [{"op": "replace", "path": "/spec/volumeClaimTemplates/0/spec/storageClassName", "value": "my-sc"}]
-`)
-}
-
-func writeStorageTransformerBase(th *kusttest_test.KustTestHarness) {
-	th.WriteK("/app/storage", `
-resources:
-- transformer.yaml
-`)
-	writeStorageTransformerRaw(th)
-}
-
-func writePatchingOverlays(th *kusttest_test.KustTestHarness) {
-	writeStorageOverlay(th)
-	writeConfigFromEnvOverlay(th)
-	writeTolerationsOverlay(th)
-	writeHTTPSOverlay(th)
-}
-
-func writePatchingTransformersRaw(th *kusttest_test.KustTestHarness) {
-	writeStorageTransformerRaw(th)
-	writeConfigFromEnvTransformerRaw(th)
-	writeTolerationsTransformerRaw(th)
-	writeHTTPSTransformerRaw(th)
-}
-
-// Similar to writePatchingTransformersRaw, except here the
-// transformers and related artifacts are addressable as _bases_.
-// They are listed in a kustomization file, and consumers of
-// the plugin refer to the kustomization instead of to the local
-// file in the "transformers:" field.
-//
-// Using bases makes the set of files relocatable with
-// respect to the overlays, and avoids the need to relax load
-// restrictions on file paths reaching outside the `dev` and
-// `prod` kustomization roots.  I.e. with bases tests can use
-// NewKustTestHarness instead of NewKustTestHarnessNoLoadRestrictor.
-//
-// Using transformer plugins from _bases_ means the plugin config
-// must be self-contained, i.e. the config may not have fields that
-// refer to local files, since those files won't be present when
-// the plugin is instantiated and used.
-func writePatchingTransformerBases(th *kusttest_test.KustTestHarness) {
-	writeStorageTransformerBase(th)
-	writeConfigFromEnvTransformerBase(th)
-	writeTolerationsTransformerBase(th)
-	writeHTTPSTransformerBase(th)
-}
-
-// Here's a complex kustomization scenario that combines multiple overlays
-// on a common base:
-//
-//                 dev                       prod
-//                  |                         |
-//                  |                         |
-//        + ------- +          + ------------ + ------------- +
-//        |         |          |              |               |
-//        |         |          |              |               |
-//        v         |          v              v               v
-//     storage      + -----> config       tolerations       https
-//        |                    |              |               |
-//        |                    |              |               |
-//        |                    + --- +  + --- +               |
-//        |                          |  |                     |
-//        |                          v  v                     |
-//        + -----------------------> base <------------------ +
-//
-// The base resource is a statefulset. Each intermediate overlay manages or
-// generates new resources and patches different aspects of the same base
-// resource, without using any of the `namePrefix`, `nameSuffix` or `namespace`
-// kustomization keywords.
-//
-// Intermediate overlays:
-//   - storage: Changes the storage class of the stateful set with a JSON patch.
-//   - config: Generates a config map and adds a field as an environment
-//             variable.
-//   - tolerations: Adds a new tolerations field in the spec.
-//   - https: Adds a new service resource and changes the service name in the
-//            stateful set.
-//
-// Top overlays:
-//   - dev: Combines the storage and config intermediate overlays.
-//   - prod: Combines the config, tolerations and https intermediate overlays.
-
-func TestComplexComposition_Dev_Failure(t *testing.T) {
-	th := kusttest_test.NewKustTestHarness(t, "/app/dev")
-	writeStatefulSetBase(th)
-	writePatchingOverlays(th)
-	th.WriteK("/app/dev", `
-resources:
-- ../storage
-- ../config
-`)
-	_, err := th.MakeKustTarget().MakeCustomizedResMap()
-	if err == nil {
-		t.Fatalf("Expected resource accumulation error")
-	}
-	if !strings.Contains(
-		err.Error(), "already registered id: apps_v1_StatefulSet|~X|my-sts") {
-		t.Fatalf("Unexpected err: %v", err)
-	}
-}
-
-const devDesiredResult = `
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: my-sts
-spec:
-  selector:
-    matchLabels:
-      app: my-app
-  serviceName: my-svc
-  template:
-    metadata:
-      labels:
-        app: my-app
-    spec:
-      containers:
-      - envFrom:
-        - configMapRef:
-            name: my-config
-        image: my-image
-        name: app
-  volumeClaimTemplates:
-  - spec:
-      storageClassName: my-sc
----
-apiVersion: v1
-data:
-  MY_ENV: foo
-kind: ConfigMap
-metadata:
-  name: my-config
-`
-
-func TestComplexComposition_Dev_SuccessWithRawTransformers(t *testing.T) {
-	th := kusttest_test.NewKustTestHarnessNoLoadRestrictor(t, "/app/dev")
-	writeStatefulSetBase(th)
-	writePatchingTransformersRaw(th)
-	th.WriteK("/app/dev", `
-resources:
-- ../base
-generators:
-- ../config/map/generator.yaml
-transformers:
-- ../config/transformer/transformer.yaml
-- ../storage/transformer.yaml
-`)
-	m, err := th.MakeKustTarget().MakeCustomizedResMap()
-	if err != nil {
-		t.Fatalf("Unexpected err: %v", err)
-	}
-	th.AssertActualEqualsExpected(m, devDesiredResult)
-}
-
-func TestComplexComposition_Dev_SuccessWithBaseTransformers(t *testing.T) {
-	th := kusttest_test.NewKustTestHarness(t, "/app/dev")
-	writeStatefulSetBase(th)
-	writePatchingTransformerBases(th)
-	th.WriteK("/app/dev", `
-resources:
-- ../base
-generators:
-- ../config/map
-transformers:
-- ../config/transformer
-- ../storage
-`)
-	m, err := th.MakeKustTarget().MakeCustomizedResMap()
-	if err != nil {
-		t.Fatalf("Unexpected err: %v", err)
-	}
-	th.AssertActualEqualsExpected(m, devDesiredResult)
-}
-
-func TestComplexComposition_Prod_Failure(t *testing.T) {
-	th := kusttest_test.NewKustTestHarness(t, "/app/prod")
-	writeStatefulSetBase(th)
-	writePatchingOverlays(th)
-	th.WriteK("/app/prod", `
-resources:
-- ../config
-- ../tolerations
-- ../https
-`)
-	_, err := th.MakeKustTarget().MakeCustomizedResMap()
-	if err == nil {
-		t.Fatalf("Expected resource accumulation error")
-	}
-	if !strings.Contains(
-		err.Error(), "already registered id: apps_v1_StatefulSet|~X|my-sts") {
-		t.Fatalf("Unexpected err: %v", err)
-	}
-}
-
-const prodDesiredResult = `
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: my-sts
-spec:
-  selector:
-    matchLabels:
-      app: my-app
-  serviceName: my-https-svc
-  template:
-    metadata:
-      labels:
-        app: my-app
-    spec:
-      containers:
-      - envFrom:
-        - configMapRef:
-            name: my-config
-        image: my-image
-        name: app
-      tolerations:
-      - effect: NoExecute
-        key: node.kubernetes.io/not-ready
-        tolerationSeconds: 30
-  volumeClaimTemplates:
-  - spec:
-      storageClassName: default
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: my-https-svc
-spec:
-  ports:
-  - name: https
-    port: 443
-    protocol: TCP
-  selector:
-    app: my-app
----
-apiVersion: v1
-data:
-  MY_ENV: foo
-kind: ConfigMap
-metadata:
-  name: my-config
-`
-
-func TestComplexComposition_Prod_SuccessWithRawTransformers(t *testing.T) {
-	th := kusttest_test.NewKustTestHarnessNoLoadRestrictor(t, "/app/prod")
-	writeStatefulSetBase(th)
-	writePatchingTransformersRaw(th)
-	th.WriteK("/app/prod", `
-resources:
-- ../base
-- ../https/service/https-svc.yaml
-generators:
-- ../config/map/generator.yaml
-transformers:
-- ../config/transformer/transformer.yaml
-- ../https/transformer/transformer.yaml
-- ../tolerations/transformer.yaml
-`)
-	m, err := th.MakeKustTarget().MakeCustomizedResMap()
-	if err != nil {
-		t.Fatalf("Unexpected err: %v", err)
-	}
-	th.AssertActualEqualsExpected(m, prodDesiredResult)
-}
-
-func TestComplexComposition_Prod_SuccessWithBaseTransformers(t *testing.T) {
-	th := kusttest_test.NewKustTestHarness(t, "/app/prod")
-	writeStatefulSetBase(th)
-	writePatchingTransformerBases(th)
-	th.WriteK("/app/prod", `
-resources:
-- ../base
-- ../https/service
-generators:
-- ../config/map
-transformers:
-- ../config/transformer
-- ../https/transformer
-- ../tolerations
-`)
-	m, err := th.MakeKustTarget().MakeCustomizedResMap()
-	if err != nil {
-		t.Fatalf("Unexpected err: %v", err)
-	}
-	th.AssertActualEqualsExpected(m, prodDesiredResult)
-}

api/internal/tools/tools.go

@@ -1,19 +0,0 @@
-// +build tools
-
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// This file exists to trigger installs of the given tools.
-
-package tools
-
-import (
-	// for code generation
-	_ "golang.org/x/tools/cmd/stringer"
-	// for lint checks
-	_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
-	// for integration tests driven by the examples
-	_ "github.com/monopole/mdrip"
-	// TODO: See comment in Makefile.
-	//_ "sigs.k8s.io/kustomize/pluginator"
-)

api/konfig/builtinpluginconsts/doc.go

@@ -1,8 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package builtinpluginconsts provides builtin plugin
-// configuration data.  Builtin plugins can also be
-// configured individually with plugin config files,
-// in which case the constants in this package are ignored.
-package builtinpluginconsts

api/konfig/builtinpluginconsts/images.go

@@ -1,10 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package builtinpluginconsts
-
-const (
-	// imageFieldSpecs is left empty since `containers` and `initContainers`
-	// of *ANY* kind in *ANY* path are builtin supported in code
-	imagesFieldSpecs = ``
-)

api/konfig/builtinpluginconsts/nameprefix.go

@@ -1,11 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package builtinpluginconsts
-
-const (
-	namePrefixFieldSpecs = `
-namePrefix:
-- path: metadata/name
-`
-)

api/konfig/builtinpluginconsts/namespace.go

@@ -1,16 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package builtinpluginconsts
-
-const (
-	namespaceFieldSpecs = `
-namespace:
-- path: metadata/namespace
-  create: true
-- path: subjects
-  kind: RoleBinding
-- path: subjects
-  kind: ClusterRoleBinding
-`
-)

api/konfig/doc.go

@@ -1,6 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package konfig provides configuration methods and constants
-// for the kustomize API.
-package konfig

api/konfig/plugins.go

@@ -1,150 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package konfig
-
-import (
-	"os"
-	"path/filepath"
-	"runtime"
-
-	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-const (
-	// Symbol that must be used inside Go plugins.
-	PluginSymbol = "KustomizePlugin"
-
-	// Name of environment variable used to set AbsPluginHome.
-	// See that variable for an explanation.
-	KustomizePluginHomeEnv = "KUSTOMIZE_PLUGIN_HOME"
-
-	// Relative path below XDG_CONFIG_HOME/kustomize to find plugins.
-	// e.g. AbsPluginHome = XDG_CONFIG_HOME/kustomize/plugin
-	RelPluginHome = "plugin"
-
-	// Location of builtin plugins below AbsPluginHome.
-	BuiltinPluginPackage = "builtin"
-
-	// The value of kubernetes ApiVersion to use in configuration
-	// files for builtin plugins.
-	// The value for non-builtins can be anything.
-	BuiltinPluginApiVersion = BuiltinPluginPackage
-
-	// Domain from which kustomize code is imported, for locating
-	// plugin source code under $GOPATH when GOPATH is defined.
-	DomainName = "sigs.k8s.io"
-)
-
-func EnabledPluginConfig() (*types.PluginConfig, error) {
-	dir, err := DefaultAbsPluginHome(filesys.MakeFsOnDisk())
-	if err != nil {
-		return nil, err
-	}
-	return MakePluginConfig(types.PluginRestrictionsNone, dir), nil
-}
-
-func DisabledPluginConfig() *types.PluginConfig {
-	return MakePluginConfig(
-		types.PluginRestrictionsBuiltinsOnly, NoPluginHomeSentinal)
-}
-
-func MakePluginConfig(
-	pr types.PluginRestrictions, home string) *types.PluginConfig {
-	return &types.PluginConfig{
-		PluginRestrictions: pr,
-		AbsPluginHome:      home,
-	}
-}
-
-// Use an obviously erroneous path, in case it's accidentally used.
-const NoPluginHomeSentinal = "/no/non-builtin/plugins!"
-
-type NotedFunc struct {
-	Note string
-	F    func() string
-}
-
-func DefaultAbsPluginHome(fSys filesys.FileSystem) (string, error) {
-	return FirstDirThatExistsElseError(
-		"plugin home directory", fSys, []NotedFunc{
-			{
-				Note: "homed in $" + KustomizePluginHomeEnv,
-				F: func() string {
-					return os.Getenv(KustomizePluginHomeEnv)
-				},
-			},
-			{
-				Note: "homed in $" + XdgConfigHomeEnv,
-				F: func() string {
-					return filepath.Join(
-						os.Getenv(XdgConfigHomeEnv),
-						ProgramName, RelPluginHome)
-				},
-			},
-			{
-				Note: "homed in default value of $" + XdgConfigHomeEnv,
-				F: func() string {
-					return filepath.Join(
-						HomeDir(), XdgConfigHomeEnvDefault,
-						ProgramName, RelPluginHome)
-				},
-			},
-			{
-				Note: "homed in home directory",
-				F: func() string {
-					return filepath.Join(
-						HomeDir(), ProgramName, RelPluginHome)
-				},
-			},
-		})
-}
-
-// FirstDirThatExistsElseError tests different path functions for
-// existence, returning the first that works, else error if all fail.
-func FirstDirThatExistsElseError(
-	what string,
-	fSys filesys.FileSystem,
-	pathFuncs []NotedFunc) (string, error) {
-	var nope []types.Pair
-	for _, dt := range pathFuncs {
-		dir := dt.F()
-		if fSys.Exists(dir) {
-			return dir, nil
-		}
-		nope = append(nope, types.Pair{Key: dt.Note, Value: dir})
-	}
-	return "", types.NewErrUnableToFind(what, nope)
-}
-
-func HomeDir() string {
-	home := os.Getenv(homeEnv())
-	if len(home) > 0 {
-		return home
-	}
-	return "~"
-}
-
-func homeEnv() string {
-	if runtime.GOOS == "windows" {
-		return "USERPROFILE"
-	}
-	return "HOME"
-}
-
-func CurrentWorkingDir() string {
-	// Try for full path first to be explicit.
-	pwd := os.Getenv(pwdEnv())
-	if len(pwd) > 0 {
-		return pwd
-	}
-	return "."
-}
-
-func pwdEnv() string {
-	if runtime.GOOS == "windows" {
-		return "CD"
-	}
-	return "PWD"
-}

api/konfig/plugins_test.go

@@ -1,126 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package konfig
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-func TestDefaultAbsPluginHome_NoKustomizePluginHomeEnv(t *testing.T) {
-	fSys := filesys.MakeFsInMemory()
-	keep, isSet := os.LookupEnv(KustomizePluginHomeEnv)
-	if isSet {
-		_ = os.Unsetenv(KustomizePluginHomeEnv)
-	}
-	_, err := DefaultAbsPluginHome(fSys)
-	if isSet {
-		os.Setenv(KustomizePluginHomeEnv, keep)
-	}
-	if err == nil {
-		t.Fatalf("expected err")
-	}
-	if !types.IsErrUnableToFind(err) {
-		t.Fatalf("unexpected err: %v", err)
-	}
-}
-
-func TestDefaultAbsPluginHome_WithKustomizePluginHomeEnv(t *testing.T) {
-	fSys := filesys.MakeFsInMemory()
-	keep, isSet := os.LookupEnv(KustomizePluginHomeEnv)
-	if !isSet {
-		keep = "whatever"
-		os.Setenv(KustomizePluginHomeEnv, keep)
-	}
-	fSys.Mkdir(keep)
-	h, err := DefaultAbsPluginHome(fSys)
-	if !isSet {
-		_ = os.Unsetenv(KustomizePluginHomeEnv)
-	}
-	if err != nil {
-		t.Fatalf("unexpected err: %v", err)
-	}
-	if h != keep {
-		t.Fatalf("unexpected config dir: %s", h)
-	}
-}
-
-func TestDefaultAbsPluginHomeWithXdg(t *testing.T) {
-	fSys := filesys.MakeFsInMemory()
-	keep, isSet := os.LookupEnv(XdgConfigHomeEnv)
-	if !isSet {
-		keep = "whatever"
-		os.Setenv(XdgConfigHomeEnv, keep)
-	}
-	configDir := filepath.Join(keep, ProgramName, RelPluginHome)
-	fSys.Mkdir(configDir)
-	h, err := DefaultAbsPluginHome(fSys)
-	if !isSet {
-		_ = os.Unsetenv(XdgConfigHomeEnv)
-	}
-	if err != nil {
-		t.Fatalf("unexpected err: %v", err)
-	}
-	if h != configDir {
-		t.Fatalf("unexpected config dir: %s", h)
-	}
-}
-
-func TestDefaultAbsPluginHomeNoConfig(t *testing.T) {
-	fSys := filesys.MakeFsInMemory()
-	keep, isSet := os.LookupEnv(XdgConfigHomeEnv)
-	if isSet {
-		_ = os.Unsetenv(XdgConfigHomeEnv)
-	}
-	_, err := DefaultAbsPluginHome(fSys)
-	if isSet {
-		os.Setenv(XdgConfigHomeEnv, keep)
-	}
-	if err == nil {
-		t.Fatalf("expected err")
-	}
-	if !types.IsErrUnableToFind(err) {
-		t.Fatalf("unexpected err: %v", err)
-	}
-}
-
-func TestDefaultAbsPluginHomeNoXdgWithDotConfig(t *testing.T) {
-	fSys := filesys.MakeFsInMemory()
-	configDir := filepath.Join(
-		HomeDir(), XdgConfigHomeEnvDefault, ProgramName, RelPluginHome)
-	fSys.Mkdir(configDir)
-	keep, isSet := os.LookupEnv(XdgConfigHomeEnv)
-	if isSet {
-		_ = os.Unsetenv(XdgConfigHomeEnv)
-	}
-	s, _ := DefaultAbsPluginHome(fSys)
-	if isSet {
-		os.Setenv(XdgConfigHomeEnv, keep)
-	}
-	if s != configDir {
-		t.Fatalf("unexpected config dir: %s", s)
-	}
-}
-
-func TestDefaultAbsPluginHomeNoXdgJustHomeDir(t *testing.T) {
-	fSys := filesys.MakeFsInMemory()
-	configDir := filepath.Join(
-		HomeDir(), ProgramName, RelPluginHome)
-	fSys.Mkdir(configDir)
-	keep, isSet := os.LookupEnv(XdgConfigHomeEnv)
-	if isSet {
-		_ = os.Unsetenv(XdgConfigHomeEnv)
-	}
-	s, _ := DefaultAbsPluginHome(fSys)
-	if isSet {
-		os.Setenv(XdgConfigHomeEnv, keep)
-	}
-	if s != configDir {
-		t.Fatalf("unexpected config dir: %s", s)
-	}
-}

api/krusty/doc.go

@@ -1,6 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package krusty holds a very high level API to kustomize.
-// The functions here should be similar to the CLI api.
-package krusty

api/krusty/kustomizer.go

@@ -1,85 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package krusty
-
-import (
-	"sigs.k8s.io/kustomize/api/builtins"
-	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/internal/k8sdeps/transformer"
-	pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader"
-	"sigs.k8s.io/kustomize/api/internal/target"
-	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/api/k8sdeps/validator"
-	fLdr "sigs.k8s.io/kustomize/api/loader"
-	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/resource"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-// Kustomizer performs kustomizations.  It's meant to behave
-// similarly to the kustomize CLI, and can be used instead of
-// performing an exec to a kustomize CLI subprocess.
-// To use, load a filesystem with kustomization files (any
-// number of overlays and bases), then make a Kustomizer
-// injected with the given fileystem, then call Build.
-type Kustomizer struct {
-	fSys    filesys.FileSystem
-	options *Options
-}
-
-// MakeKustomizer returns an instance of Kustomizer.
-func MakeKustomizer(fSys filesys.FileSystem, o *Options) *Kustomizer {
-	return &Kustomizer{fSys: fSys, options: o}
-}
-
-// Run performs a kustomization.
-//
-// It uses its internal filesystem reference to read the file at
-// the given path argument, interpret it as a kustomization.yaml
-// file, perform the kustomization it represents, and return the
-// resulting resources.
-//
-// Any files referenced by the kustomization must be present in the
-// internal filesystem.  One may call Run any number of times,
-// on any number of internal paths (e.g. the filesystem may contain
-// multiple overlays, and Run can be called on each of them).
-func (b *Kustomizer) Run(path string) (resmap.ResMap, error) {
-	pf := transformer.NewFactoryImpl()
-	rf := resmap.NewFactory(
-		resource.NewFactory(
-			kunstruct.NewKunstructuredFactoryImpl()),
-		pf)
-	lr := fLdr.RestrictionNone
-	if b.options.LoadRestrictions == types.LoadRestrictionsRootOnly {
-		lr = fLdr.RestrictionRootOnly
-	}
-	ldr, err := fLdr.NewLoader(lr, path, b.fSys)
-	if err != nil {
-		return nil, err
-	}
-	defer ldr.Cleanup()
-	kt, err := target.NewKustTarget(
-		ldr,
-		validator.NewKustValidator(),
-		rf,
-		pf,
-		pLdr.NewLoader(b.options.PluginConfig, rf),
-	)
-	if err != nil {
-		return nil, err
-	}
-	var m resmap.ResMap
-	if b.options.DoPrune {
-		m, err = kt.MakePruneConfigMap()
-	} else {
-		m, err = kt.MakeCustomizedResMap()
-	}
-	if err != nil {
-		return nil, err
-	}
-	if b.options.DoLegacyResourceSort {
-		builtins.NewLegacyOrderTransformerPlugin().Transform(m)
-	}
-	return m, nil
-}

api/krusty/kustomizer_test.go

@@ -1,30 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// TODO: move most of the tests in the api/target package to this package.
-package krusty_test
-
-import (
-	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/krusty"
-	"testing"
-)
-
-// TODO: make this more like kusttest_test.AssertActualEqualsExpected
-func assertOutput(t *testing.T, actual []byte, expected string) {
-	if string(actual) != expected {
-		t.Fatalf("Err: expected:\n%s\nbut got:\n%s\n", expected, actual)
-	}
-}
-
-func TestSomething1(t *testing.T) {
-	fSys := filesys.MakeFsInMemory()
-	b := krusty.MakeKustomizer(fSys, krusty.MakeDefaultOptions())
-	_, err := b.Run("hey")
-	if err == nil {
-		t.Fatalf("expected error")
-	}
-	if err.Error() != "got file 'hey', but 'hey' must be a directory to be a root" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}

api/krusty/options.go

@@ -1,40 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package krusty
-
-import (
-	"sigs.k8s.io/kustomize/api/konfig"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-// Options holds high-level kustomize configuration options,
-// e.g. are plugins enabled, should the loader be restricted
-// to the kustomization root, etc.
-type Options struct {
-	// When true, sort the resources before emitting them,
-	// per a particular sort order.  When false, don't do the
-	// sort, and instead respect the depth-first resource input
-	// order as specified by the kustomization file(s).
-	DoLegacyResourceSort bool
-
-	// Restrictions on what can be loaded from the file system.
-	// See type definition.
-	LoadRestrictions types.LoadRestrictions
-
-	// Create an inventory object for pruning.
-	DoPrune bool
-
-	// Options related to kustomize plugins.
-	PluginConfig *types.PluginConfig
-}
-
-// MakeDefaultOptions returns a default instance of Options.
-func MakeDefaultOptions() *Options {
-	return &Options{
-		DoLegacyResourceSort: true,
-		LoadRestrictions:     types.LoadRestrictionsRootOnly,
-		DoPrune:              false,
-		PluginConfig:         konfig.DisabledPluginConfig(),
-	}
-}

api/loader/loader.go

@@ -1,34 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package loader has a data loading interface and various implementations.
-package loader
-
-import (
-	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/api/internal/git"
-)
-
-// NewLoader returns a Loader pointed at the given target.
-// If the target is remote, the loader will be restricted
-// to the root and below only.  If the target is local, the
-// loader will have the restrictions passed in.  Regardless,
-// if a local target attempts to transitively load remote bases,
-// the remote bases will all be root-only restricted.
-func NewLoader(
-	lr LoadRestrictorFunc,
-	target string, fSys filesys.FileSystem) (ifc.Loader, error) {
-	repoSpec, err := git.NewRepoSpecFromUrl(target)
-	if err == nil {
-		// The target qualifies as a remote git target.
-		return newLoaderAtGitClone(
-			repoSpec, fSys, nil, git.ClonerUsingGitExec)
-	}
-	root, err := demandDirectoryRoot(fSys, target)
-	if err != nil {
-		return nil, err
-	}
-	return newLoaderAtConfirmedDir(
-		lr, root, fSys, nil, git.ClonerUsingGitExec), nil
-}

api/loader/loadrestrictions.go

@@ -1,35 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package loader
-
-import (
-	"fmt"
-
-	"sigs.k8s.io/kustomize/api/filesys"
-)
-
-type LoadRestrictorFunc func(
-	filesys.FileSystem, filesys.ConfirmedDir, string) (string, error)
-
-func RestrictionRootOnly(
-	fSys filesys.FileSystem, root filesys.ConfirmedDir, path string) (string, error) {
-	d, f, err := fSys.CleanedAbs(path)
-	if err != nil {
-		return "", err
-	}
-	if f == "" {
-		return "", fmt.Errorf("'%s' must be a file", path)
-	}
-	if !d.HasPrefix(root) {
-		return "", fmt.Errorf(
-			"security; file '%s' is not in or below '%s'",
-			path, root)
-	}
-	return d.Join(f), nil
-}
-
-func RestrictionNone(
-	_ filesys.FileSystem, _ filesys.ConfirmedDir, path string) (string, error) {
-	return path, nil
-}

api/main.go

@@ -1,19 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// A dummy main to help with releasing the kustomize API module.
-package main
-
-import (
-	"fmt"
-	"sigs.k8s.io/kustomize/api/provenance"
-)
-
-// TODO: delete this when we find a better way to generate release notes.
-func main() {
-	fmt.Println(`
-This 'main' exists only to make goreleaser create release notes for the API.
-See https://github.com/goreleaser/goreleaser/issues/981
-and https://github.com/kubernetes-sigs/kustomize/tree/master/releasing`)
-	fmt.Println(provenance.GetProvenance())
-}

api/transform/maptransformer.go

@@ -1,64 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package transform
-
-import (
-	"errors"
-	"fmt"
-
-	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-// mapTransformer applies a string->string map to fieldSpecs.
-type mapTransformer struct {
-	m          map[string]string
-	fieldSpecs []types.FieldSpec
-}
-
-var _ resmap.Transformer = &mapTransformer{}
-
-// NewMapTransformer construct a mapTransformer.
-func NewMapTransformer(
-	pc []types.FieldSpec, m map[string]string) (resmap.Transformer, error) {
-	if m == nil {
-		return newNoOpTransformer(), nil
-	}
-	if pc == nil {
-		return nil, errors.New("fieldSpecs is not expected to be nil")
-	}
-	return &mapTransformer{fieldSpecs: pc, m: m}, nil
-}
-
-// Transform apply each <key, value> pair in the mapTransformer to the
-// fields specified in mapTransformer.
-func (o *mapTransformer) Transform(m resmap.ResMap) error {
-	for _, r := range m.Resources() {
-		for _, path := range o.fieldSpecs {
-			if !r.OrgId().IsSelected(&path.Gvk) {
-				continue
-			}
-			err := MutateField(
-				r.Map(), path.PathSlice(),
-				path.CreateIfNotPresent, o.addMap)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (o *mapTransformer) addMap(in interface{}) (interface{}, error) {
-	m, ok := in.(map[string]interface{})
-	if in == nil {
-		m = map[string]interface{}{}
-	} else if !ok {
-		return nil, fmt.Errorf("%#v is expected to be %T", in, m)
-	}
-	for k, v := range o.m {
-		m[k] = v
-	}
-	return m, nil
-}

api/transform/nooptransformer.go

@@ -1,21 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package transform
-
-import "sigs.k8s.io/kustomize/api/resmap"
-
-// noOpTransformer contains a no-op transformer.
-type noOpTransformer struct{}
-
-var _ resmap.Transformer = &noOpTransformer{}
-
-// newNoOpTransformer constructs a noOpTransformer.
-func newNoOpTransformer() resmap.Transformer {
-	return &noOpTransformer{}
-}
-
-// Transform does nothing.
-func (o *noOpTransformer) Transform(_ resmap.ResMap) error {
-	return nil
-}

api/types/doc.go

@@ -1,9 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package types holds the definition of the kustomization struct and
-// supporting structs.  It's the k8s API conformant object that describes
-// a set of generation and transformation operations to create and/or
-// modify k8s resources.
-// A kustomization file is a serialization of this struct.
-package types

api/types/erronlybuiltinpluginsallowed.go

@@ -1,32 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-import (
-	"fmt"
-	"github.com/pkg/errors"
-)
-
-type errOnlyBuiltinPluginsAllowed struct {
-	name string
-}
-
-func (e *errOnlyBuiltinPluginsAllowed) Error() string {
-	return fmt.Sprintf(
-		"external plugins disabled; unable to load external plugin '%s'",
-		e.name)
-}
-
-func NewErrOnlyBuiltinPluginsAllowed(n string) *errOnlyBuiltinPluginsAllowed {
-	return &errOnlyBuiltinPluginsAllowed{name: n}
-}
-
-func IsErrOnlyBuiltinPluginsAllowed(err error) bool {
-	_, ok := err.(*errOnlyBuiltinPluginsAllowed)
-	if ok {
-		return true
-	}
-	_, ok = errors.Cause(err).(*errOnlyBuiltinPluginsAllowed)
-	return ok
-}

api/types/errunabletofind.go

@@ -1,40 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/pkg/errors"
-)
-
-type errUnableToFind struct {
-	// What are we unable to find?
-	what string
-	// What things did we try?
-	attempts []Pair
-}
-
-func (e *errUnableToFind) Error() string {
-	var m []string
-	for _, p := range e.attempts {
-		m = append(m, "('"+p.Value+"'; "+p.Key+")")
-	}
-	return fmt.Sprintf(
-		"unable to find plugin root - tried: %s", strings.Join(m, ", "))
-}
-
-func NewErrUnableToFind(w string, a []Pair) *errUnableToFind {
-	return &errUnableToFind{what: w, attempts: a}
-}
-
-func IsErrUnableToFind(err error) bool {
-	_, ok := err.(*errUnableToFind)
-	if ok {
-		return true
-	}
-	_, ok = errors.Cause(err).(*errUnableToFind)
-	return ok
-}

api/types/garbagepolicy.go

@@ -1,12 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-//go:generate stringer -type=GarbagePolicy
-type GarbagePolicy int
-
-const (
-	GarbageIgnore GarbagePolicy = iota + 1
-	GarbageCollect
-)

api/types/genargs_test.go

@@ -1,37 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types_test
-
-import (
-	"testing"
-
-	. "sigs.k8s.io/kustomize/api/types"
-)
-
-func TestGenArgs_String(t *testing.T) {
-	tests := []struct {
-		ga       *GenArgs
-		expected string
-	}{
-		{
-			ga:       nil,
-			expected: "{nilGenArgs}",
-		},
-		{
-			ga:       &GenArgs{},
-			expected: "{nsfx:false,beh:unspecified}",
-		},
-		{
-			ga: NewGenArgs(
-				&GeneratorArgs{Behavior: "merge"},
-				&GeneratorOptions{DisableNameSuffixHash: false}),
-			expected: "{nsfx:true,beh:merge}",
-		},
-	}
-	for _, test := range tests {
-		if test.ga.String() != test.expected {
-			t.Fatalf("Expected '%s', got '%s'", test.expected, test.ga.String())
-		}
-	}
-}

api/types/generatorargs.go

@@ -1,24 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// GeneratorArgs contains arguments common to ConfigMap and Secret generators.
-type GeneratorArgs struct {
-	// Namespace for the configmap, optional
-	Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
-
-	// Name - actually the partial name - of the generated resource.
-	// The full name ends up being something like
-	// NamePrefix + this.Name + hash(content of generated resource).
-	Name string `json:"name,omitempty" yaml:"name,omitempty"`
-
-	// Behavior of generated resource, must be one of:
-	//   'create': create a new one
-	//   'replace': replace the existing one
-	//   'merge': merge with the existing one
-	Behavior string `json:"behavior,omitempty" yaml:"behavior,omitempty"`
-
-	// KvPairSources for the generator.
-	KvPairSources `json:",inline,omitempty" yaml:",inline,omitempty"`
-}

api/types/inventory.go

@@ -1,16 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// Inventory records all objects touched in a build operation.
-type Inventory struct {
-	Type      string   `json:"type,omitempty" yaml:"type,omitempty"`
-	ConfigMap NameArgs `json:"configMap,omitempty" yaml:"configMap,omitempty"`
-}
-
-// NameArgs holds both namespace and name.
-type NameArgs struct {
-	Name      string `json:"name,omitempty" yaml:"name,omitempty"`
-	Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
-}

api/types/loadrestrictions.go

@@ -1,24 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// Restrictions on what things can be referred to
-// in a kustomization file.
-//
-//go:generate stringer -type=LoadRestrictions
-type LoadRestrictions int
-
-const (
-	LoadRestrictionsUnknown LoadRestrictions = iota
-
-	// Files referenced by a kustomization file must be in
-	// or under the directory holding the kustomization
-	// file itself.
-	LoadRestrictionsRootOnly
-
-	// The kustomization file may specify absolute or
-	// relative paths to patch or resources files outside
-	// its own tree.
-	LoadRestrictionsNone
-)

api/types/loadrestrictions_string.go

@@ -1,25 +0,0 @@
-// Code generated by "stringer -type=LoadRestrictions"; DO NOT EDIT.
-
-package types
-
-import "strconv"
-
-func _() {
-	// An "invalid array index" compiler error signifies that the constant values have changed.
-	// Re-run the stringer command to generate them again.
-	var x [1]struct{}
-	_ = x[LoadRestrictionsUnknown-0]
-	_ = x[LoadRestrictionsRootOnly-1]
-	_ = x[LoadRestrictionsNone-2]
-}
-
-const _LoadRestrictions_name = "LoadRestrictionsUnknownLoadRestrictionsRootOnlyLoadRestrictionsNone"
-
-var _LoadRestrictions_index = [...]uint8{0, 23, 47, 67}
-
-func (i LoadRestrictions) String() string {
-	if i < 0 || i >= LoadRestrictions(len(_LoadRestrictions_index)-1) {
-		return "LoadRestrictions(" + strconv.FormatInt(int64(i), 10) + ")"
-	}
-	return _LoadRestrictions_name[_LoadRestrictions_index[i]:_LoadRestrictions_index[i+1]]
-}

api/types/pair.go

@@ -1,10 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// Pair is a key value pair.
-type Pair struct {
-	Key   string
-	Value string
-}

api/types/patch.go

@@ -1,19 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// Patch represent either a Strategic Merge Patch or a JSON patch
-// and its targets.
-// The content of the patch can either be from a file
-// or from an inline string.
-type Patch struct {
-	// Path is a relative file path to the patch file.
-	Path string `json:"path,omitempty" yaml:"path,omitempty"`
-
-	// Patch is the content of a patch.
-	Patch string `json:"patch,omitempty" yaml:"patch,omitempty"`
-
-	// Target points to the resources that the patch is applied to
-	Target *Selector `json:"target,omitempty" yaml:"target,omitempty"`
-}

api/types/patchjson6902.go

@@ -1,21 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// PatchJson6902 represents a json patch for an object
-// with format documented https://tools.ietf.org/html/rfc6902.
-type PatchJson6902 struct {
-	// PatchTarget refers to a Kubernetes object that the json patch will be
-	// applied to. It must refer to a Kubernetes resource under the
-	// purview of this kustomization. PatchTarget should use the
-	// raw name of the object (the name specified in its YAML,
-	// before addition of a namePrefix and a nameSuffix).
-	Target *PatchTarget `json:"target" yaml:"target"`
-
-	// relative file path for a json patch file inside a kustomization
-	Path string `json:"path,omitempty" yaml:"path,omitempty"`
-
-	// inline patch string
-	Patch string `json:"patch,omitempty" yaml:"patch,omitempty"`
-}

api/types/pluginconfig.go

@@ -1,31 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// PluginConfig holds plugin configuration.
-type PluginConfig struct {
-	// AbsPluginHome is the home of kustomize plugins.
-	// Kustomize plugin configuration files are k8s-style objects
-	// containing the fields 'apiVersion' and 'kind', e.g.
-	//   apiVersion: apps/v1
-	//   kind: Deployment
-	// When kustomize reads a plugin configuration file (as as result
-	// of seeing the file name in the 'generators:' or 'transformers:'
-	// field in a kustomization file), it must then locate the plugin
-	// code (Go plugin or exec plugin).
-	// Every kustomize plugin (its code, its tests, supporting data
-	// files, etc.) must be housed in its own directory at
-	//   ${AbsPluginHome}/${pluginApiVersion}/LOWERCASE(${pluginKind})
-	// where
-	//   - ${AbsPluginHome} is an absolute path, defined below.
-	//   - ${pluginApiVersion} is taken from the plugin config file.
-	//   - ${pluginKind} is taken from the plugin config file.
-	// The value of AbsPluginHome can be any absolute path, but might
-	// default to $XDG_CONFIG_HOME/kustomize/plugin.
-	AbsPluginHome string
-
-	// PluginRestrictions defines the plugin restriction state.
-	// See type for more information.
-	PluginRestrictions PluginRestrictions
-}

api/types/pluginrestrictions.go

@@ -1,28 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// Some plugin classes
-// - builtin: plugins defined in the kustomize repo.
-//   May be freely used and re-configured.
-// - local: plugins that aren't builtin but are
-//   locally defined (presumably by the user), meaning
-//   the kustomization refers to them via a relative
-//   file path, not a URL.
-// - remote: require a build-time download to obtain.
-//   Unadvised, unless one controls the
-//   serving site.
-//
-//go:generate stringer -type=PluginRestrictions
-type PluginRestrictions int
-
-const (
-	PluginRestrictionsUnknown PluginRestrictions = iota
-
-	// Non-builtin plugins completely disabled.
-	PluginRestrictionsBuiltinsOnly
-
-	// No restrictions, do whatever you want.
-	PluginRestrictionsNone
-)

api/types/pluginrestrictions_string.go

@@ -1,25 +0,0 @@
-// Code generated by "stringer -type=PluginRestrictions"; DO NOT EDIT.
-
-package types
-
-import "strconv"
-
-func _() {
-	// An "invalid array index" compiler error signifies that the constant values have changed.
-	// Re-run the stringer command to generate them again.
-	var x [1]struct{}
-	_ = x[PluginRestrictionsUnknown-0]
-	_ = x[PluginRestrictionsBuiltinsOnly-1]
-	_ = x[PluginRestrictionsNone-2]
-}
-
-const _PluginRestrictions_name = "PluginRestrictionsUnknownPluginRestrictionsBuiltinsOnlyPluginRestrictionsNone"
-
-var _PluginRestrictions_index = [...]uint8{0, 25, 55, 77}
-
-func (i PluginRestrictions) String() string {
-	if i < 0 || i >= PluginRestrictions(len(_PluginRestrictions_index)-1) {
-		return "PluginRestrictions(" + strconv.FormatInt(int64(i), 10) + ")"
-	}
-	return _PluginRestrictions_name[_PluginRestrictions_index[i]:_PluginRestrictions_index[i+1]]
-}

api/types/typemeta.go

@@ -1,11 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// TypeMeta partially copies apimachinery/pkg/apis/meta/v1.TypeMeta
-// No need for a direct dependence; the fields are stable.
-type TypeMeta struct {
-	Kind       string `json:"kind,omitempty" yaml:"kind,omitempty"`
-	APIVersion string `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty"`
-}

cmd/kyaml/.golangci.yml

@@ -1,54 +0,0 @@
-# Copyright 2019 The Kubernetes Authors.
-# SPDX-License-Identifier: Apache-2.0
-
-run:
-  deadline: 5m
-
-linters:
-  # please, do not use `enable-all`: it's deprecated and will be removed soon.
-  # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
-  disable-all: true
-  enable:
-    - bodyclose
-    - deadcode
-    - depguard
-    - dogsled
-    - dupl
-#    - errcheck
-#    - funlen
-#    - gochecknoinits
-#    - goconst
-#    - gocritic
-    - gocyclo
-    - gofmt
-    - goimports
-#    - golint
-    - gosec
-    - gosimple
-    - govet
-    - ineffassign
-    - interfacer
-#    - lll
-    - misspell
-    - nakedret
-#    - scopelint
-    - staticcheck
-    - structcheck
-#    - stylecheck
-    - typecheck
-    - unconvert
-#    - unparam
-    - unused
-    - varcheck
-#    - whitespace
-
-
-linters-settings:
-  dupl:
-    threshold: 400
-  lll:
-    line-length: 170
-  gocyclo:
-    min-complexity: 30
-  golint:
-    min-confidence: 0.85

cmd/kyaml/LICENSE_TEMPLATE

@@ -1,2 +0,0 @@
-Copyright {{.Year}} {{.Holder}}
-SPDX-License-Identifier: Apache-2.0

cmd/kyaml/Makefile

@@ -1,38 +0,0 @@
-# Copyright 2019 The Kubernetes Authors.
-# SPDX-License-Identifier: Apache-2.0
-
-.PHONY: generate license fix vet fmt test build tidy
-
-GOPATH := $(shell go env GOPATH)
-
-build:
-	go build -v -o $(GOPATH)/bin/kyaml .
-
-all: generate license fix vet fmt test lint tidy
-
-fix:
-	go fix ./...
-
-fmt:
-	go fmt ./...
-
-generate:
-	go generate ./...
-
-license:
-	(which $(GOPATH)/bin/addlicense || go get github.com/google/addlicense)
-	$(GOPATH)/bin/addlicense  -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
-
-tidy:
-	go mod tidy
-
-lint:
-	(which $(GOPATH)/bin/golangci-lint || go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.19.1)
-	$(GOPATH)/bin/golangci-lint run ./...
-
-test:
-	go test -cover ./...
-
-vet:
-	go vet ./...
-

cmd/kyaml/README.md

@@ -1,4 +0,0 @@
-# cmd/kyaml
-
-This package exists to expose kyaml filters directly as cli commands for the purposes
-of development of the kyaml package and as a reference implementation for using the libraries.

cmd/kyaml/cmd/cat.go

@@ -1,130 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package cmd
-
-import (
-	"fmt"
-
-	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/kio/filters"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// GetCatRunner returns a command CatRunner.
-func GetCatRunner() *CatRunner {
-	r := &CatRunner{}
-	c := &cobra.Command{
-		Use:   "cat DIR...",
-		Short: "Print Resource Config from a local directory",
-		Long: `Print Resource Config from a local directory.
-
-  DIR:
-    Path to local directory.
-`,
-		Example: `# print Resource config from a directory
-kyaml cat my-dir/
-
-# wrap Resource config from a directory in an ResourceList
-kyaml cat my-dir/ --wrap-kind ResourceList --wrap-version kyaml.kustomize.dev/v1alpha1 --function-config fn.yaml
-
-# unwrap Resource config from a directory in an ResourceList
-... | kyaml cat
-`,
-		RunE: r.runE,
-	}
-	c.Flags().BoolVar(&r.IncludeSubpackages, "include-subpackages", true,
-		"also print resources from subpackages.")
-	c.Flags().BoolVar(&r.Format, "format", true,
-		"format resource config yaml before printing.")
-	c.Flags().BoolVar(&r.KeepAnnotations, "annotate", false,
-		"annotate resources with their file origins.")
-	c.Flags().StringVar(&r.WrapKind, "wrap-kind", "",
-		"if set, wrap the output in this list type kind.")
-	c.Flags().StringVar(&r.WrapApiVersion, "wrap-version", "",
-		"if set, wrap the output in this list type apiVersion.")
-	c.Flags().StringVar(&r.FunctionConfig, "function-config", "",
-		"path to function config to put in ResourceList -- only if wrapped in a ResourceList.")
-	c.Flags().StringSliceVar(&r.Styles, "style", []string{},
-		"yaml styles to apply.  may be 'TaggedStyle', 'DoubleQuotedStyle', 'LiteralStyle', "+
-			"'FoldedStyle', 'FlowStyle'.")
-	c.Flags().BoolVar(&r.StripComments, "strip-comments", false,
-		"remove comments from yaml.")
-	c.Flags().BoolVar(&r.IncludeReconcilers, "include-reconcilers", false,
-		"if true, include reconciler Resources in the output.")
-	c.Flags().BoolVar(&r.ExcludeNonReconcilers, "exclude-non-reconcilers", false,
-		"if true, exclude non-reconciler Resources in the output.")
-	r.Command = c
-	return r
-}
-
-func CatCommand() *cobra.Command {
-	return GetCatRunner().Command
-}
-
-// CatRunner contains the run function
-type CatRunner struct {
-	IncludeSubpackages    bool
-	Format                bool
-	KeepAnnotations       bool
-	WrapKind              string
-	WrapApiVersion        string
-	FunctionConfig        string
-	Styles                []string
-	StripComments         bool
-	IncludeReconcilers    bool
-	ExcludeNonReconcilers bool
-	Command               *cobra.Command
-}
-
-func (r *CatRunner) runE(c *cobra.Command, args []string) error {
-	// if there is a function-config specified, emit it
-	var functionConfig *yaml.RNode
-	if r.FunctionConfig != "" {
-		configs, err := kio.LocalPackageReader{PackagePath: r.FunctionConfig,
-			OmitReaderAnnotations: !r.KeepAnnotations}.Read()
-		if err != nil {
-			return err
-		}
-		if len(configs) != 1 {
-			return fmt.Errorf("expected exactly 1 functionConfig, found %d", len(configs))
-		}
-		functionConfig = configs[0]
-	}
-
-	var inputs []kio.Reader
-	for _, a := range args {
-		inputs = append(inputs, kio.LocalPackageReader{
-			PackagePath:        a,
-			IncludeSubpackages: r.IncludeSubpackages,
-		})
-	}
-	if len(inputs) == 0 {
-		inputs = append(inputs, &kio.ByteReader{Reader: c.InOrStdin()})
-	}
-	var fltr []kio.Filter
-	// don't include reconcilers
-	fltr = append(fltr, &filters.IsReconcilerFilter{
-		ExcludeReconcilers:    !r.IncludeReconcilers,
-		IncludeNonReconcilers: !r.ExcludeNonReconcilers,
-	})
-	if r.Format {
-		fltr = append(fltr, filters.FormatFilter{})
-	}
-	if r.StripComments {
-		fltr = append(fltr, filters.StripCommentsFilter{})
-	}
-
-	var outputs []kio.Writer
-	outputs = append(outputs, kio.ByteWriter{
-		Writer:                c.OutOrStdout(),
-		KeepReaderAnnotations: r.KeepAnnotations,
-		WrappingKind:          r.WrapKind,
-		WrappingApiVersion:    r.WrapApiVersion,
-		FunctionConfig:        functionConfig,
-		Style:                 yaml.GetStyle(r.Styles...),
-	})
-
-	return kio.Pipeline{Inputs: inputs, Filters: fltr, Outputs: outputs}.Execute()
-}

cmd/kyaml/cmd/cat_test.go

@@ -1,304 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package cmd_test
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/cmd/kyaml/cmd"
-)
-
-// TODO(pwittrock): write tests for reading / writing ResourceLists
-
-func TestCmd_files(t *testing.T) {
-	d, err := ioutil.TempDir("", "kustomize-cat-test")
-	if !assert.NoError(t, err) {
-		return
-	}
-	defer os.RemoveAll(d)
-
-	err = ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-spec:
-  selector:
-    app: nginx
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
-apiVersion: gcr.io/example/image:version
-kind: Abstraction
-metadata:
-  name: foo
-spec:
-  replicas: 3
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-spec:
-  replicas: 3
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// fmt the files
-	b := &bytes.Buffer{}
-	r := cmd.GetCatRunner()
-	r.Command.SetArgs([]string{d})
-	r.Command.SetOut(b)
-	if !assert.NoError(t, r.Command.Execute()) {
-		return
-	}
-
-	if !assert.Equal(t, `kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f1.yaml
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f1.yaml
-spec:
-  selector:
-    app: nginx
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: bar
-  labels:
-    app: nginx
-  annotations:
-    app: nginx
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f2.yaml
-spec:
-  replicas: 3
-`, b.String()) {
-		return
-	}
-}
-
-func TestCmd_filesWithReconcilers(t *testing.T) {
-	d, err := ioutil.TempDir("", "kustomize-cat-test")
-	if !assert.NoError(t, err) {
-		return
-	}
-	defer os.RemoveAll(d)
-
-	err = ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-spec:
-  selector:
-    app: nginx
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
-apiVersion: gcr.io/example/image:version
-kind: Abstraction
-metadata:
-  name: foo
-spec:
-  replicas: 3
----
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-spec:
-  replicas: 3
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// fmt the files
-	b := &bytes.Buffer{}
-	r := cmd.GetCatRunner()
-	r.Command.SetArgs([]string{d, "--include-reconcilers"})
-	r.Command.SetOut(b)
-	if !assert.NoError(t, r.Command.Execute()) {
-		return
-	}
-
-	if !assert.Equal(t, `kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f1.yaml
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f1.yaml
-spec:
-  selector:
-    app: nginx
----
-apiVersion: gcr.io/example/image:version
-kind: Abstraction
-metadata:
-  name: foo
-  annotations:
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f2.yaml
-spec:
-  replicas: 3
----
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f2.yaml
-spec:
-  replicas: 3
-`, b.String()) {
-		return
-	}
-}
-
-func TestCmd_filesWithoutNonReconcilers(t *testing.T) {
-	d, err := ioutil.TempDir("", "kustomize-cat-test")
-	if !assert.NoError(t, err) {
-		return
-	}
-	defer os.RemoveAll(d)
-
-	err = ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-spec:
-  selector:
-    app: nginx
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
-apiVersion: gcr.io/example/image:version
-kind: Abstraction
-metadata:
-  name: foo
-spec:
-  replicas: 3
----
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-spec:
-  replicas: 3
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// fmt the files
-	b := &bytes.Buffer{}
-	r := cmd.GetCatRunner()
-	r.Command.SetArgs([]string{d, "--include-reconcilers", "--exclude-non-reconcilers"})
-	r.Command.SetOut(b)
-	if !assert.NoError(t, r.Command.Execute()) {
-		return
-	}
-
-	if !assert.Equal(t, `apiVersion: gcr.io/example/image:version
-kind: Abstraction
-metadata:
-  name: foo
-  annotations:
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f2.yaml
-spec:
-  replicas: 3
-`, b.String()) {
-		return
-	}
-}

cmd/kyaml/cmd/count.go

@@ -1,92 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-//
-package cmd
-
-import (
-	"fmt"
-	"sort"
-
-	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/sets"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-func GetCountRunner() *CountRunner {
-	r := &CountRunner{}
-	c := &cobra.Command{
-		Use:   "count DIR...",
-		Short: "Count Resources Config from a local directory",
-		Long: `Count Resources Config from a local directory.
-
-  DIR:
-    Path to local directory.
-`,
-		Example: `# print Resource counts from a directory
-kyaml count my-dir/
-`,
-		RunE: r.runE,
-	}
-	c.Flags().BoolVar(&r.IncludeSubpackages, "include-subpackages", true,
-		"also print resources from subpackages.")
-	c.Flags().BoolVar(&r.Kind, "kind", true,
-		"count resources by kind.")
-
-	r.Command = c
-	return r
-}
-
-func CountCommand() *cobra.Command {
-	return GetCountRunner().Command
-}
-
-// CountRunner contains the run function
-type CountRunner struct {
-	IncludeSubpackages bool
-	Kind               bool
-	Command            *cobra.Command
-}
-
-func (r *CountRunner) runE(c *cobra.Command, args []string) error {
-	var inputs []kio.Reader
-	for _, a := range args {
-		inputs = append(inputs, kio.LocalPackageReader{
-			PackagePath:        a,
-			IncludeSubpackages: r.IncludeSubpackages,
-		})
-	}
-	if len(inputs) == 0 {
-		inputs = append(inputs, &kio.ByteReader{Reader: c.InOrStdin()})
-	}
-
-	var out []kio.Writer
-	if r.Kind {
-		out = append(out, kio.WriterFunc(func(nodes []*yaml.RNode) error {
-			count := map[string]int{}
-			k := sets.String{}
-			for _, n := range nodes {
-				m, _ := n.GetMeta()
-				count[m.Kind]++
-				k.Insert(m.Kind)
-			}
-			order := k.List()
-			sort.Strings(order)
-			for _, k := range order {
-				fmt.Fprintf(c.OutOrStdout(), "%s: %d\n", k, count[k])
-			}
-
-			return nil
-		}))
-
-	} else {
-		out = append(out, kio.WriterFunc(func(nodes []*yaml.RNode) error {
-			fmt.Fprintf(c.OutOrStdout(), "%d\n", len(nodes))
-			return nil
-		}))
-	}
-	return kio.Pipeline{
-		Inputs:  inputs,
-		Outputs: out,
-	}.Execute()
-}

cmd/kyaml/cmd/count_test.go

@@ -1,73 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package cmd_test
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/cmd/kyaml/cmd"
-)
-
-func TestCountCommand_files(t *testing.T) {
-	d, err := ioutil.TempDir("", "kustomize-count-test")
-	if !assert.NoError(t, err) {
-		return
-	}
-	defer os.RemoveAll(d)
-
-	err = ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-spec:
-  selector:
-    app: nginx
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-spec:
-  replicas: 3
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// fmt the files
-	b := &bytes.Buffer{}
-	r := cmd.GetCountRunner()
-	r.Command.SetArgs([]string{d})
-	r.Command.SetOut(b)
-	if !assert.NoError(t, r.Command.Execute()) {
-		return
-	}
-
-	if !assert.Equal(t, "Deployment: 2\nService: 1\n", b.String()) {
-		return
-	}
-}

cmd/kyaml/cmd/fmt.go

@@ -1,127 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package cmd
-
-import (
-	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/kio/filters"
-)
-
-// FmtCmd returns a command FmtRunner.
-func GetFmtRunner() *FmtRunner {
-	r := &FmtRunner{}
-	c := &cobra.Command{
-		Use:   "fmt",
-		Short: "Format yaml configuration files",
-		Long: `Format yaml configuration files
-
-Fmt will format input by ordering fields and unordered list items in Kubernetes
-objects.  Inputs may be directories, files or stdin, and their contents must
-include both apiVersion and kind fields.
-
-- Stdin inputs are formatted and written to stdout
-- File inputs (args) are formatted and written back to the file
-- Directory inputs (args) are walked, each encountered .yaml and .yml file
-  acts as an input
-
-For inputs which contain multiple yaml documents separated by \n---\n,
-each document will be formatted and written back to the file in the original
-order.
-
-Field ordering roughly follows the ordering defined in the source Kubernetes
-resource definitions (i.e. go structures), falling back on lexicographical
-sorting for unrecognized fields.
-
-Unordered list item ordering is defined for specific Resource types and
-field paths.
-
-- .spec.template.spec.containers (by element name)
-- .webhooks.rules.operations (by element value)
-`,
-		Example: `
-	# format file1.yaml and file2.yml
-	kyaml fmt file1.yaml file2.yml
-
-	# format all *.yaml and *.yml recursively traversing directories
-	kyaml fmt my-dir/
-
-	# format kubectl output
-	kubectl get -o yaml deployments | kyaml fmt
-
-	# format kustomize output
-	kustomize build | kyaml fmt
-`,
-		RunE:    r.runE,
-		PreRunE: r.preRunE,
-	}
-	c.Flags().StringVar(&r.FilenamePattern, "pattern", filters.DefaultFilenamePattern,
-		`pattern to use for generating filenames for resources -- may contain the following
-formatting substitution verbs {'%n': 'metadata.name', '%s': 'metadata.namespace', '%k': 'kind'}`)
-	c.Flags().BoolVar(&r.SetFilenames, "set-filenames", false,
-		`if true, set default filenames on Resources without them`)
-	c.Flags().BoolVar(&r.KeepAnnotations, "keep-annotations", false,
-		`if true, keep index and filename annotations set on Resources.`)
-	c.Flags().BoolVar(&r.Override, "override", false,
-		`if true, override existing filepath annotations.`)
-	r.Command = c
-	return r
-}
-
-func FmtCommand() *cobra.Command {
-	return GetFmtRunner().Command
-}
-
-// FmtRunner contains the run function
-type FmtRunner struct {
-	Command         *cobra.Command
-	FilenamePattern string
-	SetFilenames    bool
-	KeepAnnotations bool
-	Override        bool
-}
-
-func (r *FmtRunner) preRunE(c *cobra.Command, args []string) error {
-	if r.SetFilenames {
-		r.KeepAnnotations = true
-	}
-	return nil
-}
-
-func (r *FmtRunner) runE(c *cobra.Command, args []string) error {
-	f := []kio.Filter{filters.FormatFilter{}}
-
-	// format with file names
-	if r.SetFilenames {
-		f = append(f, &filters.FileSetter{
-			FilenamePattern: r.FilenamePattern,
-			Override:        r.Override,
-		})
-	}
-
-	// format stdin if there are no args
-	if len(args) == 0 {
-		rw := &kio.ByteReadWriter{
-			Reader:                c.InOrStdin(),
-			Writer:                c.OutOrStdout(),
-			KeepReaderAnnotations: r.KeepAnnotations,
-		}
-		return kio.Pipeline{
-			Inputs: []kio.Reader{rw}, Filters: f, Outputs: []kio.Writer{rw}}.Execute()
-	}
-
-	for i := range args {
-		path := args[i]
-		rw := &kio.LocalPackageReadWriter{
-			NoDeleteFiles:         true,
-			PackagePath:           path,
-			KeepReaderAnnotations: r.KeepAnnotations}
-		err := kio.Pipeline{
-			Inputs: []kio.Reader{rw}, Filters: f, Outputs: []kio.Writer{rw}}.Execute()
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}

cmd/kyaml/cmd/fmt_test.go

@@ -1,162 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package cmd_test
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/cmd/kyaml/cmd"
-	"sigs.k8s.io/kustomize/kyaml/kio/filters/testyaml"
-)
-
-// TestCmd_files verifies the fmt command formats the files
-func TestFmtCommand_files(t *testing.T) {
-	f1, err := ioutil.TempFile("", "cmdfmt*.yaml")
-	if !assert.NoError(t, err) {
-		return
-	}
-	defer os.RemoveAll(f1.Name())
-	err = ioutil.WriteFile(f1.Name(), testyaml.UnformattedYaml1, 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	f2, err := ioutil.TempFile("", "cmdfmt*.yaml")
-	if !assert.NoError(t, err) {
-		return
-	}
-	defer os.RemoveAll(f2.Name())
-	err = ioutil.WriteFile(f2.Name(), testyaml.UnformattedYaml2, 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// fmt the files
-	r := cmd.GetFmtRunner()
-	r.Command.SetArgs([]string{f1.Name(), f2.Name()})
-	err = r.Command.Execute()
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// verify the contents
-	b, err := ioutil.ReadFile(f1.Name())
-	if !assert.NoError(t, err) {
-		return
-	}
-	if !assert.Equal(t, string(testyaml.FormattedYaml1), string(b)) {
-		return
-	}
-
-	b, err = ioutil.ReadFile(f2.Name())
-	if !assert.NoError(t, err) {
-		return
-	}
-	if !assert.Equal(t, string(testyaml.FormattedYaml2), string(b)) {
-		return
-	}
-}
-
-func TestFmtCommand_stdin(t *testing.T) {
-	out := &bytes.Buffer{}
-	r := cmd.GetFmtRunner()
-	r.Command.SetOut(out)
-	r.Command.SetIn(bytes.NewReader(testyaml.UnformattedYaml1))
-
-	// fmt the input
-	err := r.Command.Execute()
-	assert.NoError(t, err)
-
-	// verify the output
-	assert.Equal(t, string(testyaml.FormattedYaml1), out.String())
-}
-
-// TestCmd_filesAndstdin verifies that if both files and stdin input are provided, only
-// the files are formatted and the input is ignored
-func TestFmtCmd_filesAndStdin(t *testing.T) {
-	f1, err := ioutil.TempFile("", "cmdfmt*.yaml")
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = ioutil.WriteFile(f1.Name(), testyaml.UnformattedYaml1, 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	f2, err := ioutil.TempFile("", "cmdfmt*.yaml")
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = ioutil.WriteFile(f2.Name(), testyaml.UnformattedYaml2, 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	out := &bytes.Buffer{}
-	in := &bytes.Buffer{}
-	r := cmd.GetFmtRunner()
-	r.Command.SetOut(out)
-	r.Command.SetIn(in)
-
-	// fmt the files
-	r = cmd.GetFmtRunner()
-	r.Command.SetArgs([]string{f1.Name(), f2.Name()})
-	err = r.Command.Execute()
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// verify the output
-	b, err := ioutil.ReadFile(f1.Name())
-	if !assert.NoError(t, err) {
-		return
-	}
-	if !assert.Equal(t, string(testyaml.FormattedYaml1), string(b)) {
-		return
-	}
-
-	b, err = ioutil.ReadFile(f2.Name())
-	if !assert.NoError(t, err) {
-		return
-	}
-	if !assert.Equal(t, string(testyaml.FormattedYaml2), string(b)) {
-		return
-	}
-	err = r.Command.Execute()
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	if !assert.Equal(t, "", out.String()) {
-		return
-	}
-}
-
-// TestCmd_files verifies the fmt command formats the files
-func TestCmd_failFiles(t *testing.T) {
-	// fmt the files
-	r := cmd.GetFmtRunner()
-	r.Command.SetArgs([]string{"notrealfile"})
-	err := r.Command.Execute()
-	assert.EqualError(t, err, "lstat notrealfile: no such file or directory")
-}
-
-// TestCmd_files verifies the fmt command formats the files
-func TestCmd_failFileContents(t *testing.T) {
-	out := &bytes.Buffer{}
-	r := cmd.GetFmtRunner()
-	r.Command.SetOut(out)
-	r.Command.SetIn(strings.NewReader(`{`))
-
-	// fmt the input
-	err := r.Command.Execute()
-
-	// expect an error
-	assert.EqualError(t, err, "yaml: line 1: did not find expected node content")
-}

cmd/kyaml/cmd/grep.go

@@ -1,144 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-//
-package cmd
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/pseudo/k8s/apimachinery/pkg/api/resource"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/kio/filters"
-)
-
-// Cmd returns a command GrepRunner.
-func GetGrepRunner() *GrepRunner {
-	r := &GrepRunner{}
-	c := &cobra.Command{
-		Use:   "grep QUERY [DIR]...",
-		Short: "Search for matching Resources in a directory or from stdin",
-		Long: `Search for matching Resources in a directory or from stdin.
-  QUERY:
-    Query to match expressed as 'path.to.field=value'.
-    Maps and fields are matched as '.field-name' or '.map-key'
-    List elements are matched as '[list-elem-field=field-value]'
-    The value to match is expressed as '=value'
-    '.' as part of a key or value can be escaped as '\.'
-
-  DIR:
-    Path to local directory.
-`,
-		Example: `# find Deployment Resources
-kyaml grep "kind=Deployment" my-dir/
-
-# find Resources named nginx
-kyaml grep "metadata.name=nginx" my-dir/
-
-# use tree to display matching Resources
-kyaml grep "metadata.name=nginx" my-dir/ | kyaml tree
-
-# look for Resources matching a specific container image
-kyaml grep "spec.template.spec.containers[name=nginx].image=nginx:1\.7\.9" my-dir/ | kyaml tree
-`,
-		PreRunE: r.preRunE,
-		RunE:    r.runE,
-		Args:    cobra.MinimumNArgs(1),
-	}
-	c.Flags().BoolVar(&r.IncludeSubpackages, "include-subpackages", true,
-		"also print resources from subpackages.")
-	c.Flags().BoolVar(&r.KeepAnnotations, "annotate", true,
-		"annotate resources with their file origins.")
-	c.Flags().BoolVarP(&r.InvertMatch, "invert-match", "v", false,
-		" Selected Resources are those not matching any of the specified patterns..")
-
-	r.Command = c
-	return r
-}
-
-func GrepCommand() *cobra.Command {
-	return GetGrepRunner().Command
-}
-
-// GrepRunner contains the run function
-type GrepRunner struct {
-	IncludeSubpackages bool
-	KeepAnnotations    bool
-	Command            *cobra.Command
-	filters.GrepFilter
-	Format bool
-}
-
-func (r *GrepRunner) preRunE(c *cobra.Command, args []string) error {
-	r.GrepFilter.Compare = func(a, b string) (int, error) {
-		qa, err := resource.ParseQuantity(a)
-		if err != nil {
-			return 0, fmt.Errorf("%s: %v", a, err)
-		}
-		qb, err := resource.ParseQuantity(b)
-		if err != nil {
-			return 0, err
-		}
-
-		return qa.Cmp(qb), err
-	}
-	parts, err := parseFieldPath(args[0])
-	if err != nil {
-		return err
-	}
-
-	var last []string
-	if strings.Contains(parts[len(parts)-1], ">=") {
-		last = strings.Split(parts[len(parts)-1], ">=")
-		r.MatchType = filters.GreaterThanEq
-	} else if strings.Contains(parts[len(parts)-1], "<=") {
-		last = strings.Split(parts[len(parts)-1], "<=")
-		r.MatchType = filters.LessThanEq
-	} else if strings.Contains(parts[len(parts)-1], ">") {
-		last = strings.Split(parts[len(parts)-1], ">")
-		r.MatchType = filters.GreaterThan
-	} else if strings.Contains(parts[len(parts)-1], "<") {
-		last = strings.Split(parts[len(parts)-1], "<")
-		r.MatchType = filters.LessThan
-	} else {
-		last = strings.Split(parts[len(parts)-1], "=")
-		r.MatchType = filters.Regexp
-	}
-	if len(last) > 2 {
-		return fmt.Errorf(
-			"ambiguous match -- multiple of ['<', '>', '<=', '>=', '=' in final path element: %s",
-			parts[len(parts)-1])
-	}
-
-	if len(last) > 1 {
-		r.Value = last[1]
-	}
-
-	r.Path = append(parts[:len(parts)-1], last[0])
-	return nil
-}
-
-func (r *GrepRunner) runE(c *cobra.Command, args []string) error {
-	var filters = []kio.Filter{r.GrepFilter}
-
-	var inputs []kio.Reader
-	for _, a := range args[1:] {
-		inputs = append(inputs, kio.LocalPackageReader{
-			PackagePath:        a,
-			IncludeSubpackages: r.IncludeSubpackages,
-		})
-	}
-	if len(inputs) == 0 {
-		inputs = append(inputs, &kio.ByteReader{Reader: c.InOrStdin()})
-	}
-
-	return kio.Pipeline{
-		Inputs:  inputs,
-		Filters: filters,
-		Outputs: []kio.Writer{kio.ByteWriter{
-			Writer:                c.OutOrStdout(),
-			KeepReaderAnnotations: r.KeepAnnotations,
-		}},
-	}.Execute()
-}

cmd/kyaml/cmd/grep_test.go

@@ -1,272 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package cmd_test
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/cmd/kyaml/cmd"
-)
-
-// TestGrepCommand_files verifies grep reads the files and filters them
-func TestGrepCommand_files(t *testing.T) {
-	d, err := ioutil.TempDir("", "kustomize-kyaml-test")
-	if !assert.NoError(t, err) {
-		return
-	}
-	defer os.RemoveAll(d)
-
-	err = ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-spec:
-  selector:
-    app: nginx
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-spec:
-  replicas: 3
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// fmt the files
-	b := &bytes.Buffer{}
-	r := cmd.GetGrepRunner()
-	r.Command.SetArgs([]string{"metadata.name=foo", d})
-	r.Command.SetOut(b)
-	if !assert.NoError(t, r.Command.Execute()) {
-		return
-	}
-
-	if !assert.Equal(t, `kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-    config.kubernetes.io/index: 0
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f1.yaml
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-    config.kubernetes.io/index: 1
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f1.yaml
-spec:
-  selector:
-    app: nginx
-`, b.String()) {
-		return
-	}
-}
-
-// TestCmd_stdin verifies the grep command reads stdin if no files are provided
-func TestGrepCmd_stdin(t *testing.T) {
-	// fmt the files
-	b := &bytes.Buffer{}
-	r := cmd.GetGrepRunner()
-	r.Command.SetArgs([]string{"metadata.name=foo"})
-	r.Command.SetOut(b)
-	r.Command.SetIn(bytes.NewBufferString(`
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-spec:
-  selector:
-    app: nginx
----
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-spec:
-  replicas: 3
-`))
-	if !assert.NoError(t, r.Command.Execute()) {
-		return
-	}
-
-	if !assert.Equal(t, `kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-    config.kubernetes.io/index: 0
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-    config.kubernetes.io/index: 1
-spec:
-  selector:
-    app: nginx
-`, b.String()) {
-		return
-	}
-}
-
-// TestGrepCmd_errInputs verifies the grep command errors on invalid matches
-func TestGrepCmd_errInputs(t *testing.T) {
-	b := &bytes.Buffer{}
-	r := cmd.GetGrepRunner()
-	r.Command.SetArgs([]string{"metadata.name=foo=bar"})
-	r.Command.SetOut(b)
-	r.Command.SetIn(bytes.NewBufferString(`
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-spec:
-  replicas: 1
-`))
-	err := r.Command.Execute()
-	if !assert.Error(t, err) {
-		return
-	}
-	assert.Contains(t, err.Error(), "ambiguous match")
-
-	// fmt the files
-	b = &bytes.Buffer{}
-	r = cmd.GetGrepRunner()
-	r.Command.SetArgs([]string{"spec.template.spec.containers[a[b=c].image=foo"})
-	r.Command.SetOut(b)
-	r.Command.SetIn(bytes.NewBufferString(`
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-spec:
-  replicas: 1
-`))
-	err = r.Command.Execute()
-	if !assert.Error(t, err) {
-		return
-	}
-	assert.Contains(t, err.Error(), "unrecognized path element:")
-}
-
-// TestGrepCommand_escapeDots verifies the grep command correctly escapes '\.' in inputs
-func TestGrepCommand_escapeDots(t *testing.T) {
-	// fmt the files
-	b := &bytes.Buffer{}
-	r := cmd.GetGrepRunner()
-	r.Command.SetArgs([]string{"spec.template.spec.containers[name=nginx].image=nginx:1\\.7\\.9",
-		"--annotate=false"})
-	r.Command.SetOut(b)
-	r.Command.SetIn(bytes.NewBufferString(`
-kind: Deployment
-metadata:
-  labels:
-    app: nginx1.8
-  name: nginx1.8
-  annotations:
-    app: nginx1.8
-spec:
-  replicas: 1
-  template:
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.8.1
----
-kind: Deployment
-metadata:
-  labels:
-    app: nginx1.7
-  name: nginx1.7
-  annotations:
-    app: nginx1.7
-spec:
-  replicas: 1
-  template:
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.7.9
-`))
-	err := r.Command.Execute()
-	if !assert.NoError(t, err) {
-		return
-	}
-	if !assert.Equal(t, `kind: Deployment
-metadata:
-  labels:
-    app: nginx1.7
-  name: nginx1.7
-  annotations:
-    app: nginx1.7
-spec:
-  replicas: 1
-  template:
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.7.9
-`, b.String()) {
-		return
-	}
-}

cmd/kyaml/cmd/merge.go

@@ -1,80 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package cmd
-
-import (
-	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/kio/filters"
-)
-
-func GetMergeRunner() *MergeRunner {
-	r := &MergeRunner{}
-	c := &cobra.Command{
-		Use:   "merge [SOURCE_DIR...] [DESTINATION_DIR]",
-		Short: "Merge Resource configuration files",
-		Long: `Merge Resource configuration files
-
-Merge reads Kubernetes Resource yaml configuration files from stdin or sources packages and write
-the result to stdout or a destination package.
-
-Resources are merged using the Resource [apiVersion, kind, name, namespace] as the key.  If any of
-these are missing, merge will default the missing values to empty.
-
-Resources specified later are high-precedence (the source) and Resources specified
-earlier are lower-precedence (the destination).
-
-For information on merge rules, run:
-
-	kyaml help merge
-`,
-		Example: `cat resources_and_patches.yaml | kyaml merge > merged_resources.yaml`,
-		RunE:    r.runE,
-	}
-	r.Command = c
-	r.Command.Flags().BoolVar(&r.InvertOrder, "invert-order", false,
-		"if true, merge Resources in the reverse order")
-	return r
-}
-
-func MergeCommand() *cobra.Command {
-	return GetMergeRunner().Command
-}
-
-// MergeRunner contains the run function
-type MergeRunner struct {
-	Command     *cobra.Command
-	InvertOrder bool
-}
-
-func (r *MergeRunner) runE(c *cobra.Command, args []string) error {
-	var inputs []kio.Reader
-	// add the packages in reverse order -- the arg list should be highest precedence first
-	// e.g. merge from -> to, but the MergeFilter is highest precedence last
-	for i := len(args) - 1; i >= 0; i-- {
-		inputs = append(inputs, kio.LocalPackageReader{PackagePath: args[i]})
-	}
-	// if there is no "from" package, read from stdin
-	rw := &kio.ByteReadWriter{
-		Reader:                c.InOrStdin(),
-		Writer:                c.OutOrStdout(),
-		KeepReaderAnnotations: true,
-	}
-	if len(inputs) < 2 {
-		inputs = append(inputs, rw)
-	}
-
-	// write to the "to" package if specified
-	var outputs []kio.Writer
-	if len(args) != 0 {
-		outputs = append(outputs, kio.LocalPackageWriter{PackagePath: args[len(args)-1]})
-	}
-	// if there is no "to" package, write to stdout
-	if len(outputs) == 0 {
-		outputs = append(outputs, rw)
-	}
-
-	filters := []kio.Filter{filters.MergeFilter{}, filters.FormatFilter{}}
-	return kio.Pipeline{Inputs: inputs, Filters: filters, Outputs: outputs}.Execute()
-}

cmd/kyaml/cmd/tree.go

@@ -1,229 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package cmd
-
-import (
-	"path/filepath"
-	"strings"
-
-	"sigs.k8s.io/kustomize/kyaml/kio/filters"
-
-	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-func GetTreeRunner() *TreeRunner {
-	r := &TreeRunner{}
-	c := &cobra.Command{
-		Use:   "tree DIR",
-		Short: "Display Resource structure from a directory or stdin",
-		Long: `Display Resource structure from a directory or stdin.
-
-kyaml tree may be used to print Resources in a directory or cluster, preserving structure
-
-Args:
-
-  DIR:
-    Path to local directory directory.
-
-Resource fields may be printed as part of the Resources by specifying the fields as flags.
-
-kyaml tree has build-in support for printing common fields, such as replicas, container images,
-container names, etc.
-
-kyaml tree supports printing arbitrary fields using the '--field' flag.
-
-By default, kyaml tree uses the directory structure for the tree structure, however when printing
-from the cluster, the Resource graph structure may be used instead.
-`,
-		Example: `# print Resources using directory structure
-kyaml tree my-dir/
-
-# print replicas, container name, and container image and fields for Resources
-kyaml tree my-dir --replicas --image --name
-
-# print all common Resource fields
-kyaml tree my-dir/ --all
-
-# print the "foo"" annotation
-kyaml tree my-dir/ --field "metadata.annotations.foo" 
-
-# print the "foo"" annotation
-kubectl get all -o yaml | kyaml tree my-dir/ --structure=graph \
-  --field="status.conditions[type=Completed].status"
-
-# print live Resources from a cluster using graph for structure
-kubectl get all -o yaml | kyaml tree --replicas --name --image --structure=graph
-
-
-# print live Resources using graph for structure
-kubectl get all,applications,releasetracks -o yaml | kyaml tree --structure=graph \
-  --name --image --replicas \
-  --field="status.conditions[type=Completed].status" \
-  --field="status.conditions[type=Complete].status" \
-  --field="status.conditions[type=Ready].status" \
-  --field="status.conditions[type=ContainersReady].status"
-`,
-		RunE: r.runE,
-		Args: cobra.MaximumNArgs(1),
-	}
-	c.Flags().BoolVar(&r.IncludeSubpackages, "include-subpackages", true,
-		"also print resources from subpackages.")
-
-	// TODO(pwittrock): Figure out if these are the right things to expose, and consider making it
-	// a list of options instead of individual flags
-	c.Flags().BoolVar(&r.name, "name", false, "print name field")
-	c.Flags().BoolVar(&r.resources, "resources", false, "print resources field")
-	c.Flags().BoolVar(&r.ports, "ports", false, "print ports field")
-	c.Flags().BoolVar(&r.images, "image", false, "print image field")
-	c.Flags().BoolVar(&r.replicas, "replicas", false, "print replicas field")
-	c.Flags().BoolVar(&r.args, "args", false, "print args field")
-	c.Flags().BoolVar(&r.cmd, "command", false, "print command field")
-	c.Flags().BoolVar(&r.env, "env", false, "print env field")
-	c.Flags().BoolVar(&r.all, "all", false, "print all field infos")
-	c.Flags().StringSliceVar(&r.fields, "field", []string{}, "print field")
-	c.Flags().BoolVar(&r.includeReconcilers, "include-reconcilers", false,
-		"if true, include reconciler Resources in the output.")
-	c.Flags().BoolVar(&r.excludeNonReconcilers, "exclude-non-reconcilers", false,
-		"if true, exclude non-reconciler Resources in the output.")
-	c.Flags().StringVar(&r.structure, "graph-structure", "directory",
-		"Graph structure to use for printing the tree.  may be 'directory' or 'owners'.")
-
-	r.Command = c
-	return r
-}
-
-func TreeCommand() *cobra.Command {
-	return GetTreeRunner().Command
-}
-
-// TreeRunner contains the run function
-type TreeRunner struct {
-	IncludeSubpackages    bool
-	Command               *cobra.Command
-	name                  bool
-	resources             bool
-	ports                 bool
-	images                bool
-	replicas              bool
-	all                   bool
-	env                   bool
-	args                  bool
-	cmd                   bool
-	fields                []string
-	includeReconcilers    bool
-	excludeNonReconcilers bool
-	structure             string
-}
-
-func (r *TreeRunner) runE(c *cobra.Command, args []string) error {
-	var input kio.Reader
-	var root = "."
-	if len(args) == 1 {
-		root = filepath.Clean(args[0])
-		input = kio.LocalPackageReader{PackagePath: args[0]}
-	} else {
-		input = &kio.ByteReader{Reader: c.InOrStdin()}
-	}
-
-	var fields []kio.TreeWriterField
-	for _, field := range r.fields {
-		path, err := parseFieldPath(field)
-		if err != nil {
-			return err
-		}
-		fields = append(fields, newField(path...))
-	}
-
-	if r.name || (r.all && !c.Flag("name").Changed) {
-		fields = append(fields,
-			newField("spec", "containers", "[name=.*]", "name"),
-			newField("spec", "template", "spec", "containers", "[name=.*]", "name"),
-		)
-	}
-	if r.images || (r.all && !c.Flag("image").Changed) {
-		fields = append(fields,
-			newField("spec", "containers", "[name=.*]", "image"),
-			newField("spec", "template", "spec", "containers", "[name=.*]", "image"),
-		)
-	}
-
-	if r.cmd || (r.all && !c.Flag("command").Changed) {
-		fields = append(fields,
-			newField("spec", "containers", "[name=.*]", "command"),
-			newField("spec", "template", "spec", "containers", "[name=.*]", "command"),
-		)
-	}
-	if r.args || (r.all && !c.Flag("args").Changed) {
-		fields = append(fields,
-			newField("spec", "containers", "[name=.*]", "args"),
-			newField("spec", "template", "spec", "containers", "[name=.*]", "args"),
-		)
-	}
-	if r.env || (r.all && !c.Flag("env").Changed) {
-		fields = append(fields,
-			newField("spec", "containers", "[name=.*]", "env"),
-			newField("spec", "template", "spec", "containers", "[name=.*]", "env"),
-		)
-	}
-
-	if r.replicas || (r.all && !c.Flag("replicas").Changed) {
-		fields = append(fields,
-			newField("spec", "replicas"),
-		)
-	}
-	if r.resources || (r.all && !c.Flag("resources").Changed) {
-		fields = append(fields,
-			newField("spec", "containers", "[name=.*]", "resources"),
-			newField("spec", "template", "spec", "containers", "[name=.*]", "resources"),
-		)
-	}
-	if r.ports || (r.all && !c.Flag("ports").Changed) {
-		fields = append(fields,
-			newField("spec", "containers", "[name=.*]", "ports"),
-			newField("spec", "template", "spec", "containers", "[name=.*]", "ports"),
-			newField("spec", "ports"),
-		)
-	}
-
-	// show reconcilers in tree
-	fltrs := []kio.Filter{&filters.IsReconcilerFilter{
-		ExcludeReconcilers:    !r.includeReconcilers,
-		IncludeNonReconcilers: !r.excludeNonReconcilers,
-	}}
-
-	return kio.Pipeline{
-		Inputs:  []kio.Reader{input},
-		Filters: fltrs,
-		Outputs: []kio.Writer{kio.TreeWriter{
-			Root:      root,
-			Writer:    c.OutOrStdout(),
-			Fields:    fields,
-			Structure: kio.TreeStructure(r.structure)}},
-	}.Execute()
-}
-
-func newField(val ...string) kio.TreeWriterField {
-	if strings.HasPrefix(strings.Join(val, "."), "spec.template.spec.containers") {
-		return kio.TreeWriterField{
-			Name:        "spec.template.spec.containers",
-			PathMatcher: yaml.PathMatcher{Path: val, StripComments: true},
-			SubName:     val[len(val)-1],
-		}
-	}
-
-	if strings.HasPrefix(strings.Join(val, "."), "spec.containers") {
-		return kio.TreeWriterField{
-			Name:        "spec.containers",
-			PathMatcher: yaml.PathMatcher{Path: val, StripComments: true},
-			SubName:     val[len(val)-1],
-		}
-	}
-
-	return kio.TreeWriterField{
-		Name:        strings.Join(val, "."),
-		PathMatcher: yaml.PathMatcher{Path: val, StripComments: true},
-	}
-}

cmd/kyaml/cmd/tree_test.go

@@ -1,345 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package cmd_test
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/cmd/kyaml/cmd"
-)
-
-// TestCmd_files verifies fmt reads the files and filters them
-func TestTreeCommand_files(t *testing.T) {
-	d, err := ioutil.TempDir("", "kustomize-tree-test")
-	defer os.RemoveAll(d)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
-apiVersion: gcr.io/example/reconciler:v1
-kind: Abstraction
-metadata:
-  name: foo
-spec:
-  replicas: 1
----
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-spec:
-  selector:
-    app: nginx
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-spec:
-  replicas: 3
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// fmt the files
-	b := &bytes.Buffer{}
-	r := cmd.GetTreeRunner()
-	r.Command.SetArgs([]string{d})
-	r.Command.SetOut(b)
-	if !assert.NoError(t, r.Command.Execute()) {
-		return
-	}
-
-	if !assert.Equal(t, fmt.Sprintf(`%s
-├── [f1.yaml]  Deployment foo
-├── [f1.yaml]  Service foo
-└── [f2.yaml]  Deployment bar
-`, d), b.String()) {
-		return
-	}
-}
-
-func TestTreeCommand_stdin(t *testing.T) {
-	// fmt the files
-	b := &bytes.Buffer{}
-	r := cmd.GetTreeRunner()
-	r.Command.SetArgs([]string{})
-	r.Command.SetIn(bytes.NewBufferString(`apiVersion: extensions/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo3
-  namespace: default
-  annotations:
-    app: nginx2
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f1.yaml
-spec:
-  replicas: 1
----
-apiVersion: extensions/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo3
-  namespace: default
-  annotations:
-    app: nginx2
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f1.yaml
-spec:
-  replicas: 1
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo3
-  namespace: default
-  annotations:
-    app: nginx2
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f1.yaml
-spec:
-  replicas: 1
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo2
-  namespace: default2
-  annotations:
-    app: nginx2
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f1.yaml
-spec:
-  replicas: 1
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx3
-  name: foo
-  namespace: default
-  annotations:
-    app: nginx3
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f1.yaml
-spec:
-  replicas: 1
----
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  annotations:
-    app: nginx
-    config.kubernetes.io/package: bar-package
-    config.kubernetes.io/path: f2.yaml
-  name: bar
-spec:
-  replicas: 3
----
-kind: Service
-metadata:
-  name: foo
-  namespace: default
-  annotations:
-    app: nginx
-    config.kubernetes.io/package: .
-    config.kubernetes.io/path: f1.yaml
-spec:
-  selector:
-    app: nginx
-`))
-	r.Command.SetOut(b)
-	if !assert.NoError(t, r.Command.Execute()) {
-		return
-	}
-
-	if !assert.Equal(t, fmt.Sprintf(`.
-├── [f1.yaml]  Deployment default/foo
-├── [f1.yaml]  Service default/foo
-├── [f1.yaml]  Deployment default/foo3
-├── [f1.yaml]  Deployment default/foo3
-├── [f1.yaml]  Deployment default/foo3
-├── [f1.yaml]  Deployment default2/foo2
-└── bar-package
-    └── [f2.yaml]  Deployment bar
-`), b.String()) {
-		return
-	}
-}
-
-func TestTreeCommand_includeReconcilers(t *testing.T) {
-	d, err := ioutil.TempDir("", "kustomize-tree-test")
-	defer os.RemoveAll(d)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-spec:
-  selector:
-    app: nginx
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
-apiVersion: gcr.io/example/reconciler:v1
-kind: Abstraction
-metadata:
-  name: foo
-spec:
-  replicas: 1
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-spec:
-  replicas: 3
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// fmt the files
-	b := &bytes.Buffer{}
-	r := cmd.GetTreeRunner()
-	r.Command.SetArgs([]string{d, "--include-reconcilers"})
-	r.Command.SetOut(b)
-	if !assert.NoError(t, r.Command.Execute()) {
-		return
-	}
-
-	if !assert.Equal(t, fmt.Sprintf(`%s
-├── [f1.yaml]  Deployment foo
-├── [f1.yaml]  Service foo
-├── [f2.yaml]  Deployment bar
-└── [f2.yaml]  Abstraction foo
-`, d), b.String()) {
-		return
-	}
-}
-
-func TestTreeCommand_excludeNonReconcilers(t *testing.T) {
-	d, err := ioutil.TempDir("", "kustmoize-tree-test")
-	defer os.RemoveAll(d)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-spec:
-  selector:
-    app: nginx
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
-apiVersion: gcr.io/example/reconciler:v1
-kind: Abstraction
-metadata:
-  name: foo
-spec:
-  replicas: 1
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-spec:
-  replicas: 3
-`), 0600)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// fmt the files
-	b := &bytes.Buffer{}
-	r := cmd.GetTreeRunner()
-	r.Command.SetArgs([]string{d, "--include-reconcilers", "--exclude-non-reconcilers"})
-	r.Command.SetOut(b)
-	if !assert.NoError(t, r.Command.Execute()) {
-		return
-	}
-
-	if !assert.Equal(t, fmt.Sprintf(`%s
-└── [f2.yaml]  Abstraction foo
-`, d), b.String()) {
-		return
-	}
-}

cmd/kyaml/cmd/util.go

@@ -1,36 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-//
-package cmd
-
-import (
-	"fmt"
-	"strings"
-)
-
-// parseFieldPath parse a flag value into a field path
-func parseFieldPath(path string) ([]string, error) {
-	// fixup '\.' so we don't split on it
-	match := strings.ReplaceAll(path, "\\.", "$$$$")
-	parts := strings.Split(match, ".")
-	for i := range parts {
-		parts[i] = strings.ReplaceAll(parts[i], "$$$$", ".")
-	}
-
-	// split the list index from the list field
-	var newParts []string
-	for i := range parts {
-		if !strings.Contains(parts[i], "[") {
-			newParts = append(newParts, parts[i])
-			continue
-		}
-		p := strings.Split(parts[i], "[")
-		if len(p) != 2 {
-			return nil, fmt.Errorf("unrecognized path element: %s.  "+
-				"Should be of the form 'list[field=value]'", parts[i])
-		}
-		p[1] = "[" + p[1]
-		newParts = append(newParts, p[0], p[1])
-	}
-	return newParts, nil
-}

cmd/kyaml/go.mod

@@ -1,13 +0,0 @@
-module sigs.k8s.io/kustomize/cmd/kyaml
-
-go 1.12
-
-require (
-	github.com/spf13/cobra v0.0.5
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/testify v1.4.0
-	sigs.k8s.io/kustomize/kyaml v0.0.0
-	sigs.k8s.io/kustomize/pseudo/k8s v0.0.0-20191109010559-74255f6badd9
-)
-
-replace sigs.k8s.io/kustomize/kyaml v0.0.0 => ../../kyaml

cmd/kyaml/go.sum

@@ -1,149 +0,0 @@
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest v0.9.2/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/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
-github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
-github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
-github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM=
-github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
-github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
-github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
-github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
-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=
-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/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
-github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
-github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
-github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-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/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-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
-github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
-github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
-github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
-github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
-github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
-github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
-github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-github.com/gophercloud/gophercloud v0.6.0/go.mod h1:GICNByuaEBibcjmjvI7QvYJSZEbGkcYwAR7EZK2WMqM=
-github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-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/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-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=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-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=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
-github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
-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/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
-github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-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.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/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-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=
-golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20170114055629-f2499483f923/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-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-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/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-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.v3 v3.0.0-20191026110619-0b21df46bc1d h1:LCPbGQ34PMrwad11aMZ+dbz5SAsq/0ySjRwQ8I9Qwd8=
-gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
-k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
-k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
-sigs.k8s.io/kustomize/pseudo/k8s v0.0.0-20191109010559-74255f6badd9 h1:y5HZbxpf+KDyXpXSIUaxkcDB2ot78v80aLHCJ/UiyLo=
-sigs.k8s.io/kustomize/pseudo/k8s v0.0.0-20191109010559-74255f6badd9/go.mod h1:bl/gVJgYYhJZCZdYU2BfnaKYAlqFkgbJEkpl302jEss=
-sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
-sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=

cmd/kyaml/inpututil/inpututil.go

@@ -1,42 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package inpututil
-
-import (
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-type MapInputsEFn func(*yaml.RNode, yaml.ResourceMeta) error
-
-func MapInputsE(inputs []*yaml.RNode, fn MapInputsEFn) error {
-	for i := range inputs {
-		meta, err := inputs[i].GetMeta()
-		if err != nil {
-			return err
-		}
-		if err := fn(inputs[i], meta); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-type MapInputsFn func(*yaml.RNode, yaml.ResourceMeta) ([]*yaml.RNode, error)
-
-//  runs the function against each input Resource, providing the parsed metadata
-func MapInputs(inputs []*yaml.RNode, fn MapInputsFn) ([]*yaml.RNode, error) {
-	var outputs []*yaml.RNode
-	for i := range inputs {
-		meta, err := inputs[i].GetMeta()
-		if err != nil {
-			return nil, err
-		}
-		o, err := fn(inputs[i], meta)
-		if err != nil {
-			return nil, err
-		}
-		outputs = append(outputs, o...)
-	}
-	return outputs, nil
-}

cmd/kyaml/main.go

@@ -1,37 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package main
-
-import (
-	"os"
-
-	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/cmd/kyaml/cmd"
-	"sigs.k8s.io/kustomize/kyaml/yaml/merge2"
-	"sigs.k8s.io/kustomize/kyaml/yaml/merge3"
-)
-
-var root = &cobra.Command{
-	Use:   "kyaml",
-	Short: "kyaml reference comand",
-	Long: `Description:
-  Reference implementation for using the kyaml libraries.
-`,
-	Example: ``,
-}
-
-func main() {
-	root.AddCommand(cmd.GrepCommand())
-	root.AddCommand(cmd.TreeCommand())
-	root.AddCommand(cmd.CatCommand())
-	root.AddCommand(cmd.FmtCommand())
-	root.AddCommand(cmd.MergeCommand())
-	root.AddCommand(cmd.CountCommand())
-	root.AddCommand(&cobra.Command{Use: "merge", Long: merge2.Help})
-	root.AddCommand(&cobra.Command{Use: "merge3", Long: merge3.Help})
-
-	if err := root.Execute(); err != nil {
-		os.Exit(1)
-	}
-}

docs/INSTALL.md

@@ -8,64 +8,29 @@ are available on the [release page].
 
 Or...
 
-## Quickly curl the latest binary
+## Quickly curl the latest
 
 ```
-# pick one
-opsys=darwin
-opsys=windows
-opsys=linux
-
-curl -s https://api.github.com/repos/kubernetes-sigs/kustomize/releases |\
+opsys=linux  # or darwin, or windows
+curl -s https://api.github.com/repos/kubernetes-sigs/kustomize/releases/latest |\
   grep browser_download |\
   grep $opsys |\
   cut -d '"' -f 4 |\
-  grep /kustomize/v |\
-  sort | tail -n 1 |\
   xargs curl -O -L
-tar xzf ./kustomize_v*_${opsys}_amd64.tar.gz
-./kustomize version
-```
-## Try `go`
-
-This method is more to show off how the `go` tool works,
-than for any practical purpose.  A kustomize developer should
-clone the repo (see next section), and CI/CD scripts should 
-download a specific ready-to-run executable rather than
-rely on the `go` tool.
-
-Install the latest kustomize binary in the v3 series to `$GOPATH/bin`:
-```
-go install sigs.k8s.io/kustomize/kustomize/v3
+mv kustomize_*_${opsys}_amd64 kustomize
+chmod u+x kustomize
 ```
 
-Install a specific version:
+## Get and install source for a particular release
+
+For example
 ```
-go get sigs.k8s.io/kustomize/kustomize/v3@v3.3.0
+# Omit the @v3.2.1 to get the default for major version 3
+GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v3@v3.2.1
 ```
 
-## Build the kustomize CLI from local source
-```
-# Need go 1.13 or higher
-unset GOPATH
-# see https://golang.org/doc/go1.13#modules
-unset GO111MODULES
-
-# clone the repo
-git clone git@github.com:kubernetes-sigs/kustomize.git
-# get into the repo root
-cd kustomize
-
-# Optionally checkout a particular tag if you don't
-# want to build at head
-git checkout kustomize/v3.2.3
-
-# build the binary
-(cd kustomize; go install .)
-
-# run it
-~/go/bin/kustomize version
-```
+Use of `GO111MODULE=on` shouldn't be necessary
+with [Go v1.13](https://golang.org/doc/go1.13#modules).
 
 ### Other methods
 

docs/README.md

@@ -23,16 +23,8 @@ English | [简体中文](zh/README.md)
 
 ## Release notes
 
- * [kustomize/3.2.2](https://github.com/kubernetes-sigs/kustomize/releases/tag/kustomize%2Fv3.2.2) - kustomize CLI
-   moved to depend on kustomize Go API [3.3.0](v3.3.0.md).
-
- * [API 3.3.0](v3.3.0.md) - First release of the kustomize Go API
-   in a module excluding the `kustomize` CLI.  From here on,
-   the CLI and API will release independently.
- 
- * [kustomize/3.2.1](https://github.com/kubernetes-sigs/kustomize/releases/tag/kustomize%2Fv3.2.1) - Patch release
-   of `kustomize` CLI in its own module,
-   depending on Go API release [3.2.0](v3.2.0.md).
+ * 3.2.1 - Patch release of kustomize in its own module.  No change in function
+   from v3.2.0.
 
  * [3.2.0](v3.2.0.md) - TODO(jingfang)
 

docs/macDevGuide.md

@@ -1,41 +0,0 @@
-# Developing on Mac OS
-
-## Setup your dev environment
-
-First install the tools to build and run tests
-
-### Install go 1.13
-
-[Instructions](https://golang.org/doc/install)
-
-Add `go` to your PATH
-
-### Install kubeval
-
-[Instructions](https://github.com/instrumenta/kubeval)
-
-```sh
-go get github.com/instrumenta/kubeval
-```
-
-Add `kubeval` to your PATH
-
-### Install gnu tools
-
-[Instructions](https://www.topbug.net/blog/2013/04/14/install-and-use-gnu-command-line-tools-in-mac-os-x/)
-
-```sh
-brew install coreutils wget gnu-sed
-```
-
-Add the new tools to your PATH
-
-## Run the pre-commit tests
-
-Run the `pre-commit` target to verify your install
-
-```sh
-make pre-commit
-```
-
-This will run the go tests, as well as documentation tests.

docs/plugins/README.md

@@ -305,8 +305,8 @@ A Go plugin for kustomize looks like this:
 > package main
 >
 > import (
->	"sigs.k8s.io/kustomize/api/ifc"
->	"sigs.k8s.io/kustomize/api/resmap"
+>	"sigs.k8s.io/kustomize/v3/pkg/ifc"
+>	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 >   ...
 > )
 >

docs/plugins/builtins.md

@@ -33,16 +33,16 @@ be defaulted.  The latter method allows for
 complete plugin argument specification.
 
 
-[types.GeneratorOptions]: ../../api/types/generatoroptions.go
-[types.SecretArgs]: ../../api/types/secretargs.go
-[types.ConfigMapArgs]: ../../api/types/configmapargs.go
-[config.FieldSpec]: ../../api/types/fieldspec.go
-[types.ObjectMeta]: ../../api/types/objectmeta.go
-[types.Selector]: ../../api/types/selector.go
-[types.Replica]: ../../api/types/replica.go
-[types.PatchStrategicMerge]: ../../api/types/patchstrategicmerge.go
-[types.PatchTarget]: ../../api/types/patchtarget.go
-[image.Image]: ../../api/types/image.go
+[types.GeneratorOptions]: ../../pkg/types/generatoroptions.go
+[types.SecretArgs]: ../../pkg/types/secretargs.go
+[types.ConfigMapArgs]: ../../pkg/types/configmapargs.go
+[config.FieldSpec]: ../../pkg/transformers/config/fieldspec.go
+[types.ObjectMeta]: ../../pkg/types/objectmeta.go
+[types.Selector]: ../../pkg/types/selector.go
+[types.Replica]: ../../pkg/types/replica.go
+[types.PatchStrategicMerge]: ../../pkg/types/patchstrategicmerge.go
+[types.PatchTarget]: ../../pkg/types/patchtarget.go
+[image.Image]: ../../pkg/image/image.go
 
 ## _AnnotationTransformer_
 ### Usage via `kustomization.yaml`

docs/plugins/execPluginGuidedExample.md

@@ -12,7 +12,7 @@ current setup.
 
 #### requirements
 
- * linux, git, curl, Go 1.13
+ * linux, git, curl, Go 1.12
 
 
 ## Make a place to work
@@ -201,7 +201,7 @@ chmod a+x $MY_PLUGIN_DIR/SillyConfigMapGenerator
 ```
 mkdir -p $DEMO/bin
 gh=https://github.com/kubernetes-sigs/kustomize/releases/download
-url=$gh/v3.0.0/kustomize_3.0.0_linux_amd64
+url=$gh/v3.0.0-pre/kustomize_3.0.0-pre_linux_amd64
 curl -o $DEMO/bin/kustomize -L $url
 chmod u+x $DEMO/bin/kustomize
 ```
@@ -226,3 +226,4 @@ Above, if you had set
 
 there would be no need to use `XDG_CONFIG_HOME` in the
 _kustomize_ command above.
+

docs/plugins/goPluginCaveats.md

@@ -52,8 +52,7 @@ kustomize and the plugin_.
 
 This means a one-time run of
 ```
-# Or whatever is appropriate at time of reading
-GOPATH=${whatever} GO111MODULE=on go get sigs.k8s.io/kustomize/api
+GOPATH=${whatever} GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v3
 ```
 
 and then a normal development cycle using

docs/plugins/goPluginGuidedExample.md

@@ -21,7 +21,7 @@ current setup.
 
 #### requirements
 
-* linux, git, curl, Go 1.13
+* linux, git, curl, Go 1.12
 
 For encryption
 
@@ -46,7 +46,7 @@ Need v3.0.0 for what follows, and you must _compile_
 it (not download the binary from the release page):
 
 ```shell
-GOPATH=$tmpGoPath go install sigs.k8s.io/kustomize/kustomize
+GOPATH=$tmpGoPath go install sigs.k8s.io/kustomize/v3/cmd/kustomize
 ```
 
 ## Make a home for plugins
@@ -173,7 +173,7 @@ dependency [skew].
 On load failure
 
  * be sure to build the plugin with the same
-   version of Go (_go1.13_) on the same `$GOOS`
+   version of Go (_go1.12_) on the same `$GOOS`
    (_linux_) and `$GOARCH` (_amd64_) used to build
    the kustomize being [used in this demo].
 

docs/v2.1.0.md

@@ -223,7 +223,7 @@ normal k8s resources means that one can generate
 or transform a generator or a transformer (see
 [TestTransformerTransformers]).
 
-[TestTransformerTransformers]: ../api/internal/target/transformerplugin_test.go
+[TestTransformerTransformers]: ../pkg/target/transformerplugin_test.go
 
 ### `replicas` field
 

docs/v3.3.0.md

@@ -1,114 +0,0 @@
-# kustomize 3.3.0
- 
-[versioning policy documentation]: https://github.com/kubernetes-sigs/kustomize/blob/master/docs/versioningPolicy.md
-[release process documentation]: https://github.com/kubernetes-sigs/kustomize/tree/master/releasing
- 
-## Summary of changes
-
-### First release of the Go API-only module.
-
-Many of the PRs since the last kustomize release were
-around restructuring the _sigs.k8s.io/kustomize_
-repository into three Go modules instead of just one.
-
-The reasons for this are detailed in the [versioning
-policy documentation], and what it means for releasing
-is explained in the [release process documentation].
-
-The tl;dr is that the top level module
-`sigs.k8s.io/kustomize` now defines the kustomize Go
-API, and the _kustomize_ CLI sits below it in an
-independent module `sigs.k8s.io/kustomize/kustomize`.
-
-The modules release independently, though in practice a
-new release of the kustomize Go API will likely be
-followed quickly by a new release of the `kustomize`
-executable.
-
-This is a necessary step to creating a much smaller
-kustomize Go API surface that has some hope of
-conforming to semantic versioning and being of some use
-to clients.
-
-The kustomize CLI will see the same kustomize Go API as
-any other client.
-
-The new semver-able API will begin with `v4.0.0` (not
-yet released) and be a clean break with `v3` etc.
-
-
-### Change log since v3.2.0
-
-```
-3c9d828f - Have kustomize CLI depend on kustomize Go API v3.3.0 (Jeffrey Regan)
-5d800f0b - Merge pull request #1595 from monopole/threeReleases (Jeff Regan)
-4eb2d5bc - Three builders. (Jeffrey Regan)
-988af1ff - Update README.md (Jeff Regan)
-1617183e - Merge pull request #1590 from monopole/releaseProcessUpdate (Kubernetes Prow Robot)
-ee727464 - update release process doc (jregan)
-c9e7dc3b - Merge pull request #1589 from monopole/moreTestsAroundKustFileName (Jeff Regan)
-07e0e46a - improve tests for alternative kustomization file names (Jeffrey Regan)
-404d2d63 - Merge pull request #1587 from monopole/reducePgmconfig (Jeff Regan)
-baa0296a - Reduce size of pgmconfig package (Jeffrey Regan)
-0f665ac1 - Merge pull request #1544 from ptux/add-transformer-href (Jeff Regan)
-14b0a650 - Merge pull request #1581 from monopole/refactorFs (Jeff Regan)
-2d58f8b8 - Break the dep between fs and pgmconfig. (Jeffrey Regan)
-9a43ca53 - Merge pull request #1578 from nlamirault/fix/build-plugins-doc (Jeff Regan)
-5372fc6f - Merge pull request #1579 from monopole/fsPackageCleanup (Jeff Regan)
-86bc3440 - Merge pull request #1513 from nimohunter/fix_empty_list_item (Kubernetes Prow Robot)
-a014f7d4 - Merge pull request #1561 from beautytiger/dev-190925 (Jeff Regan)
-9a94bcb8 - Improve fs package and doc in prep to officially go public (Jeffrey Regan)
-07634ef0 - Merge pull request #1575 from monopole/versioning (Jeff Regan)
-995f88d6 - Update versioning notes. (jregan)
-334a6467 - Fix: documentation link for plugins (Nicolas Lamirault)
-08963ba5 - improve test code coverage in transformers (Guangming Wang)
-326fb689 - Merge pull request #1570 from bzub/1234-go_plugin_doc (Jeff Regan)
-970ce67c - Update goPluginCaveats.md (Jeff Regan)
-98d18930 - Update INSTALL.md (Jeff Regan)
-d89b448c - Fix git tag recovery in cloud build. (Jeff Regan)
-17bf9d32 - Update releasing README. (Jeff Regan)
-a99aff1d - Merge pull request #1571 from monopole/updateCloudBuildProcess (Kubernetes Prow Robot)
-a694ac7b - Update cloud build process for kustomize. (Jeffrey Regan)
-b5b11ef6 - Fix compile kustomize example. (bzub)
-fa1af6f5 - Merge pull request #1473 from richardmarshall/execpluginhash (Jeff Regan)
-9288dec0 - Fix failing BashedConfigMapTest (Jeff Regan)
-1a45dd0b - Merge pull request #1566 from monopole/releaseNotes3.2.1 (Kubernetes Prow Robot)
-592c5acf - docs: Exec plugin generator options (Richard Marshall)
-ac9424fa - tests: Add unit tests for update resource options (Richard Marshall)
-79fbe7c4 - Support resource generator options in exec plugins (Richard Marshall)
-f69d526f - v3.2.1 release notes (Jeff Regan)
-07a95a60 - Merge pull request #1565 from monopole/tweakBinaryDepsBeforeTagging (Jeff Regan)
-032b3857 - Pin the kustomize binary's dependence on kustomize libs. (jregan)
-81062959 - Merge pull request #1564 from monopole/moveKustomizeBinaryToOwnModule (Kubernetes Prow Robot)
-b82a8fd3 - Move the kustomize binary to its own module. (Jeffrey Regan)
-2d0c22d6 - Merge pull request #1562 from keleustes/tools (Kubernetes Prow Robot)
-aa342def - Pin tool versions using go modules (Ian Howell)
-10786ec0 - Merge pull request #1554 from keleustes/readme (Kubernetes Prow Robot)
-7c705687 - Update README.md to include Kubernetes 1.16 (Jerome Brette)
-e8933d97 - Merge pull request #1560 from monopole/precommitTuneup (Jeff Regan)
-9d7b6544 - Make pre-commit more portable and less tricky. (jregan)
-7a0946a9 - Merge pull request #1558 from monopole/dependOnNewPluginatorModule (Jeff Regan)
-def4f045 - Depend on new pluginator location. (Jeffrey Regan)
-2f2408f1 - Merge pull request #1559 from monopole/compressCopyright (Jeff Regan)
-3b9bcc48 - Compress copyright in the commands package. (Jeffrey Regan)
-d0429ff4 - Merge pull request #1557 from monopole/pluginatorModule (Jeff Regan)
-33deefc3 - Copy pluginator to its own module. (Jeffrey Regan)
-9b3de82b - Merge pull request #1506 from Liujingfang1/release (Jeff Regan)
-d217074f - Merge pull request #1550 from keleustes/apiversion (Kubernetes Prow Robot)
-1d90ba7c - Fix typo in apiVersion yaml declaration (Jerome Brette)
-eeeb4c36 - Merge pull request #1547 from keleustes/extensions (Kubernetes Prow Robot)
-b1faa989 - Update Ingress apiVersion to networking.k8s.io/v1beta1 (Jerome Brette)
-d8250c9e - move test case (nimohunter)
-c9500466 - add transformer href (Wang(わん))
-0c32691e - Merge pull request #1537 from jaypipes/gomod-install-note (Kubernetes Prow Robot)
-88b1d627 - Merge pull request #1541 from rtnpro/patch-1 (Jeff Regan)
-aec82066 - Update INSTALL.md (Jeff Regan)
-20c2b53a - Merge pull request #1542 from monopole/tweakFilePathsInTest (Jeff Regan)
-274b5c3b - Tweak file path handling and logging in test. (Jeffrey Regan)
-b1fdaa23 - Fix typo in transformerconfigs README (Ratnadeep Debnath)
-b5d5e70b - empty list or map item return error (nimohunter)
-2e829853 - empty list or map item return error (nimohunter)
-55941f57 - add note about GO111MODULE for source install (Jay Pipes)
-9e226001 - empty list or map item return error (nimohunter)
-77b63f96 - add release note for v3.2.0 (jingfangliu)
-```

docs/versioningPolicy.md

@@ -6,38 +6,44 @@ particular version of underlying packages (a Go
 API), and reading a particular version of a
 [kustomization] file.
 
-> If you're having trouble with `go get`, please
-> read  [Go API Versioning](#go-api-versioning)
-> and be patient.
-
 ## CLI Program Versioning
 
 The command `kustomize version` prints a three
 field version tag (e.g. `v3.0.0`) that aspires to
 [semantic versioning].
 
-This notion of semver applies only to the CLI;
-the command names, their arguments and their flags.
+This notion of semver applies only to the CLI.
 
 The major version changes when some backward
 incompatibility appears in how the commands
 behave.
 
+
 ### Installation
 
-See the [installation docs](INSTALL.md).
+The best method to install kustomize is to
+download a binary from the [release page].
+
+If you want to try minor and patch upgrades in
+dependencies via `go get -u` (see `help go
+get`), try something like this:
+
+```
+GO111MODULE=on go get -u sigs.k8s.io/kustomize/kustomize/v3@v3.2.1
+```
 
 ## Go API Versioning
 
 The public methods in the public packages
-of module `sigs.k8s.io/kustomize/api` constitute
+of module `sigs.k8s.io/kusomize` constitue
 the _kustomize Go API_.
 
-#### Version sigs.k8s.io/kustomize/v3 and earlier
+#### Version v3 and earlier
+
 
 [import path]: https://github.com/golang/go/wiki/Modules#releasing-modules-v2-or-higher
 
-In `kustomize/v3` (and preceeding major versions), the
+In `v3` (and preceeding major versions), the
 kustomize program and the API live the same Go
 module at `sigs.k8s.io/kustomize`, at [import path]
 `sigs.k8s.io/kustomize/v3`.
@@ -57,7 +63,8 @@ directory named `internal`).  Even a minor
 refactor changing a method name or argument type
 in some deeply buried (but still public) method is
 a backward incompatible change.  As a result, Go
-API semver hasn't been followed.  This was a mistake.
+API semver hasn't been followed (or we'd be at a much
+higher version number by now).
 
 Some options are
 
@@ -81,16 +88,22 @@ Some options are
 
 The last option seems the most appealing.
 
-#### The first stable API version is coming
+Projects using the Go API directly only use about
+a dozen public methods in ~ten packages. These
+methods could likely be combined to one or two
+public packages intentionally designed for general
+use, analogous to, say,
+[regexp](https://golang.org/pkg/regexp) or
+[go-yaml](https://github.com/go-yaml/yaml),
+reducing the API surface.
 
-The first stable API version will launch
-as the Go module
+#### Version v4
 
-```
-sigs.k8s.io/kustomize/api
-```
+With `v4` (i.e. the module dependency path
+`sigs.k8s.io/kustomize/v4`)
+two things will happen.
 
-The _kustomize_ program itself (`main.go`
+First, the _kustomize_ program itself (`main.go`
 and CLI specific code) will have moved out of
 `sigs.k8s.io/kustomize` and into the new module
 `sigs.k8s.io/kustomize/kustomize`.  This is a
@@ -101,14 +114,12 @@ trigger a major version bump).  This module will
 not export packages; it's just home to a `main`
 package.
 
-The `sigs.k8s.io/kustomize/api` module will
-obey semver with a sustainable public
+Second, `sigs.k8s.io/kustomize/v4` will start to
+obey semver with a substantially reduced public
 surface, informed by current usage.  Clients
 should import packages from this module, i.e.
 from import paths prefixed by
-`sigs.k8s.io/kustomize/api/` at first,
-and later by `sigs.k8s.io/kustomize/api/v2/`.
-The kustomize binary
+`sigs.k8s.io/kustomize/v4`.  The kustomize binary
 itself is an API client requiring this module.
 
 The clients and API will evolve independently.

docs/zh/INSTALL.md

@@ -35,5 +35,5 @@ chmod u+x kustomize
 
 <!-- @installkustomize @testAgainstLatestRelease -->
 ```
-go install sigs.k8s.io/kustomize/kustomize
+go install sigs.k8s.io/kustomize/v3/cmd/kustomize
 ```

examples/configGeneration.md

@@ -15,10 +15,8 @@ Kustomize provides two ways of adding ConfigMap in one `kustomization`, either b
 > configMapGenerator:
 > - name: a-configmap
 >   files:
->     # configfile is used as key
 >     - configs/configfile
->     # configkey is used as key
->     - configkey=configs/another_configfile
+>     - configs/another_configfile
 > ```
 
 The ConfigMaps declared as [resource] are treated the same way as other resources. Kustomize doesn't append any hash to the ConfigMap name. The ConfigMap declared from a ConfigMapGenerator is treated differently. A hash is appended to the name and any change in the ConfigMap will trigger a rolling update.

examples/configureBuiltinPlugin.md

@@ -4,7 +4,7 @@
 [plugin]: ../docs/plugins
 [fields]: ../docs/fields.md
 [fields in a kustomization file]: ../docs/fields.md
-[TransformerConfig]: ../api/internal/plugins/builtinconfig/transformerconfig.go
+[TransformerConfig]: ../pkg/transformers/config/transformerconfig.go
 [kustomization]: ../docs/glossary.md#kustomization
 
 # Customizing kustomize

examples/goGetterGeneratorPlugin.md

@@ -5,7 +5,7 @@ Kustomize supports building a [remote target], but the URLs are limited to commo
 To extend the supported format, Kustomize has a [plugin] system that allows one to integrate third-party tools such as [hashicorp/go-getter] to "download things from a string URL suing a variety of protocols", extract the content and generated resources as part of kustomize build.
 
 [remote target]: https://github.com/kubernetes-sigs/kustomize/blob/master/examples/remoteBuild.md
-[Git repository specs]: https://github.com/kubernetes-sigs/kustomize/blob/master/api/internal/git/repospec_test.go
+[Git repository specs]: https://github.com/kubernetes-sigs/kustomize/blob/master/pkg/git/repospec_test.go
 [plugin]: ../docs/plugins
 [hashicorp/go-getter]: https://github.com/hashicorp/go-getter
 

examples/validationTransformer/README.md

@@ -24,7 +24,7 @@ loaded by Kustomize.
 
 Make a place to work:
 
-<!-- @makeWorkplace @kubevalTest -->
+<!-- @makeWorkplace @testAgainstLatestRelease -->
 ```
 DEMO_HOME=$(mktemp -d)
 mkdir -p $DEMO_HOME/valid
@@ -38,7 +38,7 @@ mkdir -p $PLUGINDIR
 Download the [kubeval] binary depending on the operating system
 and add it to $PATH.
 
-<!-- @downloadKubeval @kubevalTest -->
+<!-- @downloadKubeval @testAgainstLatestRelease -->
 ```
 OS=`uname | sed -e 's/Linux/linux/' -e 's/Darwin/darwin/'`
 wget https://github.com/instrumenta/kubeval/releases/download/0.9.2/kubeval-${OS}-amd64.tar.gz
@@ -60,7 +60,7 @@ A transformer plugin for the validation can be written as a
 bash script, which execute the [kubeval] binary and return proper
 output and exit code.
 
-<!-- @writePlugin @kubevalTest -->
+<!-- @writePlugin @testAgainstLatestRelease -->
 ```
 cat <<'EOF' > $PLUGINDIR/Validator
 #!/bin/bash
@@ -95,7 +95,7 @@ chmod +x $PLUGINDIR/Validator
 Define a kustomization containing a valid ConfigMap
 and the transformer plugin.
 
-<!-- @writeKustomization @kubevalTest -->
+<!-- @writeKustomization @testAgainstLatestRelease -->
 ```
 cat <<'EOF' >$DEMO_HOME/valid/configmap.yaml
 apiVersion: v1
@@ -125,7 +125,7 @@ EOF
 Define a kustomization containing an invalid ConfigMap
 and the transformer plugin.
 
-<!-- @writeKustomization @kubevalTest -->
+<!-- @writeKustomization @testAgainstLatestRelease -->
 ```
 cat <<'EOF' >$DEMO_HOME/invalid/configmap.yaml
 apiVersion: v1
@@ -175,7 +175,7 @@ The directory structure is as the following:
 Define a helper function to run kustomize with the
 correct environment and flags for plugins:
 
-<!-- @defineKustomizeBd @kubevalTest -->
+<!-- @defineKustomizeBd @testAgainstLatestRelease -->
 ```
 function kustomizeBd {
   XDG_CONFIG_HOME=$DEMO_HOME \
@@ -187,7 +187,7 @@ function kustomizeBd {
 
 Build the valid variant
 
-<!-- @buildValid @kubevalTest -->
+<!-- @buildValid @testAgainstLatestRelease -->
 ```
 kustomizeBd valid
 ```
@@ -215,7 +215,7 @@ data: Invalid type. Expected: object, given: array
 
 ## cleanup
 
-<!-- @cleanup @kubevalTest -->
+<!-- @cleanup @testAgainstLatestRelease -->
 ```shell
 rm -rf $DEMO_HOME
 ```

examples/zh/README.md

@@ -32,13 +32,13 @@ go get sigs.k8s.io/kustomize/v3/cmd/kustomize
 
   - generator 插件:
 
-    * [last mile helm](chart.md) - 对 helm chart 进行 last mile 修改。
+    * [last mile helm](../chart.md) - 对 helm chart 进行 last mile 修改。
 
-    * [secret generation](secretGeneratorPlugin.md) - 生成 Secret。
+    * [secret generation](../secretGeneratorPlugin.md) - 生成 Secret。
 
   - transformer 插件:
 
-    * [validation transformer](../validationTransformer/README.md) - 通过 transformer 验证资源。
+   * [validation transformer](../validationTransformer/README.md) - 通过 transformer 验证资源。
 
   - 定制内建 transformer 配置
 

examples/zh/chart.md

@@ -1,215 +0,0 @@
-# 使用 kustomize 对 helm chart s进行修改
-
-[last mile]: https://testingclouds.wordpress.com/2018/07/20/844/
-[stable chart]: https://github.com/helm/charts/tree/master/stable
-[Helm charts]: https://github.com/helm/charts
-[_minecraft_]: https://github.com/helm/charts/tree/master/stable/minecraft
-[插件]: ../../docs/plugins
-
-kustomize 并不会读取 [Helm charts] ，但可以使用 generator ß来访问 [Helm charts] 。
-
-使用 [last mile] 模式来结合 kustomize 和 helm ，使用一个 inflated chart 作为基础，然后使用 kustomize 在部署到集群的途中进行修改。
-
-以下示例中使用的 generator 仅适用于 [stable chart] 仓库中的 chart。该示例虽然使用 [_minecraft_] ，但可以应用于任何 chart。
-
-假设 `helm` 已在你的 `$PATH` 中，建立一个工作空间：
-
-<!-- @makeWorkplace @test -->
-```bash
-DEMO_HOME=$(mktemp -d)
-mkdir -p $DEMO_HOME/base
-mkdir -p $DEMO_HOME/dev
-mkdir -p $DEMO_HOME/prod
-```
-
-## 使用远程 chart
-
-定义 _development_ variant（环境）。
-
-这可能涉及许多 kustomizations（参见其他示例），但在本示例中，将 `dev-` 名称前缀添加到所有资源：
-
-<!-- @writeKustDev @test -->
-```bash
-cat <<'EOF' >$DEMO_HOME/dev/kustomization.yaml
-namePrefix:  dev-
-resources:
-- ../base
-EOF
-```
-
-同上，使用 `namePrefix: prod-` 定义生产 variant ：
-
-<!-- @writeKustProd @test -->
-```bash
-cat <<'EOF' >$DEMO_HOME/prod/kustomization.yaml
-namePrefix:  prod-
-resources:
-- ../base
-EOF
-```
-
-这两个 variants 指向同一个 base。
-
-定义这个 base：
-
-<!-- @writeKustDev @test -->
-```bash
-cat <<'EOF' >$DEMO_HOME/base/kustomization.yaml
-generators:
-- chartInflator.yaml
-EOF
-```
-
-base 指向一个名为 `chartInflator.yaml` 的生成配置文件。
-
-此文件允许指定 [stable chart] 的名称及其他内容，例如 values 文件的路径，默认为 `values.yaml` 。
-
-创建配置文件 `chartInflator.yaml`，指定 chart 名称为 _minecraft_：
-
-<!-- @writeGeneratorConfig @test -->
-```bash
-cat <<'EOF' >$DEMO_HOME/base/chartInflator.yaml
-apiVersion: someteam.example.com/v1
-kind: ChartInflator
-metadata:
-  name: notImportantHere
-chartName: minecraft
-EOF
-```
-
-因为这个特定的 YAML 文件列在 kustomization文件的 `generators:` 字段中，所以它被视为生成器插件（由 _apiVersion_ 和 _kind_ 字段标识）与配置插件的其他字段之间的绑定。
-
-将插件下载到 `DEMO_HOME` 并赋予其执行权限：
-
-<!-- @installPlugin @test -->
-```bash
-plugin=plugin/someteam.example.com/v1/chartinflator/ChartInflator
-curl -s --create-dirs -o \
-"$DEMO_HOME/kustomize/$plugin" \
-"https://raw.githubusercontent.com/\
-kubernetes-sigs/kustomize/master/$plugin"
-
-chmod a+x $DEMO_HOME/kustomize/$plugin
-```
-
-检查目录布局：
-
-<!-- @tree -->
-```bash
-tree $DEMO_HOME
-```
-
-将会得倒类似的目录及文件：
-
-> ```bash
-> /tmp/whatever
-> ├── base
-> │   ├── chartInflator.yaml
-> │   └── kustomization.yaml
-> ├── dev
-> │   └── kustomization.yaml
-> ├── kustomize
-> │   └── plugin
-> │       └── someteam.example.com
-> │           └── v1
-> │               └── chartinflator
-> │                  └── ChartInflator
-> └── prod
->    └── kustomization.yaml
-> ```
-
-运行 kustomize 定义一个 helper function 来传入正确的环境和常见标志：
-
-<!-- @defineKustomizeIt @test -->
-```
-function kustomizeIt {
-  XDG_CONFIG_HOME=$DEMO_HOME \
-  kustomize build --enable_alpha_plugins \
-    $DEMO_HOME/$1
-}
-```
-
-最终构建 `prod` variant。这里要注意的是，所有资源名称现在都具有 `prod-` 前缀：
-
-<!-- @doProd @test -->
-```bash
-clear
-kustomizeIt prod
-```
-
-比较 `dev` 和 `prod`：
-
-<!-- @doCompare -->
-```bash
-diff <(kustomizeIt dev) <(kustomizeIt prod) | more
-```
-
-在 base上 运行 kustomize 查看未修改但已展开的 chart。
-这里的每次调用都是重新下载并重新展开 chart。
-
-<!-- @showBase @test -->
-```bash
-kustomizeIt base
-```
-
-## 使用本地 chart
-
-上面的示例由于未在配置中指定本地 chart 的主目录，所以kustomize会取得远程chart的副本并存在临时目录中。
-
-要禁止 fetch，请明确指定 `charHome` ，并确保chart 已经被保存在该目录下
-
-要进行演示，并且不会干扰您现有的 helm 环境，请执行以下操作：
-
-<!-- @helmInit @test -->
-```bash
-helmHome=$DEMO_HOME/dothelm
-chartHome=$DEMO_HOME/base/charts
-
-function doHelm {
-  helm --home $helmHome $@
-}
-
-# 在新位置创建 helm 配置文件。
-# 初始化命令比较复杂
-doHelm init --client-only >& /dev/null
-```
-
-现在下载 chart ； 可以再次使用的 [_minecraft_] （也可以使用其他的 chart ）：
-
-<!-- @fetchChart @test -->
-```bash
-doHelm fetch --untar \
-    --untardir $chartHome \
-    stable/minecraft
-```
-
-使用 tree 查看更多信息；helm 配置数据和完整的 chart 副本：
-
-<!-- @tree -->
-```bash
-tree $DEMO_HOME
-```
-
-将 `chartHome` 字段添加到生成器的配置文件中，以便可以查找本地 chart：
-
-<!-- @modifyGenConfig @test -->
-```bash
-echo "chartHome: $chartHome" >>$DEMO_HOME/base/chartInflator.yaml
-```
-
-更改 values 文件，用来展示本地 chart 的更改：
-
-<!-- @valueChange @test -->
-```
-sed -i 's/CHANGEME!/SOMETHINGELSE/' $chartHome/minecraft/values.yaml
-sed -i 's/LoadBalancer/NodePort/' $chartHome/minecraft/values.yaml
-```
-
-最后进行构建：
-
-<!-- @finalProd @test -->
-```bash
-kustomizeIt prod
-```
-
-观察结果中 `LoadBalancer` 变为 `NodePort`，并且加密的密码也有所不同。

examples/zh/secretGeneratorPlugin.md

@@ -1,193 +0,0 @@
-[ConfigMaps]: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.13/#configmap-v1-core
-[ELF]: https://en.wikipedia.org/wiki/Executable_and_Linkable_Format
-[Go plugin]: https://golang.org/pkg/plugin
-[Secrets]: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.13/#secret-v1-core
-[base64]: https://tools.ietf.org/html/rfc4648#section-4
-[configuration directory]: https://wiki.archlinux.org/index.php/XDG_Base_Directory#Specification
-[grpc]: https://grpc.io
-[tag]: https://github.com/kubernetes-sigs/kustomize/releases
-[v2.0.3]: https://github.com/kubernetes-sigs/kustomize/releases/tag/v2.0.3
-[`exec.Command`]: https://golang.org/pkg/os/exec/#Command
-
-# 生成 Secrets
-
-## Secret 是什么？
-
-Kubernetes 的 [ConfigMaps] 和 [Secrets] 都是key:value map，但 [Secrets] 的内容更为敏感，比如：密码或者 ssh 秘钥。
-
-Kubernetes 开发者以各种方式工作，Secrets 保存的信息相比 ConfigMaps,Deployments 等的配置信息需要更谨慎的隐藏。
-
-## 创建一个工作空间
-
-<!-- @establishBase @test -->
-```bash
-DEMO_HOME=$(mktemp -d)
-```
-
-## 来自本地文件的 Secret
-
-kustomize 可以通过三种不同的方式生成来自本地文件的 Secret 。
-
- * 从 _env_ 文件中获取（`NAME = VALUE`，每行一个）
- * 使用文件内容来生成一个 secret
- * 从 kustomization.yaml 文件获取 secret
-
-这里有一个示例结合所有的三种方式：
-
-创建一个包含一些短密码的 env 文件：
-
-<!-- @makeEnvFile @test -->
-```bash
-cat <<'EOF' >$DEMO_HOME/foo.env
-ROUTER_PASSWORD=admin
-DB_PASSWORD=iloveyou
-EOF
-```
-
-创建一个长密码的文本文件：
-
-<!-- @makeLongSecretFile @test -->
-```bash
-cat <<'EOF' >$DEMO_HOME/longsecret.txt
-Lorem ipsum dolor sit amet,
-consectetur adipiscing elit,
-sed do eiusmod tempor incididunt
-ut labore et dolore magna aliqua.
-EOF
-```
-
-创建一个kustomization.yaml 文件, 其中包含引用上面文件的 secretGenerator, 并且另外定义一些文字 KV 对：
-
-<!-- @makeKustomization1 @test -->
-```bash
-cat <<'EOF' >$DEMO_HOME/kustomization.yaml
-secretGenerator:
-- name: mysecrets
-  envs:
-  - foo.env
-  files:
-  - longsecret.txt
-  literals:
-  - FRUIT=apple
-  - VEGETABLE=carrot
-EOF
-```
-
-生成 Secret ：
-
-<!-- @build1 @test -->
-```bash
-result=$(kustomize build $DEMO_HOME)
-echo "$result"
-# Spot check the result:
-test 1 == $(echo "$result" | grep -c "FRUIT: YXBwbGU=")
-```
-
-将会得到类似的内容：
-
-> ```yaml
-> apiVersion: v1
-> kind: Secret
-> metadata:
->   name: mysecrets-hfb5df789h
-> type: Opaque
-> data:
->   FRUIT: YXBwbGU=
->   VEGETABLE: Y2Fycm90
->   ROUTER_PASSWORD: YWRtaW4=
->   DB_PASSWORD: aWxvdmV5b3U=
->   longsecret.txt: TG9yZW0gaXBzdW0gZG9sb3Igc2l0I... (elided)
-> ```
-
-资源名称的前缀为 `mysecrets`（在 kustomization.yaml 中指定），后跟其内容的哈希值。
-
-使用 base64 解码器确认这些值的原始版本。
-
-这三种方法共同的问题是创建 Secret 所使用的敏感数据必须保存磁盘上。
-
-这会增加额外的安全问题：对本地存储的敏感文件的查看、安装和删除权限的控制等。
-
-## 来自任何地方的 Secret
-
-一般的替代方案是在[generator](../../docs/plugins)中生成 secrets 。
-
-然后，这些值可以通过经过身份验证和授权的 RPC 进入密码保险库服务。
-
-[sgp]: ../../plugin/someteam.example.com/v1/secretsfromdatabase
-
-这里有一个[secret 生成器][sgp]，它模拟从数据库中拉取 map 中的值。
-
-下载
-
-<!-- @copyPlugin @test -->
-```bash
-repo=https://raw.githubusercontent.com/kubernetes-sigs/kustomize
-pPath=plugin/someteam.example.com/v1/secretsfromdatabase
-dir=$DEMO_HOME/kustomize/$pPath
-
-mkdir -p $dir
-
-curl -s -o $dir/SecretsFromDatabase.go \
-  ${repo}/master/$pPath/SecretsFromDatabase.go
-```
-
-运行 kustomize build 生成结果
-
-<!-- @compilePlugin @xtest -->
-```bash
-go build -buildmode plugin \
-  -o $dir/SecretsFromDatabase.so \
-  $dir/SecretsFromDatabase.go
-```
-
-创建一个配置文件：
-
-<!-- @makeConfiguration @test -->
-```bash
-cat <<'EOF' >$DEMO_HOME/secretFromDb.yaml
-apiVersion: someteam.example.com/v1
-kind: SecretsFromDatabase
-metadata:
-  name: mySecretGenerator
-name: forbiddenValues
-namespace: production
-keys:
-- ROCKET
-- VEGETABLE
-EOF
-```
-
-创建一个引用此生成器的新 kustomization.yaml 文件：
-
-<!-- @makeKustomization2 @test -->
-```bash
-cat <<'EOF' >$DEMO_HOME/kustomization.yaml
-generators:
-- secretFromDb.yaml
-EOF
-```
-
-最终生成 secret ，设置 `XDG_CONFIG_HOME` 以便可以在 `$DEMO_HOME` 中找到该生成器：
-
-<!-- @build2 @xtest -->
-```bash
-result=$( \
-  XDG_CONFIG_HOME=$DEMO_HOME \
-  kustomize build --enable_alpha_plugins $DEMO_HOME )
-echo "$result"
-# Spot check the result:
-test 1 == $(echo "$result" | grep -c "FRUIT: YXBwbGU=")
-```
-
-将会得到类似的内容：
-
-> ```yaml
-> apiVersion: v1
-> kind: Secret
-> metadata:
->   name: mysecrets-bdt27dbkd6
-> type: Opaque
-> data:
->  FRUIT: YXBwbGU=
->  VEGETABLE: Y2Fycm90
-> ```

go.mod

@@ -0,0 +1,25 @@
+module sigs.k8s.io/kustomize/v3
+
+go 1.12
+
+require (
+	github.com/evanphx/json-patch v4.5.0+incompatible
+	github.com/go-openapi/spec v0.19.2
+	github.com/gogo/protobuf v1.3.0 // indirect
+	github.com/golangci/golangci-lint v1.19.1
+	github.com/gorilla/mux v1.7.3 // indirect
+	github.com/gorilla/sessions v1.2.0 // indirect
+	github.com/gorilla/websocket v1.4.1 // indirect
+	github.com/monopole/mdrip v0.2.48
+	github.com/pkg/errors v0.8.1
+	github.com/russross/blackfriday v2.0.0+incompatible // indirect
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/spf13/pflag v1.0.5
+	gopkg.in/yaml.v2 v2.2.2
+	k8s.io/api v0.0.0-20190313235455-40a48860b5ab
+	k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1
+	k8s.io/client-go v11.0.0+incompatible
+	k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208
+	sigs.k8s.io/kustomize/pluginator v1.0.0
+	sigs.k8s.io/yaml v1.1.0
+)

go.sum

@@ -1,16 +1,4 @@
 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=
-github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest v0.9.2/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/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
-github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
-github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
-github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM=
-github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
-github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
@@ -45,9 +33,6 @@ 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/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
-github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
-github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.6+incompatible h1:tfrHha8zJ01ywiOEC1miGY8st1/igzWB8OmvPgoYX7w=
 github.com/emicklei/go-restful v2.9.6+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
@@ -66,22 +51,19 @@ github.com/go-lintpack/lintpack v0.5.2 h1:DI5mA3+eKdWeJ40nU4d6Wc26qmdG8RCi/btYq0
 github.com/go-lintpack/lintpack v0.5.2/go.mod h1:NwZuYi2nUHho8XEIZ6SIxihrnPoqBTDqfpXvXAN0sXM=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 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/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
+github.com/go-openapi/jsonpointer v0.19.2 h1:A9+F4Dc/MCNB5jibxf6rRvOvR/iFgQdyNx9eIhnGqq0=
 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.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
 github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
-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/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCrE=
+github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
 github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
+github.com/go-openapi/swag v0.19.2 h1:jvO6bCMBEilGwMfHhrd61zIID4oIFdwb76V17SM88dE=
 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-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=
@@ -108,15 +90,15 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
-github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gogo/protobuf v1.3.0 h1:G8O7TerXerS4F6sx9OV7/nRfJdnXgHZu/S/7F2SN+UE=
+github.com/gogo/protobuf v1.3.0/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-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -151,47 +133,39 @@ github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod h1:qOQCunE
 github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys=
 github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
 github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.3.0 h1:CcQijm0XKekKjP/YCz28LXVSpgguuB+nCxaSjCe09y0=
 github.com/googleapis/gnostic v0.3.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-github.com/gophercloud/gophercloud v0.6.0/go.mod h1:GICNByuaEBibcjmjvI7QvYJSZEbGkcYwAR7EZK2WMqM=
-github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f h1:9oNbS1z4rVpbnkHBdPZU4jo9bSmrLpII768arSyMFgk=
-github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
-github.com/gorilla/mux v1.6.0 h1:UykbtMB/w5No2LmE16gINgLj+r/vbziTgaoERQv6U+0=
-github.com/gorilla/mux v1.6.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/securecookie v0.0.0-20160422134519-667fe4e3466a h1:YH0IojQwndMQdeRWdw1aPT8bkbiWaYR3WD+Zf5e09DU=
-github.com/gorilla/securecookie v0.0.0-20160422134519-667fe4e3466a/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/sessions v0.0.0-20160922145804-ca9ada445741 h1:OuuPl66BpF1q3OEkaPpp+VfzxrBBY62ATGdWqql/XX8=
-github.com/gorilla/sessions v0.0.0-20160922145804-ca9ada445741/go.mod h1:+WVp8kdw6VhyKExm03PAMRn2ZxnPtm58pV0dBVPdhHE=
-github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
+github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
+github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
+github.com/gorilla/sessions v1.2.0 h1:S7P+1Hm5V/AT9cjEcUD5uDaQSX0OE577aCXgoaKpYbQ=
+github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3 h1:JVnpOZS+qxli+rgVl98ILOXVNbW+kb5wcxeGx8ShUIw=
 github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE=
-github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 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/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 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=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok=
-github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
@@ -217,8 +191,8 @@ github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDe
 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-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.0.0-20190620125010-da37f6c1e481 h1:IaSjLMT6WvkoZZjspGxy3rdaTEmWLoRm49WbtVUi9sA=
+github.com/mailru/easyjson v0.0.0-20190620125010-da37f6c1e481/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/matoous/godox v0.0.0-20190910121045-032ad8106c86 h1:q6SrfsK4FojRnJ1j8+8OJzyq3g9Y1oSVyL6nYGJXXBk=
 github.com/matoous/godox v0.0.0-20190910121045-032ad8106c86/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s=
 github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
@@ -232,32 +206,32 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk
 github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk=
 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=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-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/monopole/mdrip v1.0.0 h1:RFDBa+tab6mW+gX4Ww2SZDc4kS6p01FwnLtgz64Il+I=
-github.com/monopole/mdrip v1.0.0/go.mod h1:N1/ppRG9CaPeUKAUHZ3dUlfOT81lTpKZLkyhCvTETwM=
+github.com/monopole/mdrip v0.2.48 h1:LVXlMzEyJOPouL5MYN9z61rMHwatLV1JZZSN+mmI6zI=
+github.com/monopole/mdrip v0.2.48/go.mod h1:rzORfdNQ63T/tS95GOFHB+I3OrT+Bjlk8krOc/QiL/8=
 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=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E=
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 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/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=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -275,7 +249,6 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 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-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
 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.0.0+incompatible h1:cBXrhZNUf9C+La9/YpS+UHpUT8YD6Td9ZMSU9APFcsk=
@@ -297,11 +270,12 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k
 github.com/sourcegraph/go-diff v0.5.1 h1:gO6i5zugwzo1RVTvgvfwCOSVegNuvnNi6bAD1QCmkHs=
 github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-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.2 h1:NfkwRbgViGoyjBKsLI0QMDcuMnhM+SBg3T0cGfpvKDE=
+github.com/spf13/cobra v0.0.2/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 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/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
@@ -319,6 +293,7 @@ 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.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 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=
@@ -345,29 +320,27 @@ 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-20190308221718-c2843e01d9a2/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 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 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-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-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-20190311183353-d8887717615a/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=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190909003024-a7b16738d86b h1:XfVGCX+0T4WOStkaOsJRllbsiImhB2jgVBGc9L0lPGc=
 golang.org/x/net v0.0.0-20190909003024-a7b16738d86b/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-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=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -384,6 +357,8 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
 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-20190621203818-d432491b9138 h1:t8BZD9RDjkm9/h7yYN6kE8oaeov5r9aztkB7zKA5Tkg=
+golang.org/x/sys v0.0.0-20190621203818-d432491b9138/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5 h1:SW/0nsKCUaozCUtZTakri5laocGx/5bkDSSLrFUsa5s=
 golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -391,7 +366,6 @@ golang.org/x/text v0.3.0/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-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/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=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -404,6 +378,7 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/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-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
@@ -413,12 +388,12 @@ golang.org/x/tools v0.0.0-20190912215617-3720d1ec3678 h1:rM1Udd0CgtYI3KUIhu9ROz0
 golang.org/x/tools v0.0.0-20190912215617-3720d1ec3678/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -432,30 +407,32 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 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 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 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=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+k8s.io/api v0.0.0-20190313235455-40a48860b5ab h1:DG9A67baNpoeweOy2spF1OWHhnVY5KR7/Ek/+U1lVZc=
+k8s.io/api v0.0.0-20190313235455-40a48860b5ab/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
+k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1 h1:IS7K02iBkQXpCeieSiyJjGoLSdVOv2DbPaWHJ+ZtgKg=
+k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
+k8s.io/client-go v11.0.0+incompatible h1:LBbX2+lOwY9flffWlJM7f1Ct8V2SRNiMRDFeiwnJo9o=
+k8s.io/client-go v11.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-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-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+k8s.io/klog v0.3.3 h1:niceAagH1tzskmaie/icWd7ci1wbG7Bf2c6YGcQv+3c=
+k8s.io/klog v0.3.3/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 h1:5sW+fEHvlJI3Ngolx30CmubFulwH28DhKjGf70Xmtco=
+k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208/go.mod h1:nfDlWeOsu3pUf4yWGL+ERqohP4YsZcBJXWMK+gkzOA4=
 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=
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo=
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
 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/kustomize/pseudo/k8s v0.0.0-20191108212413-1f86a0ca5d6c h1:t7fk+ljA3Ru4pro+/0RuOAZcODDhByL1fvIdyHLhjTY=
-sigs.k8s.io/kustomize/pseudo/k8s v0.0.0-20191108212413-1f86a0ca5d6c/go.mod h1:bl/gVJgYYhJZCZdYU2BfnaKYAlqFkgbJEkpl302jEss=
-sigs.k8s.io/kustomize/pseudo/k8s v0.1.0 h1:otg4dLFc03c3gzl+2CV8GPGcd1kk8wjXwD+UhhcCn5I=
-sigs.k8s.io/kustomize/pseudo/k8s v0.1.0/go.mod h1:bl/gVJgYYhJZCZdYU2BfnaKYAlqFkgbJEkpl302jEss=
+sigs.k8s.io/kustomize/pluginator v1.0.0 h1:aeLqD8CIaqr++49YrcuRUcXl5vVKYLhCSfwXUi3ifQ4=
+sigs.k8s.io/kustomize/pluginator v1.0.0/go.mod h1:i8HdU5FdH1zDjCKiFf5CNl7slsc0QffyKsY2OuPynJ0=
+sigs.k8s.io/kustomize/v3 v3.2.0/go.mod h1:ztX4zYc/QIww3gSripwF7TBOarBTm5BvyAMem0kCzOE=
 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=

hack/crawl/go.mod

@@ -1,21 +0,0 @@
-module sigs.k8s.io/kustomize/hack/crawl
-
-go 1.13
-
-require (
-	github.com/elastic/go-elasticsearch/v6 v6.8.2
-	github.com/gogo/protobuf v1.3.1 // indirect
-	github.com/gomodule/redigo v2.0.0+incompatible
-	github.com/google/go-cmp v0.3.1 // indirect
-	github.com/googleapis/gnostic v0.3.0 // indirect
-	github.com/gorilla/mux v1.7.3
-	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
-	github.com/json-iterator/go v1.1.8 // indirect
-	github.com/rs/cors v1.7.0
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a // indirect
-	sigs.k8s.io/kustomize/api v0.1.1
-	sigs.k8s.io/yaml v1.1.0
-)
-
-replace sigs.k8s.io/kustomize/api v0.0.0 => ../../api

hack/doGoMod.sh

@@ -1,10 +0,0 @@
-# Usage:  From repo root:
-#  ./hack/doGoMod.sh tidy
-#  ./hack/doGoMod.sh verify
-
-operation=$1
-for f in $(find ./ -name 'go.mod'); do
-  echo $f
-  d=$(dirname "$f")
-  (cd $d; go mod $operation)
-done

hack/imports.sh

@@ -1,5 +0,0 @@
-for f in $(find ./ -name '*.go'); do
-  echo $f
-  # go run go.coder.com/go-tools/cmd/goimports
-  ~/gopath/bin/goimports -w $f
-done

hack/runPluginUnitTests.sh

@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2019 The Kubernetes Authors.
-# SPDX-License-Identifier: Apache-2.0
-
-# TODO: get rid of this script, make individual targets
-# in the makefile.
-
-# Run this script with no arguments from the repo root
-# to test all the plugins.
-
-# Want this to keep going even if one test fails,
-# to see how many pass, so do not errexit.
-set -o nounset
-# set -o errexit
-set -o pipefail
-
-rcAccumulator=0
-
-function onLinuxAndNotOnTravis {
-  [[ ("linux" == "$(go env GOOS)") && (-z ${TRAVIS+x}) ]] && return
-  false
-}
-
-function runTest {
-  local file=$1
-  local code=0
-  if grep -q "// +build notravis" "$file"; then
-    if onLinuxAndNotOnTravis; then
-      go test -v -tags=notravis $file 
-      code=$?
-    else
-      # TODO: make work for non-linux
-      echo "Not on linux or on travis; skipping $file"
-    fi
-  else
-    go test -v $file
-    code=$?
-  fi
-  rcAccumulator=$((rcAccumulator || $code))
-  if [ $code -ne 0 ]; then
-    echo "Failure in $d"
-  fi
-}
-
-function scanDir {
-  pushd $1 >& /dev/null
-  echo "Testing $1"
-  for t in $(find . -name '*_test.go'); do
-    runTest $t
-  done
-  popd >& /dev/null
-}
-
-if onLinuxAndNotOnTravis; then
-  # Some of these tests have special deps.
-  make $(go env GOPATH)/bin/helm
-  make $(go env GOPATH)/bin/kubeval
-fi
-
-for goMod in $(find ./plugin -name 'go.mod'); do
-  d=$(dirname "${goMod}")
-  if [[ "$d" == "./plugin/someteam.example.com/v1/gogetter" ]]; then
-    echo "Skipping broken $d"
-  else
-    scanDir $d                                                             
-  fi
-done
-
-if [ $rcAccumulator -ne 0 ]; then
-  echo "FAILURE; exit code $rcAccumulator"
-  exit 1
-fi
-
-

hack/unpinRepinPluginApiDep.sh

@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2019 The Kubernetes Authors.
-# SPDX-License-Identifier: Apache-2.0
-
-# This script unpins or repins the Go kustomize API dependence
-# for all the plugins in the repo.
-
-# Run this from repo root, e.g.
-#
-#   ./hack/unpinRepinPluginApiDep.sh unPin v0.1.1
-#
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-operation=$1
-version=$2
-
-if [[ ("$operation" != "unPin") && ("$operation" != "rePin") ]]; then
-  echo "unknown operation $operation"
-  exit 1
-fi
-
-function addReplace {
-  go mod edit -replace=sigs.k8s.io/kustomize/api@${version}=$1
-  go mod tidy
-}
-
-function dropReplace {
-  go mod edit -dropreplace=sigs.k8s.io/kustomize/api@${version}
-  go mod tidy
-}
-
-function forEachGoMod {
-  for goMod in $(find $2 -name 'go.mod'); do
-    d=$(dirname "${goMod}")
-    echo $d
-    (cd $d; $1 $3 )
-  done
-}
-
-function unPin {
-  forEachGoMod addReplace ./plugin/builtin              ../../../api
-  forEachGoMod addReplace ./plugin/someteam.example.com ../../../../api
-}
-
-function rePin {
-  forEachGoMod dropReplace ./plugin/builtin
-  forEachGoMod dropReplace ./plugin/someteam.example.com
-}
-
-$operation

hack/whatApi.sh

@@ -1,41 +0,0 @@
-# Report how kustomize and the plugins use the API module.
-#
-# Usage:
-#   ./hack/whatApi.sh plugin
-#   ./hack/whatApi.sh kustomize
-
-# The packages listed below in 'grep -v' lines will
-# likely appear in API v1.
-#
-# Packages not listed (i.e. emitted to stdout) will
-# likely move to internal.
-#
-function whatApi {
-  echo "==== begin $1 =================================="
-    find $1 -name "*.go" |\
-    xargs grep \"sigs.k8s.io/kustomize/api/ |\
-    sed 's|:\s"|: dummy "|'   |\
-    sed 's|:\s\w\+\s"|  |'    |\
-    sed 's|"$||'              |\
-    awk '{ printf "%60s  %s\n", $2, $1 }' |\
-    sed 's|sigs.k8s.io/kustomize/api/||' |\
-    sort |\
-    uniq |\
-    grep -v " filesys "    |\
-    grep -v " hasher "     |\
-    grep -v " ifc "        |\
-    grep -v " inventory "  |\
-    grep -v " konfig"      |\
-    grep -v " krusty "     |\
-    grep -v " kv "         |\
-    grep -v " provenance " |\
-    grep -v " resid "      |\
-    grep -v " resmap "     |\
-    grep -v " resource "   |\
-    grep -v " testutils"   |\
-    grep -v " types "
-  echo "==== end $1 =================================="
-}
-
-
-whatApi $1

internal/kusterr/configmaperror.go

@@ -14,16 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package workqueue
+// Package error has contextual error types.
+package kusterr
 
-import (
-	"math/rand"
-	"os"
-	"testing"
-	"time"
-)
+import "fmt"
 
-func TestMain(m *testing.M) {
-	rand.Seed(time.Now().UnixNano())
-	os.Exit(m.Run())
+// ConfigmapError represents error with a configmap.
+type ConfigmapError struct {
+	Path     string
+	ErrorMsg string
+}
+
+func (e ConfigmapError) Error() string {
+	return fmt.Sprintf("Kustomization file [%s] encounters a configmap error: %s\n", e.Path, e.ErrorMsg)
 }

internal/kusterr/configmaperror_test.go

@@ -0,0 +1,37 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kusterr
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestConfigmapError_Error(t *testing.T) {
+	errorMsg := "configmap name is missing"
+	me := ConfigmapError{Path: filepath, ErrorMsg: errorMsg}
+
+	if !strings.Contains(me.Error(), filepath) {
+		t.Errorf("Incorrect ConfigmapError.Error() message \n")
+		t.Errorf("Expected filepath %s, but unfound\n", filepath)
+	}
+
+	if !strings.Contains(me.Error(), errorMsg) {
+		t.Errorf("Incorrect ConfigmapError.Error() message \n")
+		t.Errorf("Expected errorMsg %s, but unfound\n", errorMsg)
+	}
+}

internal/kusterr/patcherror.go

@@ -14,10 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package
-// +k8s:protobuf-gen=package
-// +k8s:openapi-gen=true
+package kusterr
 
-// +groupName=coordination.k8s.io
+import (
+	"fmt"
+)
 
-package v1beta1 // import "sigs.k8s.io/kustomize/pseudo/k8s/api/coordination/v1beta1"
+// PatchError represents error during Patch.
+type PatchError struct {
+	KustomizationPath string
+	PatchFilepath     string
+	ErrorMsg          string
+}
+
+func (e PatchError) Error() string {
+	return fmt.Sprintf("Kustomization file [%s] encounters a patch error for [%s]: %s\n", e.KustomizationPath, e.PatchFilepath, e.ErrorMsg)
+}

internal/kusterr/patcherror_test.go

@@ -0,0 +1,40 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kusterr
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestPatchError_Error(t *testing.T) {
+	patchfilepath := "/path/to/patch/patch.yaml"
+	errorMsg := "file not found"
+	me := PatchError{KustomizationPath: filepath, PatchFilepath: patchfilepath, ErrorMsg: errorMsg}
+	if !strings.Contains(me.Error(), filepath) {
+		t.Errorf("Incorrect PatchError.Error() message \n")
+		t.Errorf("Expected filepath %s, but unfound\n", filepath)
+	}
+	if !strings.Contains(me.Error(), patchfilepath) {
+		t.Errorf("Incorrect PatchError.Error() message \n")
+		t.Errorf("Expected patchfilepath %s, but unfound\n", patchfilepath)
+	}
+	if !strings.Contains(me.Error(), errorMsg) {
+		t.Errorf("Incorrect PatchError.Error() message \n")
+		t.Errorf("Expected errorMsg %s, but unfound\n", errorMsg)
+	}
+}

internal/kusterr/resourceerror.go

@@ -0,0 +1,30 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kusterr
+
+import "fmt"
+
+// ResourceError represents error in a resource.
+type ResourceError struct {
+	KustomizationPath string
+	ResourceFilepath  string
+	ErrorMsg          string
+}
+
+func (e ResourceError) Error() string {
+	return fmt.Sprintf("Kustomization file [%s] encounters a resource error for [%s]: %s\n", e.KustomizationPath, e.ResourceFilepath, e.ErrorMsg)
+}

internal/kusterr/resourceerror_test.go

@@ -0,0 +1,40 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kusterr
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestResourceError_Error(t *testing.T) {
+	resourcefilepath := "/path/to/resource/deployment.yaml"
+	errorMsg := "file not found"
+	me := ResourceError{KustomizationPath: filepath, ResourceFilepath: resourcefilepath, ErrorMsg: errorMsg}
+	if !strings.Contains(me.Error(), filepath) {
+		t.Errorf("Incorrect ResourceError.Error() message \n")
+		t.Errorf("Expected filepath %s, but unfound\n", filepath)
+	}
+	if !strings.Contains(me.Error(), resourcefilepath) {
+		t.Errorf("Incorrect ResourceError.Error() message \n")
+		t.Errorf("Expected resourcefilepath %s, but unfound\n", resourcefilepath)
+	}
+	if !strings.Contains(me.Error(), errorMsg) {
+		t.Errorf("Incorrect ResourceError.Error() message \n")
+		t.Errorf("Expected errorMsg %s, but unfound\n", errorMsg)
+	}
+}

internal/kusterr/secreterror.go

@@ -14,16 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cache
+package kusterr
 
-import (
-	"math/rand"
-	"os"
-	"testing"
-	"time"
-)
+import "fmt"
 
-func TestMain(m *testing.M) {
-	rand.Seed(time.Now().UnixNano())
-	os.Exit(m.Run())
+// SecretError represents error with a secret.
+type SecretError struct {
+	KustomizationPath string
+	// ErrorMsg is an error message
+	ErrorMsg string
+}
+
+func (e SecretError) Error() string {
+	return fmt.Sprintf("Kustomization file [%s] encounters a secret error: %s\n", e.KustomizationPath, e.ErrorMsg)
 }

internal/kusterr/secreterror_test.go

@@ -14,18 +14,23 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package fake
+package kusterr
 
 import (
-	authenticationv1 "sigs.k8s.io/kustomize/pseudo/k8s/api/authentication/v1"
-	core "sigs.k8s.io/kustomize/pseudo/k8s/client-go/testing"
+	"strings"
+	"testing"
 )
 
-func (c *FakeServiceAccounts) CreateToken(name string, tr *authenticationv1.TokenRequest) (*authenticationv1.TokenRequest, error) {
-	obj, err := c.Fake.Invokes(core.NewCreateSubresourceAction(serviceaccountsResource, name, "token", c.ns, tr), &authenticationv1.TokenRequest{})
-
-	if obj == nil {
-		return nil, err
+func TestSecretError_Error(t *testing.T) {
+	errorMsg := "missing a command"
+	me := SecretError{KustomizationPath: filepath, ErrorMsg: errorMsg}
+	if !strings.Contains(me.Error(), filepath) {
+		t.Errorf("Incorrect SecretError.Error() message \n")
+		t.Errorf("Expected filepath %s, but unfound\n", filepath)
+	}
+
+	if !strings.Contains(me.Error(), errorMsg) {
+		t.Errorf("Incorrect SecretError.Error() message \n")
+		t.Errorf("Expected errorMsg %s, but unfound\n", errorMsg)
 	}
-	return obj.(*authenticationv1.TokenRequest), err
 }