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.

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

Fix '--signing-service' option not allowing HREF #39

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix '--signing-service' option not allowing HREF #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES/38.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed '--signing-service' option not allowing to search by href.
1 change: 1 addition & 0 deletions pulpcore/cli/deb/publication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ def publication(ctx: click.Context, pulp_ctx: PulpCLIContext, publication_type:
default_plugin="deb",
default_type="apt",
context_table={"deb:apt": PulpSigningServiceContext},
href_pattern=PulpSigningServiceContext.HREF_PATTERN,
Copy link
Member

Choose a reason for hiding this comment

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

Since this change is not yet released with pulp-cli, there's a question: Are we ready to bump the minimal required version here already (not until there is a release, i guess), or do we want to fudge the value here for a while with a comment to revert to this final variant once the minimal reqs allow?

Copy link
Collaborator

Choose a reason for hiding this comment

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

@tjmullicani Can you rebase this branch to latest main branch, and then adjust the following line:
https://github.com/pulp/pulp-cli-deb/blob/main/setup.py#L30
to use "pulp-cli>=0.19.0"?

@mdellweg That is what we need to do here, right? And then we can merge once pulp-cli 0.19.0 has been released?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, that would work.
Alternatively, something like getattr(PulpSigningServiceContext, "HREF_PATTERN", "/signing_service/") until we really bump that dependency. I just fear that kind of a workaround would possibly be forgotten to remove eventually.

Copy link
Author

Choose a reason for hiding this comment

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

I have updated the branch.

help=_("Apt only: Signing service to use, pass in name or href"),
),
]
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
package_data={"": ["py.typed", "locale/*/LC_MESSAGES/*.mo"]},
python_requires=">=3.6",
install_requires=[
"pulp-cli>=0.15.0",
"pulp-cli>=0.19.0",
],
entry_points={
"pulp_cli.plugins": [f"{name}={module}" for name, module in plugin_entry_points],
Expand Down