Skip to content

Add Conflicts.ToSet() #162

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
May 7, 2020
Merged

Add Conflicts.ToSet() #162

merged 1 commit into from
May 7, 2020

Conversation

@julianvmodesto
Copy link
Contributor

@julianvmodesto julianvmodesto commented May 7, 2020 •
edited
Loading

Adds a method to merge.Conflicts to convert all conflicts to a fieldpath.Set.

We use this in kubernetes/kubernetes#84134 when comparing merge.Conflicts to another Set (a Set of allowed conflicts).

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 7, 2020
@k8s-ci-robot k8s-ci-robot requested review from apelisse and lavalamp May 7, 2020 19:53
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented May 7, 2020

Welcome @julianvmodesto!

It looks like this is your first PR to kubernetes-sigs/structured-merge-diff 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/structured-merge-diff has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented May 7, 2020

Hi @julianvmodesto. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 7, 2020
@julianvmodesto julianvmodesto mentioned this pull request May 7, 2020
Closed
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 7, 2020
apelisse
apelisse reviewed May 7, 2020
View reviewed changes
merge/conflict.go
return true
}

func (c Conflicts) ToSet() *fieldpath.Set {
Copy link
Contributor

@apelisse apelisse May 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, maybe write a quick test?

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 7, 2020
apelisse
apelisse reviewed May 7, 2020
View reviewed changes
merge/conflict_test.go
}
}

func TestToSet(t *testing.T) {
Copy link
Contributor

@apelisse apelisse May 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding the test, now that you've done that, I realize that it's aggregating the conflicts one has with all users. You need to document the method above to explain that.

Copy link
Contributor Author

@julianvmodesto julianvmodesto May 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes, done

apelisse
apelisse approved these changes May 7, 2020
View reviewed changes
Copy link
Contributor

@apelisse apelisse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 7, 2020
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented May 7, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: apelisse, julianvmodesto

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 May 7, 2020
@k8s-ci-robot k8s-ci-robot merged commit 621c035 into kubernetes-sigs:master May 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@apelisse apelisse apelisse approved these changes

@lavalamp lavalamp Awaiting requested review from lavalamp

Assignees

@apelisse apelisse

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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@julianvmodesto @k8s-ci-robot @apelisse