Short hand notation for set

kyaml/setters2/add.go

@@ -79,20 +79,6 @@ func (a *Add) visitScalar(object *yaml.RNode, p string, _ *openapi.ResourceSchem
 	return nil
 }
 
-const (
-	// CLIDefinitionsPrefix is the prefix for cli definition keys.
-	CLIDefinitionsPrefix = "io.k8s.cli."
-
-	// SetterDefinitionPrefix is the prefix for setter definition keys.
-	SetterDefinitionPrefix = CLIDefinitionsPrefix + "setters."
-
-	// SubstitutionDefinitionPrefix is the prefix for substitution definition keys.
-	SubstitutionDefinitionPrefix = CLIDefinitionsPrefix + "substitutions."
-
-	// DefinitionsPrefix is the prefix used to reference definitions in the OpenAPI
-	DefinitionsPrefix = "#/definitions/"
-)
-
 // SetterDefinition may be used to update a files OpenAPI definitions with a new setter.
 type SetterDefinition struct {
 	// Name is the name of the setter to create or update.
@@ -133,7 +119,7 @@ func (sd SetterDefinition) AddToFile(path string) error {
 }
 
 func (sd SetterDefinition) Filter(object *yaml.RNode) (*yaml.RNode, error) {
-	key := SetterDefinitionPrefix + sd.Name
+	key := fieldmeta.SetterDefinitionPrefix + sd.Name
 
 	definitions, err := object.Pipe(yaml.LookupCreate(
 		yaml.MappingNode, openapi.SupplementaryOpenAPIFieldName, "definitions"))
@@ -235,7 +221,7 @@ func (sd SubstitutionDefinition) Filter(object *yaml.RNode) (*yaml.RNode, error)
 	}
 
 	// lookup or create the definition for the substitution
-	defKey := SubstitutionDefinitionPrefix + sd.Name
+	defKey := fieldmeta.SubstitutionDefinitionPrefix + sd.Name
 	def, err := object.Pipe(yaml.LookupCreate(
 		yaml.MappingNode, openapi.SupplementaryOpenAPIFieldName, "definitions", defKey, "x-k8s-cli"))
 	if err != nil {

kyaml/setters2/list.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"sigs.k8s.io/kustomize/kyaml/errors"
+	"sigs.k8s.io/kustomize/kyaml/fieldmeta"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/openapi"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
@@ -63,7 +64,7 @@ func (l *List) listSetters(object *yaml.RNode, resourcePath string) error {
 		// the definition key -- contains the setter name
 		key := node.Key.YNode().Value
 
-		if !strings.HasPrefix(key, SetterDefinitionPrefix) {
+		if !strings.HasPrefix(key, fieldmeta.SetterDefinitionPrefix) {
 			// not a setter -- doesn't have the right prefix
 			return nil
 		}
@@ -136,7 +137,7 @@ func (l *List) listSubst(object *yaml.RNode) error {
 		// the definition key -- contains the substitution name
 		key := node.Key.YNode().Value
 
-		if !strings.HasPrefix(key, SubstitutionDefinitionPrefix) {
+		if !strings.HasPrefix(key, fieldmeta.SubstitutionDefinitionPrefix) {
 			// not a substitution -- doesn't have the right prefix
 			return nil
 		}

kyaml/setters2/set.go

@@ -12,6 +12,7 @@ import (
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
 	"sigs.k8s.io/kustomize/kyaml/errors"
+	"sigs.k8s.io/kustomize/kyaml/fieldmeta"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/kio/kioutil"
 	"sigs.k8s.io/kustomize/kyaml/openapi"
@@ -268,7 +269,7 @@ func (s SetOpenAPI) UpdateFile(path string) error {
 }
 
 func (s SetOpenAPI) Filter(object *yaml.RNode) (*yaml.RNode, error) {
-	key := SetterDefinitionPrefix + s.Name
+	key := fieldmeta.SetterDefinitionPrefix + s.Name
 	oa, err := object.Pipe(yaml.Lookup("openAPI", "definitions", key))
 	if err != nil {
 		return nil, err

kyaml/setters2/settersutil/settercreator.go

@@ -6,6 +6,7 @@ package settersutil
 import (
 	"io/ioutil"
 
+	"sigs.k8s.io/kustomize/kyaml/fieldmeta"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/openapi"
 	"sigs.k8s.io/kustomize/kyaml/setters2"
@@ -65,7 +66,7 @@ func (c SetterCreator) Create(openAPIPath, resourcesPath string) error {
 			&setters2.Add{
 				FieldName:  c.FieldName,
 				FieldValue: c.FieldValue,
-				Ref:        setters2.DefinitionsPrefix + setters2.SetterDefinitionPrefix + c.Name,
+				Ref:        fieldmeta.DefinitionsPrefix + fieldmeta.SetterDefinitionPrefix + c.Name,
 			})},
 		Outputs: []kio.Writer{inout},
 	}.Execute()

kyaml/setters2/settersutil/substitutioncreator.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"sigs.k8s.io/kustomize/kyaml/errors"
+	"sigs.k8s.io/kustomize/kyaml/fieldmeta"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/openapi"
 	"sigs.k8s.io/kustomize/kyaml/setters2"
@@ -68,7 +69,7 @@ func (c SubstitutionCreator) Create(openAPIPath, resourcesPath string) error {
 			&setters2.Add{
 				FieldName:  c.FieldName,
 				FieldValue: c.FieldValue,
-				Ref:        setters2.DefinitionsPrefix + setters2.SubstitutionDefinitionPrefix + c.Name,
+				Ref:        fieldmeta.DefinitionsPrefix + fieldmeta.SubstitutionDefinitionPrefix + c.Name,
 			})},
 		Outputs: []kio.Writer{inout},
 	}.Execute()