kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 10:30:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Export noFieldError

Browse Source 
This would allow user's of the kustomize API to determine whether the
error received while trying to access a value at a specific field-path
occurred because that field doesn't exist, or if it was something else
that went wrong.
This commit is contained in:
Ian Howell
2020-04-03 14:22:14 -05:00
parent 0f3d5c80e4
commit 5ea34b2efb
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
api/k8sdeps/kunstruct/unstructadapter.go
View File

@@ -133,7 +133,7 @@ func (fs *UnstructAdapter) selectSubtree(path string) (map[string]interface{}, [
func (fs *UnstructAdapter) GetFieldValue(path string) (interface{}, error) { func (fs *UnstructAdapter) GetFieldValue(path string) (interface{}, error) {
content, fields, found, err := fs.selectSubtree(path) content, fields, found, err := fs.selectSubtree(path)
if !found || err != nil { if !found || err != nil {
return nil, noFieldError{Field: path} return nil, NoFieldError{Field: path}
} }
s, found, err := unstructured.NestedFieldNoCopy( s, found, err := unstructured.NestedFieldNoCopy(
@@ -141,14 +141,14 @@ func (fs *UnstructAdapter) GetFieldValue(path string) (interface{}, error) {
if found || err != nil { if found || err != nil {
return s, err return s, err
} }
return nil, noFieldError{Field: path} return nil, NoFieldError{Field: path}
} }
// GetString returns value at the given fieldpath. // GetString returns value at the given fieldpath.
func (fs *UnstructAdapter) GetString(path string) (string, error) { func (fs *UnstructAdapter) GetString(path string) (string, error) {
content, fields, found, err := fs.selectSubtree(path) content, fields, found, err := fs.selectSubtree(path)
if !found || err != nil { if !found || err != nil {
return "", noFieldError{Field: path} return "", NoFieldError{Field: path}
} }
s, found, err := unstructured.NestedString( s, found, err := unstructured.NestedString(
@@ -156,14 +156,14 @@ func (fs *UnstructAdapter) GetString(path string) (string, error) {
if found || err != nil { if found || err != nil {
return s, err return s, err
} }
return "", noFieldError{Field: path} return "", NoFieldError{Field: path}
} }
// GetStringSlice returns value at the given fieldpath. // GetStringSlice returns value at the given fieldpath.
func (fs *UnstructAdapter) GetStringSlice(path string) ([]string, error) { func (fs *UnstructAdapter) GetStringSlice(path string) ([]string, error) {
content, fields, found, err := fs.selectSubtree(path) content, fields, found, err := fs.selectSubtree(path)
if !found || err != nil { if !found || err != nil {
return []string{}, noFieldError{Field: path} return []string{}, NoFieldError{Field: path}
} }
s, found, err := unstructured.NestedStringSlice( s, found, err := unstructured.NestedStringSlice(
@@ -171,14 +171,14 @@ func (fs *UnstructAdapter) GetStringSlice(path string) ([]string, error) {
if found || err != nil { if found || err != nil {
return s, err return s, err
} }
return []string{}, noFieldError{Field: path} return []string{}, NoFieldError{Field: path}
} }
// GetBool returns value at the given fieldpath. // GetBool returns value at the given fieldpath.
func (fs *UnstructAdapter) GetBool(path string) (bool, error) { func (fs *UnstructAdapter) GetBool(path string) (bool, error) {
content, fields, found, err := fs.selectSubtree(path) content, fields, found, err := fs.selectSubtree(path)
if !found || err != nil { if !found || err != nil {
return false, noFieldError{Field: path} return false, NoFieldError{Field: path}
} }
s, found, err := unstructured.NestedBool( s, found, err := unstructured.NestedBool(
@@ -186,7 +186,7 @@ func (fs *UnstructAdapter) GetBool(path string) (bool, error) {
if found || err != nil { if found || err != nil {
return s, err return s, err
} }
return false, noFieldError{Field: path} return false, NoFieldError{Field: path}
} }
// GetFloat64 returns value at the given fieldpath. // GetFloat64 returns value at the given fieldpath.
@@ -201,14 +201,14 @@ func (fs *UnstructAdapter) GetFloat64(path string) (float64, error) {
if found || err != nil { if found || err != nil {
return s, err return s, err
} }
return 0, noFieldError{Field: path} return 0, NoFieldError{Field: path}
} }
// GetInt64 returns value at the given fieldpath. // GetInt64 returns value at the given fieldpath.
func (fs *UnstructAdapter) GetInt64(path string) (int64, error) { func (fs *UnstructAdapter) GetInt64(path string) (int64, error) {
content, fields, found, err := fs.selectSubtree(path) content, fields, found, err := fs.selectSubtree(path)
if !found || err != nil { if !found || err != nil {
return 0, noFieldError{Field: path} return 0, NoFieldError{Field: path}
} }
s, found, err := unstructured.NestedInt64( s, found, err := unstructured.NestedInt64(
@@ -216,14 +216,14 @@ func (fs *UnstructAdapter) GetInt64(path string) (int64, error) {
if found || err != nil { if found || err != nil {
return s, err return s, err
} }
return 0, noFieldError{Field: path} return 0, NoFieldError{Field: path}
} }
// GetSlice returns value at the given fieldpath. // GetSlice returns value at the given fieldpath.
func (fs *UnstructAdapter) GetSlice(path string) ([]interface{}, error) { func (fs *UnstructAdapter) GetSlice(path string) ([]interface{}, error) {
content, fields, found, err := fs.selectSubtree(path) content, fields, found, err := fs.selectSubtree(path)
if !found || err != nil { if !found || err != nil {
return nil, noFieldError{Field: path} return nil, NoFieldError{Field: path}
} }
s, found, err := unstructured.NestedSlice( s, found, err := unstructured.NestedSlice(
@@ -231,14 +231,14 @@ func (fs *UnstructAdapter) GetSlice(path string) ([]interface{}, error) {
if found || err != nil { if found || err != nil {
return s, err return s, err
} }
return nil, noFieldError{Field: path} return nil, NoFieldError{Field: path}
} }
// GetStringMap returns value at the given fieldpath. // GetStringMap returns value at the given fieldpath.
func (fs *UnstructAdapter) GetStringMap(path string) (map[string]string, error) { func (fs *UnstructAdapter) GetStringMap(path string) (map[string]string, error) {
content, fields, found, err := fs.selectSubtree(path) content, fields, found, err := fs.selectSubtree(path)
if !found || err != nil { if !found || err != nil {
return nil, noFieldError{Field: path} return nil, NoFieldError{Field: path}
} }
s, found, err := unstructured.NestedStringMap( s, found, err := unstructured.NestedStringMap(
@@ -246,14 +246,14 @@ func (fs *UnstructAdapter) GetStringMap(path string) (map[string]string, error)
if found || err != nil { if found || err != nil {
return s, err return s, err
} }
return nil, noFieldError{Field: path} return nil, NoFieldError{Field: path}
} }
// GetMap returns value at the given fieldpath. // GetMap returns value at the given fieldpath.
func (fs *UnstructAdapter) GetMap(path string) (map[string]interface{}, error) { func (fs *UnstructAdapter) GetMap(path string) (map[string]interface{}, error) {
content, fields, found, err := fs.selectSubtree(path) content, fields, found, err := fs.selectSubtree(path)
if !found || err != nil { if !found || err != nil {
return nil, noFieldError{Field: path} return nil, NoFieldError{Field: path}
} }
s, found, err := unstructured.NestedMap( s, found, err := unstructured.NestedMap(
@@ -261,7 +261,7 @@ func (fs *UnstructAdapter) GetMap(path string) (map[string]interface{}, error) {
if found || err != nil { if found || err != nil {
return s, err return s, err
} }
return nil, noFieldError{Field: path} return nil, NoFieldError{Field: path}
} }
func (fs *UnstructAdapter) MatchesLabelSelector(selector string) (bool, error) { func (fs *UnstructAdapter) MatchesLabelSelector(selector string) (bool, error) {
@@ -340,11 +340,11 @@ func toSchemaGvk(x resid.Gvk) schema.GroupVersionKind {
} }
} }
// noFieldError is returned when a field is expected, but missing. // NoFieldError is returned when a field is expected, but missing.
type noFieldError struct { type NoFieldError struct {
Field string Field string
} }
func (e noFieldError) Error() string { func (e NoFieldError) Error() string {
return fmt.Sprintf("no field named '%s'", e.Field) return fmt.Sprintf("no field named '%s'", e.Field)
} }