Make types package public.

pkg/accumulator/resaccumulator.go

@@ -12,7 +12,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // ResAccumulator accumulates resources and the rules

pkg/accumulator/resaccumulator_test.go

@@ -17,7 +17,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/resmaptest"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func makeResAccumulator(t *testing.T) (*ResAccumulator, *resource.Factory) {

pkg/ifc/ifc.go

@@ -6,7 +6,7 @@ package ifc
 
 import (
 	"sigs.k8s.io/kustomize/v3/pkg/gvk"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // Validator provides functions to validate annotations and labels

pkg/image/deprecatedimage.go

@@ -1,32 +0,0 @@
-/*
-Copyright 2019 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 image
-
-// DeprecatedImage contains an image and a new tag,
-// which will replace the original tag.
-// Deprecated, instead use Image.
-type DeprecatedImage struct {
-	// Name is a tag-less image name.
-	Name string `json:"name,omitempty" yaml:"name,omitempty"`
-
-	// NewTag is the value to use in replacing the original tag.
-	NewTag string `json:"newTag,omitempty" yaml:"newTag,omitempty"`
-
-	// Digest is the value used to replace the original image tag.
-	// If digest is present NewTag value is ignored.
-	Digest string `json:"digest,omitempty" yaml:"digest,omitempty"`
-}

pkg/image/image.go

@@ -1,23 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package image provides struct definitions and libraries
-// for image overwriting of names, tags and digest.
-package image
-
-// Image contains an image name, a new name, a new tag or digest,
-// which will replace the original name and tag.
-type Image struct {
-	// Name is a tag-less image name.
-	Name string `json:"name,omitempty" yaml:"name,omitempty"`
-
-	// NewName is the value used to replace the original name.
-	NewName string `json:"newName,omitempty" yaml:"newName,omitempty"`
-
-	// NewTag is the value used to replace the original tag.
-	NewTag string `json:"newTag,omitempty" yaml:"newTag,omitempty"`
-
-	// Digest is the value used to replace the original image tag.
-	// If digest is present NewTag value is ignored.
-	Digest string `json:"digest,omitempty" yaml:"digest,omitempty"`
-}

pkg/kusttest/kusttestharness.go

@@ -19,8 +19,8 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	"sigs.k8s.io/kustomize/v3/pkg/target"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers/config/defaultconfig"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // KustTestHarness helps test kustomization generation and transformation.

pkg/patch/strategicmerge.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 package patch
 
-import "sigs.k8s.io/kustomize/v3/pkg/types"
+import "sigs.k8s.io/kustomize/v3/types"
 
 // Append appends a slice of patch paths to a PatchStrategicMerge slice
 func Append(patches []types.PatchStrategicMerge, paths ...string) []types.PatchStrategicMerge {

pkg/patch/strategicmerge_test.go

@@ -6,7 +6,7 @@ package patch
 import (
 	"testing"
 
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func buildPatchStrategicMergeSlice(patchStrings []string) []types.PatchStrategicMerge {

pkg/plugins/config.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/spf13/pflag"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 const (

pkg/plugins/execplugin.go

@@ -15,7 +15,7 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/v3/pkg/resid"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

pkg/plugins/execplugin_test.go

@@ -12,8 +12,8 @@ import (
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func TestExecPluginConfig(t *testing.T) {

pkg/plugins/loader.go

@@ -16,7 +16,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/resid"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 type Loader struct {

pkg/resmap/factory.go

@@ -8,7 +8,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/internal/kusterr"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // Factory makes instances of ResMap.

pkg/resmap/factory_test.go

@@ -16,8 +16,8 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/loader"
 	. "sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resmaptest"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func TestFromFile(t *testing.T) {

pkg/resmap/resmap.go

@@ -14,7 +14,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/resid"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

pkg/resmap/resmap_test.go

@@ -14,7 +14,7 @@ import (
 	. "sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resmaptest"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 var rf = resource.NewFactory(

pkg/resmap/selector_test.go

@@ -8,7 +8,7 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/pkg/gvk"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func setupRMForPatchTargets(t *testing.T) resmap.ResMap {

pkg/resource/factory.go

@@ -11,7 +11,7 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/internal/kusterr"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // Factory makes instances of Resource.

pkg/resource/factory_test.go

@@ -22,7 +22,7 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 	. "sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func TestSliceFromPatches(t *testing.T) {

pkg/resource/resource.go

@@ -10,7 +10,7 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/resid"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

pkg/resource/resource_test.go

@@ -24,7 +24,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/gvk"
 	"sigs.k8s.io/kustomize/v3/pkg/resid"
 	. "sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 var factory = NewFactory(

pkg/target/kusttarget.go

@@ -20,8 +20,8 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/plugin/builtin"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

pkg/target/kusttarget_configplugin.go

@@ -4,11 +4,10 @@
 package target
 
 import (
-	"sigs.k8s.io/kustomize/v3/pkg/image"
 	"sigs.k8s.io/kustomize/v3/pkg/plugins"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // Functions dedicated to configuring the builtin
@@ -261,7 +260,7 @@ var transformerConfigurators = map[plugins.BuiltinPluginType]func(
 		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, tc *config.TransformerConfig) (
 		result []resmap.Transformer, err error) {
 		var c struct {
-			ImageTag   image.Image
+			ImageTag   types.Image
 			FieldSpecs []config.FieldSpec
 		}
 		for _, args := range kt.kustomization.Images {

pkg/target/kusttarget_test.go

@@ -16,8 +16,8 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	. "sigs.k8s.io/kustomize/v3/pkg/target"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 const (

pkg/types/configmapargs.go

@@ -1,10 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// ConfigMapArgs contains the metadata of how to generate a configmap.
-type ConfigMapArgs struct {
-	// GeneratorArgs for the configmap.
-	GeneratorArgs `json:",inline,omitempty" yaml:",inline,omitempty"`
-}

pkg/types/fix.go

@@ -1,52 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package types holds struct definitions that should find a better home.
-package types
-
-import (
-	"log"
-	"regexp"
-
-	"sigs.k8s.io/yaml"
-)
-
-// FixKustomizationPreUnmarshalling modies the raw data
-// before marshalling - e.g. changes old field names to
-// new field names.
-func FixKustomizationPreUnmarshalling(data []byte) []byte {
-	deprecateFieldsMap := map[string]string{
-		"imageTags:": "images:",
-	}
-	for oldname, newname := range deprecateFieldsMap {
-		pattern := regexp.MustCompile(oldname)
-		data = pattern.ReplaceAll(data, []byte(newname))
-	}
-	if useLegacyPatch(data) {
-		pattern := regexp.MustCompile("patches:")
-		data = pattern.ReplaceAll(data, []byte("patchesStrategicMerge:"))
-	}
-	return data
-}
-
-func useLegacyPatch(data []byte) bool {
-	found := false
-	var object map[string]interface{}
-	err := yaml.Unmarshal(data, &object)
-	if err != nil {
-		log.Fatalf("invalid content from %s\n", string(data))
-	}
-	if rawPatches, ok := object["patches"]; ok {
-		patches, ok := rawPatches.([]interface{})
-		if !ok {
-			log.Fatalf("invalid patches from %v\n", rawPatches)
-		}
-		for _, p := range patches {
-			_, ok := p.(string)
-			if ok {
-				found = true
-			}
-		}
-	}
-	return found
-}

pkg/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
-)

pkg/types/garbagepolicy_string.go

@@ -1,25 +0,0 @@
-// Code generated by "stringer -type=GarbagePolicy"; 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[GarbageIgnore-1]
-	_ = x[GarbageCollect-2]
-}
-
-const _GarbagePolicy_name = "GarbageIgnoreGarbageCollect"
-
-var _GarbagePolicy_index = [...]uint8{0, 13, 27}
-
-func (i GarbagePolicy) String() string {
-	i -= 1
-	if i < 0 || i >= GarbagePolicy(len(_GarbagePolicy_index)-1) {
-		return "GarbagePolicy(" + strconv.FormatInt(int64(i+1), 10) + ")"
-	}
-	return _GarbagePolicy_name[_GarbagePolicy_index[i]:_GarbagePolicy_index[i+1]]
-}

pkg/types/genargs.go

@@ -1,51 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-import (
-	"strconv"
-	"strings"
-)
-
-// GenArgs contains both GeneratorArgs and GeneratorOptions.
-type GenArgs struct {
-	args *GeneratorArgs
-	opts *GeneratorOptions
-}
-
-// NewGenArgs returns a new object of GenArgs
-func NewGenArgs(args *GeneratorArgs, opts *GeneratorOptions) *GenArgs {
-	return &GenArgs{
-		args: args,
-		opts: opts,
-	}
-}
-
-func (g *GenArgs) String() string {
-	if g == nil {
-		return "{nilGenArgs}"
-	}
-	return "{" +
-		strings.Join([]string{
-			"nsfx:" + strconv.FormatBool(g.NeedsHashSuffix()),
-			"beh:" + g.Behavior().String()},
-			",") +
-		"}"
-}
-
-// NeedsHashSuffix returns true if the hash suffix is needed.
-// It is needed when the two conditions are both met
-//  1) GenArgs is not nil
-//  2) DisableNameSuffixHash in GeneratorOptions is not set to true
-func (g *GenArgs) NeedsHashSuffix() bool {
-	return g.args != nil && (g.opts == nil || g.opts.DisableNameSuffixHash == false)
-}
-
-// Behavior returns Behavior field of GeneratorArgs
-func (g *GenArgs) Behavior() GenerationBehavior {
-	if g.args == nil {
-		return BehaviorUnspecified
-	}
-	return NewGenerationBehavior(g.args.Behavior)
-}

pkg/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/v3/pkg/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())
-		}
-	}
-}

pkg/types/generationbehavior.go

@@ -1,46 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// GenerationBehavior specifies generation behavior of configmaps, secrets and maybe other resources.
-type GenerationBehavior int
-
-const (
-	// BehaviorUnspecified is an Unspecified behavior; typically treated as a Create.
-	BehaviorUnspecified GenerationBehavior = iota
-	// BehaviorCreate makes a new resource.
-	BehaviorCreate
-	// BehaviorReplace replaces a resource.
-	BehaviorReplace
-	// BehaviorMerge attempts to merge a new resource with an existing resource.
-	BehaviorMerge
-)
-
-// String converts a GenerationBehavior to a string.
-func (b GenerationBehavior) String() string {
-	switch b {
-	case BehaviorReplace:
-		return "replace"
-	case BehaviorMerge:
-		return "merge"
-	case BehaviorCreate:
-		return "create"
-	default:
-		return "unspecified"
-	}
-}
-
-// NewGenerationBehavior converts a string to a GenerationBehavior.
-func NewGenerationBehavior(s string) GenerationBehavior {
-	switch s {
-	case "replace":
-		return BehaviorReplace
-	case "merge":
-		return BehaviorMerge
-	case "create":
-		return BehaviorCreate
-	default:
-		return BehaviorUnspecified
-	}
-}

pkg/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"`
-}

pkg/types/generatoroptions.go

@@ -1,18 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// GeneratorOptions modify behavior of all ConfigMap and Secret generators.
-type GeneratorOptions struct {
-	// Labels to add to all generated resources.
-	Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
-
-	// Annotations to add to all generated resources.
-	Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
-
-	// DisableNameSuffixHash if true disables the default behavior of adding a
-	// suffix to the names of generated resources that is a hash of the
-	// resource contents.
-	DisableNameSuffixHash bool `json:"disableNameSuffixHash,omitempty" yaml:"disableNameSuffixHash,omitempty"`
-}

pkg/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"`
-}

pkg/types/kustomization.go

@@ -1,156 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package types holds struct definitions that should find a better home.
-package types
-
-import (
-	"sigs.k8s.io/kustomize/v3/pkg/image"
-)
-
-const (
-	KustomizationVersion = "kustomize.config.k8s.io/v1beta1"
-	KustomizationKind    = "Kustomization"
-)
-
-// Kustomization holds the information needed to generate customized k8s api resources.
-type Kustomization struct {
-	TypeMeta `json:",inline" yaml:",inline"`
-
-	//
-	// Operators - what kustomize can do.
-	//
-
-	// NamePrefix will prefix the names of all resources mentioned in the kustomization
-	// file including generated configmaps and secrets.
-	NamePrefix string `json:"namePrefix,omitempty" yaml:"namePrefix,omitempty"`
-
-	// NameSuffix will suffix the names of all resources mentioned in the kustomization
-	// file including generated configmaps and secrets.
-	NameSuffix string `json:"nameSuffix,omitempty" yaml:"nameSuffix,omitempty"`
-
-	// Namespace to add to all objects.
-	Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
-
-	// CommonLabels to add to all objects and selectors.
-	CommonLabels map[string]string `json:"commonLabels,omitempty" yaml:"commonLabels,omitempty"`
-
-	// CommonAnnotations to add to all objects.
-	CommonAnnotations map[string]string `json:"commonAnnotations,omitempty" yaml:"commonAnnotations,omitempty"`
-
-	// PatchesStrategicMerge specifies the relative path to a file
-	// containing a strategic merge patch.  Format documented at
-	// https://github.com/kubernetes/community/blob/master/contributors/devel/strategic-merge-patch.md
-	// URLs and globs are not supported.
-	PatchesStrategicMerge []PatchStrategicMerge `json:"patchesStrategicMerge,omitempty" yaml:"patchesStrategicMerge,omitempty"`
-
-	// JSONPatches is a list of JSONPatch for applying JSON patch.
-	// Format documented at https://tools.ietf.org/html/rfc6902
-	// and http://jsonpatch.com
-	PatchesJson6902 []PatchJson6902 `json:"patchesJson6902,omitempty" yaml:"patchesJson6902,omitempty"`
-
-	// Patches is a list of patches, where each one can be either a
-	// Strategic Merge Patch or a JSON patch.
-	// Each patch can be applied to multiple target objects.
-	Patches []Patch `json:"patches,omitempty" yaml:"patches,omitempty"`
-
-	// Images is a list of (image name, new name, new tag or digest)
-	// for changing image names, tags or digests. This can also be achieved with a
-	// patch, but this operator is simpler to specify.
-	Images []image.Image `json:"images,omitempty" yaml:"images,omitempty"`
-
-	// Replicas is a list of {resourcename, count} that allows for simpler replica
-	// specification. This can also be done with a patch.
-	Replicas []Replica `json:"replicas,omitempty" yaml:"replicas,omitempty"`
-
-	// Vars allow things modified by kustomize to be injected into a
-	// kubernetes object specification. A var is a name (e.g. FOO) associated
-	// with a field in a specific resource instance.  The field must
-	// contain a value of type string/bool/int/float, and defaults to the name field
-	// of the instance.  Any appearance of "$(FOO)" in the object
-	// spec will be replaced at kustomize build time, after the final
-	// value of the specified field has been determined.
-	Vars []Var `json:"vars,omitempty" yaml:"vars,omitempty"`
-
-	//
-	// Operands - what kustomize operates on.
-	//
-
-	// Resources specifies relative paths to files holding YAML representations
-	// of kubernetes API objects, or specifcations of other kustomizations
-	// via relative paths, absolute paths, or URLs.
-	Resources []string `json:"resources,omitempty" yaml:"resources,omitempty"`
-
-	// Crds specifies relative paths to Custom Resource Definition files.
-	// This allows custom resources to be recognized as operands, making
-	// it possible to add them to the Resources list.
-	// CRDs themselves are not modified.
-	Crds []string `json:"crds,omitempty" yaml:"crds,omitempty"`
-
-	// Deprecated.
-	// Anything that would have been specified here should
-	// be specified in the Resources field instead.
-	Bases []string `json:"bases,omitempty" yaml:"bases,omitempty"`
-
-	//
-	// Generators (operators that create operands)
-	//
-
-	// ConfigMapGenerator is a list of configmaps to generate from
-	// local data (one configMap per list item).
-	// The resulting resource is a normal operand, subject to
-	// name prefixing, patching, etc.  By default, the name of
-	// the map will have a suffix hash generated from its contents.
-	ConfigMapGenerator []ConfigMapArgs `json:"configMapGenerator,omitempty" yaml:"configMapGenerator,omitempty"`
-
-	// SecretGenerator is a list of secrets to generate from
-	// local data (one secret per list item).
-	// The resulting resource is a normal operand, subject to
-	// name prefixing, patching, etc.  By default, the name of
-	// the map will have a suffix hash generated from its contents.
-	SecretGenerator []SecretArgs `json:"secretGenerator,omitempty" yaml:"secretGenerator,omitempty"`
-
-	// GeneratorOptions modify behavior of all ConfigMap and Secret generators.
-	GeneratorOptions *GeneratorOptions `json:"generatorOptions,omitempty" yaml:"generatorOptions,omitempty"`
-
-	// Configurations is a list of transformer configuration files
-	Configurations []string `json:"configurations,omitempty" yaml:"configurations,omitempty"`
-
-	// Generators is a list of files containing custom generators
-	Generators []string `json:"generators,omitempty" yaml:"generators,omitempty"`
-
-	// Transformers is a list of files containing transformers
-	Transformers []string `json:"transformers,omitempty" yaml:"transformers,omitempty"`
-
-	// Inventory appends an object that contains the record
-	// of all other objects, which can be used in apply, prune and delete
-	Inventory *Inventory `json:"inventory,omitempty" yaml:"inventory,omitempty"`
-}
-
-// FixKustomizationPostUnmarshalling fixes things
-// like empty fields that should not be empty, or
-// moving content of deprecated fields to newer
-// fields.
-func (k *Kustomization) FixKustomizationPostUnmarshalling() {
-	if k.APIVersion == "" {
-		k.APIVersion = KustomizationVersion
-	}
-	if k.Kind == "" {
-		k.Kind = KustomizationKind
-	}
-	for _, b := range k.Bases {
-		k.Resources = append(k.Resources, b)
-	}
-	k.Bases = nil
-}
-
-func (k *Kustomization) EnforceFields() []string {
-	var errs []string
-	if k.APIVersion != "" && k.APIVersion != KustomizationVersion {
-		errs = append(errs, "apiVersion should be "+KustomizationVersion)
-	}
-	if k.Kind != "" && k.Kind != KustomizationKind {
-		errs = append(errs, "kind should be "+KustomizationKind)
-	}
-	return errs
-}

pkg/types/kvpairsources.go

@@ -1,31 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// KvPairSources defines places to obtain key value pairs.
-type KvPairSources struct {
-	// LiteralSources is a list of literal
-	// pair sources. Each literal source should
-	// be a key and literal value, e.g. `key=value`
-	LiteralSources []string `json:"literals,omitempty" yaml:"literals,omitempty"`
-
-	// FileSources is a list of file "sources" to
-	// use in creating a list of key, value pairs.
-	// A source takes the form:  [{key}=]{path}
-	// If the "key=" part is missing, the key is the
-	// path's basename. If they "key=" part is present,
-	// it becomes the key (replacing the basename).
-	// In either case, the value is the file contents.
-	// Specifying a directory will iterate each named
-	// file in the directory whose basename is a
-	// valid configmap key.
-	FileSources []string `json:"files,omitempty" yaml:"files,omitempty"`
-
-	// EnvSources is a list of file paths.
-	// The contents of each file should be one
-	// key=value pair per line, e.g. a Docker
-	// or npm ".env" file or a ".ini" file
-	// (wikipedia.org/wiki/INI_file)
-	EnvSources []string `json:"envs,omitempty" yaml:"envs,omitempty"`
-}

pkg/types/objectmeta.go

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

pkg/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
-}

pkg/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"`
-}

pkg/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"`
-}

pkg/types/patchstrategicmerge.go

@@ -1,9 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// PatchStrategicMerge represents a relative path to a
-// stategic merge patch with the format
-// https://github.com/kubernetes/community/blob/master/contributors/devel/strategic-merge-patch.md
-type PatchStrategicMerge string

pkg/types/patchtarget.go

@@ -1,13 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-import "sigs.k8s.io/kustomize/v3/pkg/gvk"
-
-// PatchTarget represents the kubernetes object that the patch is applied to
-type PatchTarget struct {
-	gvk.Gvk   `json:",inline,omitempty" yaml:",inline,omitempty"`
-	Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
-	Name      string `json:"name" yaml:"name"`
-}

pkg/types/pluginconfig.go

@@ -1,16 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// PluginConfig holds plugin configuration.
-type PluginConfig struct {
-	// DirectoryPath is an absolute path to a
-	// directory containing kustomize plugins.
-	// This directory may contain subdirectories
-	// further categorizing plugins.
-	DirectoryPath string
-
-	// Enabled is true if plugins are enabled.
-	Enabled bool
-}

pkg/types/replica.go

@@ -1,16 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// Replica specifies a modification to a replica config.
-// The number of replicas of a resource whose name matches will be set to count.
-// This struct is used by the ReplicaCountTransform, and is meant to supplement
-// the existing patch functionality with a simpler syntax for replica configuration.
-type Replica struct {
-	// The name of the resource to change the replica count
-	Name string `json:"name,omitempty" yaml:"name,omitempty"`
-
-	// The number of replicas required.
-	Count int64 `json:"count" yaml:"count"`
-}

pkg/types/secretargs.go

@@ -1,19 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-// SecretArgs contains the metadata of how to generate a secret.
-type SecretArgs struct {
-	// GeneratorArgs for the secret.
-	GeneratorArgs `json:",inline,omitempty" yaml:",inline,omitempty"`
-
-	// Type of the secret.
-	//
-	// This is the same field as the secret type field in v1/Secret:
-	// It can be "Opaque" (default), or "kubernetes.io/tls".
-	//
-	// If type is "kubernetes.io/tls", then "literals" or "files" must have exactly two
-	// keys: "tls.key" and "tls.crt"
-	Type string `json:"type,omitempty" yaml:"type,omitempty"`
-}

pkg/types/selector.go

@@ -1,25 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-import "sigs.k8s.io/kustomize/v3/pkg/gvk"
-
-// Selector specifies a set of resources.
-// Any resource that matches intersection of all conditions
-// is included in this set.
-type Selector struct {
-	gvk.Gvk   `json:",inline,omitempty" yaml:",inline,omitempty"`
-	Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
-	Name      string `json:"name,omitempty" yaml:"name,omitempty"`
-
-	// AnnotationSelector is a string that follows the label selection expression
-	// https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api
-	// It matches with the resource annotations.
-	AnnotationSelector string `json:"annotationSelector,omitempty" yaml:"annotationSelector,omitempty"`
-
-	// LabelSelector is a string that follows the label selection expression
-	// https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api
-	// It matches with the resource labels.
-	LabelSelector string `json:"labelSelector,omitempty" yaml:"labelSelector,omitempty"`
-}

pkg/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"`
-}

pkg/types/var.go

@@ -1,213 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-import (
-	"fmt"
-	"reflect"
-	"sort"
-	"strings"
-
-	"sigs.k8s.io/kustomize/v3/pkg/gvk"
-)
-
-const defaultFieldPath = "metadata.name"
-
-// Var represents a variable whose value will be sourced
-// from a field in a Kubernetes object.
-type Var struct {
-	// Value of identifier name e.g. FOO used in container args, annotations
-	// Appears in pod template as $(FOO)
-	Name string `json:"name" yaml:"name"`
-
-	// ObjRef must refer to a Kubernetes resource under the
-	// purview of this kustomization. ObjRef should use the
-	// raw name of the object (the name specified in its YAML,
-	// before addition of a namePrefix and a nameSuffix).
-	ObjRef Target `json:"objref" yaml:"objref"`
-
-	// FieldRef refers to the field of the object referred to by
-	// ObjRef whose value will be extracted for use in
-	// replacing $(FOO).
-	// If unspecified, this defaults to fieldPath: $defaultFieldPath
-	FieldRef FieldSelector `json:"fieldref,omitempty" yaml:"fieldref,omitempty"`
-}
-
-// Target refers to a kubernetes object by Group, Version, Kind and Name
-// gvk.Gvk contains Group, Version and Kind
-// APIVersion is added to keep the backward compatibility of using ObjectReference
-// for Var.ObjRef
-type Target struct {
-	APIVersion string `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty"`
-	gvk.Gvk    `json:",inline,omitempty" yaml:",inline,omitempty"`
-	Name       string `json:"name" yaml:"name"`
-	Namespace  string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
-}
-
-// GVK returns the Gvk object in Target
-func (t *Target) GVK() gvk.Gvk {
-	if t.APIVersion == "" {
-		return t.Gvk
-	}
-	versions := strings.Split(t.APIVersion, "/")
-	if len(versions) == 2 {
-		t.Group = versions[0]
-		t.Version = versions[1]
-	}
-	if len(versions) == 1 {
-		t.Version = versions[0]
-	}
-	return t.Gvk
-}
-
-// FieldSelector contains the fieldPath to an object field.
-// This struct is added to keep the backward compatibility of using ObjectFieldSelector
-// for Var.FieldRef
-type FieldSelector struct {
-	FieldPath string `json:"fieldPath,omitempty" yaml:"fieldPath,omitempty"`
-}
-
-// defaulting sets reference to field used by default.
-func (v *Var) Defaulting() {
-	if v.FieldRef.FieldPath == "" {
-		v.FieldRef.FieldPath = defaultFieldPath
-	}
-	v.ObjRef.GVK()
-}
-
-// DeepEqual returns true if var a and b are Equals.
-// Note 1: The objects are unchanged by the VarEqual
-// Note 2: Should be normalize be FieldPath before doing
-// the DeepEqual. spec.a[b] is supposed to be the same
-// as spec.a.b
-func (v Var) DeepEqual(other Var) bool {
-	v.Defaulting()
-	other.Defaulting()
-	return reflect.DeepEqual(v, other)
-}
-
-// VarSet is a set of Vars where no var.Name is repeated.
-type VarSet struct {
-	set map[string]Var
-}
-
-// NewVarSet returns an initialized VarSet
-func NewVarSet() VarSet {
-	return VarSet{set: map[string]Var{}}
-}
-
-// AsSlice returns the vars as a slice.
-func (vs *VarSet) AsSlice() []Var {
-	s := make([]Var, len(vs.set))
-	i := 0
-	for _, v := range vs.set {
-		s[i] = v
-		i++
-	}
-	sort.Sort(byName(s))
-	return s
-}
-
-// Copy returns a copy of the var set.
-func (vs *VarSet) Copy() VarSet {
-	newSet := make(map[string]Var, len(vs.set))
-	for k, v := range vs.set {
-		newSet[k] = v
-	}
-	return VarSet{set: newSet}
-}
-
-// MergeSet absorbs other vars with error on name collision.
-func (vs *VarSet) MergeSet(incoming VarSet) error {
-	for _, incomingVar := range incoming.set {
-		if err := vs.Merge(incomingVar); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// MergeSlice absorbs a Var slice with error on name collision.
-// Empty fields in incoming vars are defaulted.
-func (vs *VarSet) MergeSlice(incoming []Var) error {
-	for _, v := range incoming {
-		if err := vs.Merge(v); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Merge absorbs another Var with error on name collision.
-// Empty fields in incoming Var is defaulted.
-func (vs *VarSet) Merge(v Var) error {
-	if vs.Contains(v) {
-		return fmt.Errorf(
-			"var '%s' already encountered", v.Name)
-	}
-	v.Defaulting()
-	vs.set[v.Name] = v
-	return nil
-}
-
-// AbsorbSet absorbs other vars with error on (name,value) collision.
-func (vs *VarSet) AbsorbSet(incoming VarSet) error {
-	for _, v := range incoming.set {
-		if err := vs.Absorb(v); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// AbsorbSlice absorbs a Var slice with error on (name,value) collision.
-// Empty fields in incoming vars are defaulted.
-func (vs *VarSet) AbsorbSlice(incoming []Var) error {
-	for _, v := range incoming {
-		if err := vs.Absorb(v); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Absorb absorbs another Var with error on (name,value) collision.
-// Empty fields in incoming Var is defaulted.
-func (vs *VarSet) Absorb(v Var) error {
-	conflicting := vs.Get(v.Name)
-	if conflicting == nil {
-		// no conflict. The var is valid.
-		v.Defaulting()
-		vs.set[v.Name] = v
-		return nil
-	}
-
-	if !reflect.DeepEqual(v, *conflicting) {
-		// two vars with the same name are pointing at two
-		// different resources.
-		return fmt.Errorf(
-			"var '%s' already encountered", v.Name)
-	}
-	return nil
-}
-
-// Contains is true if the set has the other var.
-func (vs *VarSet) Contains(other Var) bool {
-	return vs.Get(other.Name) != nil
-}
-
-// Get returns the var with the given name, else nil.
-func (vs *VarSet) Get(name string) *Var {
-	if v, found := vs.set[name]; found {
-		return &v
-	}
-	return nil
-}
-
-// byName is a sort interface which sorts Vars by name alphabetically
-type byName []Var
-
-func (v byName) Len() int           { return len(v) }
-func (v byName) Swap(i, j int)      { v[i], v[j] = v[j], v[i] }
-func (v byName) Less(i, j int) bool { return v[i].Name < v[j].Name }

pkg/types/var_test.go

@@ -1,171 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package types
-
-import (
-	"reflect"
-	"strings"
-	"testing"
-
-	"gopkg.in/yaml.v2"
-	"sigs.k8s.io/kustomize/v3/pkg/gvk"
-)
-
-func TestGVK(t *testing.T) {
-	type testcase struct {
-		data     string
-		expected gvk.Gvk
-	}
-
-	testcases := []testcase{
-		{
-			data: `
-apiVersion: v1
-kind: Secret
-name: my-secret
-`,
-			expected: gvk.Gvk{Group: "", Version: "v1", Kind: "Secret"},
-		},
-		{
-			data: `
-apiVersion: myapps/v1
-kind: MyKind
-name: my-kind
-`,
-			expected: gvk.Gvk{Group: "myapps", Version: "v1", Kind: "MyKind"},
-		},
-		{
-			data: `
-version: v2
-kind: MyKind
-name: my-kind
-`,
-			expected: gvk.Gvk{Version: "v2", Kind: "MyKind"},
-		},
-	}
-
-	for _, tc := range testcases {
-		var targ Target
-		err := yaml.Unmarshal([]byte(tc.data), &targ)
-		if err != nil {
-			t.Fatalf("Unexpected error %v", err)
-		}
-		if !reflect.DeepEqual(targ.GVK(), tc.expected) {
-			t.Fatalf("Expected %v, but got %v", tc.expected, targ.GVK())
-		}
-	}
-}
-
-func TestDefaulting(t *testing.T) {
-	v := &Var{
-		Name: "SOME_VARIABLE_NAME",
-		ObjRef: Target{
-			Gvk: gvk.Gvk{
-				Version: "v1",
-				Kind:    "Secret",
-			},
-			Name: "my-secret",
-		},
-	}
-	v.Defaulting()
-	if v.FieldRef.FieldPath != defaultFieldPath {
-		t.Fatalf("expected %s, got %v",
-			defaultFieldPath, v.FieldRef.FieldPath)
-	}
-}
-
-func TestVarSet(t *testing.T) {
-	set := NewVarSet()
-	vars := []Var{
-		{
-			Name: "SHELLVARS",
-			ObjRef: Target{
-				APIVersion: "v7",
-				Gvk:        gvk.Gvk{Kind: "ConfigMap"},
-				Name:       "bash"},
-		},
-		{
-			Name: "BACKEND",
-			ObjRef: Target{
-				APIVersion: "v7",
-				Gvk:        gvk.Gvk{Kind: "Deployment"},
-				Name:       "myTiredBackend"},
-		},
-		{
-			Name: "AWARD",
-			ObjRef: Target{
-				APIVersion: "v7",
-				Gvk:        gvk.Gvk{Kind: "Service"},
-				Name:       "nobelPrize"},
-			FieldRef: FieldSelector{FieldPath: "some.arbitrary.path"},
-		},
-	}
-	err := set.MergeSlice(vars)
-	if err != nil {
-		t.Fatalf("unexpected err: %v", err)
-	}
-	for _, v := range vars {
-		if !set.Contains(v) {
-			t.Fatalf("set %v should contain var %v", set.AsSlice(), v)
-		}
-	}
-	set2 := NewVarSet()
-	err = set2.MergeSet(set)
-	if err != nil {
-		t.Fatalf("unexpected err: %v", err)
-	}
-	err = set2.MergeSlice(vars)
-	if err == nil {
-		t.Fatalf("expected err")
-	}
-	if !strings.Contains(err.Error(), "var 'SHELLVARS' already encountered") {
-		t.Fatalf("unexpected err: %v", err)
-	}
-	v := set2.Get("BACKEND")
-	if v == nil {
-		t.Fatalf("expected var")
-	}
-	// Confirm defaulting.
-	if v.FieldRef.FieldPath != defaultFieldPath {
-		t.Fatalf("unexpected field path: %v", v.FieldRef.FieldPath)
-	}
-	// Confirm sorting.
-	names := set2.AsSlice()
-	if names[0].Name != "AWARD" ||
-		names[1].Name != "BACKEND" ||
-		names[2].Name != "SHELLVARS" {
-		t.Fatalf("unexpected order in : %v", names)
-	}
-}
-
-func TestVarSetCopy(t *testing.T) {
-	set1 := NewVarSet()
-	vars := []Var{
-		{Name: "First"},
-		{Name: "Second"},
-		{Name: "Third"},
-	}
-	err := set1.MergeSlice(vars)
-	if err != nil {
-		t.Fatalf("unexpected err: %v", err)
-	}
-	// Confirm copying
-	set2 := set1.Copy()
-	for _, varInSet1 := range set1.AsSlice() {
-		if v := set2.Get(varInSet1.Name); v == nil {
-			t.Fatalf("set %v should contain a Var named %s", set2.AsSlice(), varInSet1)
-		} else if !set2.Contains(*v) {
-			t.Fatalf("set %v should contain %v", set2.AsSlice(), v)
-		}
-	}
-	// Confirm that the copy is deep
-	w := Var{Name: "Only in set2"}
-	set2.Merge(w)
-	if !set2.Contains(w) {
-		t.Fatalf("set %v should contain %v", set2.AsSlice(), w)
-	}
-	if set1.Contains(w) {
-		t.Fatalf("set %v should not contain %v", set1.AsSlice(), w)
-	}
-}