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

added IsEmpty() method

Browse Source
This commit is contained in:
Natasha Sarkar
2020-09-30 12:17:14 -07:00
parent dd8edb1b01
commit 7c8c827a88
7 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/builtin/namespacetransformer/NamespaceTransformer.go
View File

@@ -37,7 +37,7 @@ func (p *plugin) Transform(m resmap.ResMap) error {
return nil
}
for _, r := range m.Resources() {
if len(r.Map()) == 0 {
if r.IsEmpty() {
// Don't mutate empty objects?
continue
}

4
plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go
View File

@@ -98,14 +98,14 @@ func (p *plugin) Transform(m resmap.ResMap) error {
// Some unknown error, let it through.
return err
}
if len(target.Map()) != 0 {
if !target.IsEmpty() {
return errors.Wrapf(
err, "with unexpectedly non-empty object map of size %d",
len(target.Map()))
}
// Fall through to handle deleted object.
}
if len(target.Map()) == 0 {
if target.IsEmpty() {
// This means all fields have been removed from the object.
// This can happen if a patch required deletion of the
// entire resource (not just a part of it). This means

6
plugin/builtin/patchtransformer/PatchTransformer.go
View File

@@ -115,14 +115,14 @@ func (p *plugin) transformStrategicMerge(m resmap.ResMap, patch *resource.Resour
// Some unknown error, let it through.
return err
}
if len(res.Map()) != 0 {
if !res.IsEmpty() {
return errors.Wrapf(
err, "with unexpectedly non-empty object map of size %d",
len(res.Map()))
}
// Fall through to handle deleted object.
}
if len(res.Map()) == 0 {
if res.IsEmpty() {
// This means all fields have been removed from the object.
// This can happen if a patch required deletion of the
// entire resource (not just a part of it). This means
@@ -147,7 +147,7 @@ func (p *plugin) applySMPatch(resource, patch *resource.Resource) error {
err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
Patch: node,
}, resource)
if len(resource.Map()) != 0 {
if !resource.IsEmpty() {
resource.SetName(n)
resource.SetNamespace(ns)
}