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

v1: ignore empty, not-nil gpg keys from content sources (HMS-5310) #1457

Merged
merged 1 commit into from
Jan 13, 2025

Conversation

croissanne
Copy link
Member

@croissanne croissanne commented Jan 13, 2025

If a gpg key is not added, the content sources api will still return an empty string. Composer cannot deal with an empty, not-nil gpg key, so just ignore the key in this case.

JIRA: HMS-5310

@croissanne
Copy link
Member Author

/jira-epic HMS-4930

@schutzbot schutzbot changed the title v1: ignore empty, not-nil gpg keys from content sources v1: ignore empty, not-nil gpg keys from content sources (HMS-5310) Jan 13, 2025
@croissanne croissanne requested a review from lzap January 13, 2025 13:22
Copy link

codecov bot commented Jan 13, 2025

Codecov Report

Attention: Patch coverage is 63.88889% with 13 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
internal/v1/mocks/content_sources.go 74.07% 6 Missing and 1 partial ⚠️
internal/v1/handler_compose_image.go 33.33% 0 Missing and 6 partials ⚠️
Files with missing lines Coverage Δ
internal/v1/handler_compose_image.go 65.30% <33.33%> (+0.40%) ⬆️
internal/v1/mocks/content_sources.go 75.37% <74.07%> (-0.21%) ⬇️

@croissanne croissanne requested a review from tkoscieln January 13, 2025 13:46
If a gpg key is not added, the content sources api will still return an
empty string. Composer cannot deal with an empty, not-nil gpg key, so
just ignore the key in this case.
@lzap
Copy link
Collaborator

lzap commented Jan 13, 2025

Oh no I accidentally merged a dep update, rebased. Sorry!

@croissanne croissanne merged commit b4d2157 into osbuild:main Jan 13, 2025
17 checks passed
@croissanne croissanne deleted the gpg-key-fix branch January 13, 2025 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants