Skip to content

Consolidate the definition and consumption of --sign* CLI options #26617

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
openshift-merge-bot merged 3 commits into from
Jul 28, 2025
Merged

Consolidate the definition and consumption of --sign* CLI options #26617

openshift-merge-bot merged 3 commits into from
Jul 28, 2025

Conversation

@mtrmac
Copy link
Contributor

@mtrmac mtrmac commented Jul 11, 2025

Only define --sign* options once, to reduce repetition and simplify adding another one. This will help adding --sign-by-sq-fingerprint.

Also clean up some artifact code.

See individual commit messages for details.

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added release-note-none approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 11, 2025
mtrmac
mtrmac commented Jul 11, 2025
View reviewed changes
cmd/podman/images/push.go
CredentialsCLI string
signing common.SigningCLIOnlyOptions
EncryptionKeys []string
EncryptLayers []int
Copy link
Contributor Author

@mtrmac mtrmac Jul 11, 2025

Choose a reason for hiding this comment

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

More of this could probably be shared, but I don’t need to do that for my purposes now.

@mtrmac mtrmac mentioned this pull request Jul 11, 2025
Merged
TomSweeneyRedHat
TomSweeneyRedHat reviewed Jul 11, 2025
View reviewed changes
@TomSweeneyRedHat
Copy link
Member

TomSweeneyRedHat commented Jul 11, 2025

Failing as there are no new tests. Should we add the flag to override that?

@mtrmac
Copy link
Contributor Author

mtrmac commented Jul 14, 2025

I’ll just add a test for artifact push --creds — that’s not the core of the otherwise-pure-refactoring PR but it should have a test.

@mtrmac mtrmac force-pushed the common-signing branch 5 times, most recently from 28ba166 to 1ce6abb Compare July 14, 2025 13:18
@packit-as-a-service
Copy link

packit-as-a-service bot commented Jul 14, 2025

[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore.

@mtrmac mtrmac force-pushed the common-signing branch 3 times, most recently from b93e021 to 344c4be Compare July 14, 2025 15:57
@mtrmac
Copy link
Contributor Author

mtrmac commented Jul 14, 2025

b93e021 shows the new tests failing…

@mtrmac
Copy link
Contributor Author

mtrmac commented Jul 14, 2025

… and tests are succeeding with the fix as intended. PTAL.

Luap99
Luap99 reviewed Jul 14, 2025
View reviewed changes
Luap99
Luap99 approved these changes Jul 16, 2025
View reviewed changes
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM

mtrmac added 3 commits July 25, 2025 22:33
@mtrmac
Remove unused CLI options
6792771 
CLI options have no place in pkg/domain/entities, and these
are never set anyway.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac
Fix (podman artifact push --creds)
426e787 
Actually use the parsed values.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac
Consolidate the definition and consumption of --sign* CLI options
df2862e 
There are three copies of them, and already a shared utility, so
also define the options in a single place.

This will make it easier to add more options, and it reduces the risk
of incorrectly ordering the parameters to PrepareSigning.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@Luap99
Copy link
Member

Luap99 commented Jul 28, 2025

@containers/podman-maintainers PTAL

giuseppe
giuseppe approved these changes Jul 28, 2025
View reviewed changes
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 28, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 28, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, Luap99, mtrmac

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [Luap99,giuseppe,mtrmac]

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

@openshift-merge-bot openshift-merge-bot bot merged commit e6a439a into containers:main Jul 28, 2025
76 of 77 checks passed
@mtrmac mtrmac deleted the common-signing branch July 28, 2025 12:36
@stale-locking-app stale-locking-app bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Oct 27, 2025
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators Oct 27, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@TomSweeneyRedHat TomSweeneyRedHat TomSweeneyRedHat left review comments

@giuseppe giuseppe giuseppe approved these changes

@Luap99 Luap99 Luap99 approved these changes

Assignees

@giuseppe giuseppe

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note-none

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mtrmac @TomSweeneyRedHat @Luap99 @giuseppe