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

Add spoc merge Command #2136

Merged
merged 3 commits into from
Mar 1, 2024
Merged

Add spoc merge Command #2136

merged 3 commits into from
Mar 1, 2024

Conversation

mhils
Copy link
Contributor

@mhils mhils commented Feb 27, 2024

What type of PR is this?

/kind feature

What this PR does / why we need it:

This PR adds a spoc merge command which can be used to merge multiple security profiles via the CLI.

Does this PR have test?

Yes.

Does this PR introduce a user-facing change?

Added a `spoc merge` command to merge multiple security profiles from the command line.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 27, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @mhils. 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 Feb 27, 2024
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Feb 27, 2024
}

// yaml.Unmarshal happily takes YAML for a SELinux profile and unmarshals
// it into SeccompProfile. We need to check the YAML kind!
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This here was quite surprising to me and annoying to track down.

I think this is also a bug in Artifact.Pull(...), but I haven't verified it end-to-end. If we all are happy with directly using yalm.Unmarshal there (instead of going through a.YamlUnmarshal), I'm happy to follow up with another PR that extracts profile loading into a generic utility function which is used in both places.
In any case, that's definitely a separate PR. :)

Copy link
Member

Choose a reason for hiding this comment

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

We only used if for seccomp right now, so yeah. This may be a bad bug.

Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

Thank you!

internal/pkg/cli/merger/consts.go Outdated Show resolved Hide resolved
}

// yaml.Unmarshal happily takes YAML for a SELinux profile and unmarshals
// it into SeccompProfile. We need to check the YAML kind!
Copy link
Member

Choose a reason for hiding this comment

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

We only used if for seccomp right now, so yeah. This may be a bad bug.

@saschagrunert
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 28, 2024
@codecov-commenter
Copy link

codecov-commenter commented Feb 28, 2024

Codecov Report

Merging #2136 (9e3fc1d) into main (11d77f4) will decrease coverage by 4.55%.
Report is 55 commits behind head on main.
The diff coverage is 54.35%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2136      +/-   ##
==========================================
- Coverage   45.50%   40.95%   -4.55%     
==========================================
  Files          79      102      +23     
  Lines        7782    15106    +7324     
==========================================
+ Hits         3541     6187    +2646     
- Misses       4099     8482    +4383     
- Partials      142      437     +295     

Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

Thank you!

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mhils, saschagrunert

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 Mar 1, 2024
@mhils
Copy link
Contributor Author

mhils commented Mar 1, 2024

Thank you for the prompt review! 🍰 Tests are just flaky here, right?

@saschagrunert
Copy link
Member

Yes, restarted the OLM test.

@mhils
Copy link
Contributor Author

mhils commented Mar 1, 2024

Thanks - looks like we are extra lucky today or we have CI breakage. 🙃

@k8s-ci-robot k8s-ci-robot merged commit 1c1e047 into kubernetes-sigs:main Mar 1, 2024
26 checks passed
@mhils mhils deleted the spoc-merge branch March 1, 2024 20:23
@mhils
Copy link
Contributor Author

mhils commented Mar 1, 2024

Thank you for the super quick review! 🍰 ⚡

@saschagrunert
Copy link
Member

Thank you for working on this @mhils! 🙏

@mhils mhils mentioned this pull request Apr 9, 2024
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. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants