Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 fix structuredmerge filterintent to cleanup nested empty maps #6785

Merged

Conversation

chrischdi
Copy link
Member

@chrischdi chrischdi commented Jun 30, 2022

What this PR does / why we need it:

FilterIntent is supposed to remove all empty maps including nested maps to get consistent objects for comparison.

Currently it did only remove empty leaf maps which exist due to field removal.
Now it also removes new empty leaf maps which result from removing an empty leaf map.

Example:

  • Consider the following input

    map[string]interface{}{
      "a": map[string]interface{}{
        "b": map[string]interface{}{
          "c": map[string]interface{}{
            "d": "123",
          },
        },
      },
    }
  • Consider FilterIntent to remove the path a.b.c.d (due to ignorePath).

  • The current implementation would only remove the resulting empty leaf map at a.b.c which would result in:

    map[string]interface{}{
      "a": map[string]interface{}{
        "b": map[string]interface{}{
        },
      },
    }
  • Actually FilterIntent should also remove a.b and then a because while bubbling up they also get empty leaf maps.

  • The result including this fix is:

    map[string]interface{}{
    }

/test all

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 30, 2022
@sbueringer
Copy link
Member

/cherry-pick release-1.2

@k8s-infra-cherrypick-robot

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.2 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@chrischdi chrischdi force-pushed the pr-filterintent-nested-empty-map branch from f042df6 to 08d91f6 Compare June 30, 2022 07:53
@chrischdi chrischdi force-pushed the pr-filterintent-nested-empty-map branch from 08d91f6 to 2631a8f Compare June 30, 2022 07:54
@sbueringer
Copy link
Member

/lgtm

/cc @ykakarap @killianmuldoon

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 30, 2022
@sbueringer
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 30, 2022
@k8s-ci-robot k8s-ci-robot merged commit 7c4c2c4 into kubernetes-sigs:main Jun 30, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.3 milestone Jun 30, 2022
@k8s-infra-cherrypick-robot

@sbueringer: new pull request created: #6796

In response to this:

/cherry-pick release-1.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants