Skip to content

Fix flatpak cache serialization#2329

Merged
dralley merged 1 commit into
pulp:mainfrom
gerrod3:index-set-cache-fix
Apr 28, 2026
Merged

Fix flatpak cache serialization#2329
dralley merged 1 commit into
pulp:mainfrom
gerrod3:index-set-cache-fix

Conversation

@gerrod3
Copy link
Copy Markdown
Contributor

@gerrod3 gerrod3 commented Apr 20, 2026

Re-enable the flatpak tests which caused us to missed this issue.

📜 Checklist

  • Commits are cleanly separated with meaningful messages (simple features and bug fixes should be squashed to one commit)
  • A changelog entry or entries has been added for any significant changes
  • Follows the Pulp policy on AI Usage
  • (For new features) - User documentation and test coverage has been added

See: Pull Request Walkthrough

mdellweg
mdellweg previously approved these changes Apr 21, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@mdellweg mdellweg left a comment

Choose a reason for hiding this comment

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

Looks almost too easy. But the code change never reflects the debugging effort. ;)

@gerrod3 gerrod3 force-pushed the index-set-cache-fix branch from 018b58f to e10a31a Compare April 24, 2026 16:01
@gerrod3 gerrod3 force-pushed the index-set-cache-fix branch from 6f3fd8a to 0ab9b11 Compare April 24, 2026 17:47
@gerrod3 gerrod3 force-pushed the index-set-cache-fix branch 5 times, most recently from 58cdce3 to c31f13a Compare April 24, 2026 22:00
vsedmik
vsedmik approved these changes Apr 27, 2026
View reviewed changes
Copy link
Copy Markdown

@vsedmik vsedmik left a comment

Choose a reason for hiding this comment

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

Tested this patch on Satellite 6.18.5 snap 1 (with pulpcore-3.73.30-1 and pulp-container-2.24.5-1, where I just needed to keep the original line L720 bc domains do not exist there yet) - works well, no 500s on pulpcore_registry index, all related tests test_sync_consume_flatpak_repo_via_* passed.

@gerrod3 gerrod3 force-pushed the index-set-cache-fix branch 4 times, most recently from 4cc0a2d to 188aaa1 Compare April 27, 2026 20:02
dralley
dralley reviewed Apr 27, 2026
View reviewed changes
Comment thread pulp_container/app/registry_api.py
dralley
dralley reviewed Apr 27, 2026
View reviewed changes
Comment thread pulp_container/tests/functional/api/test_flatpak.py

from pulp_container.tests.functional.constants import REGISTRY_V2

pytestmark = pytest.mark.skip(reason="TLS is broken currently. TODO: Fix")
Copy link
Copy Markdown
Contributor

@dralley dralley Apr 27, 2026

Choose a reason for hiding this comment

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

This probably belongs in a different commit.

Copy link
Copy Markdown
Contributor Author

@gerrod3 gerrod3 Apr 27, 2026

Choose a reason for hiding this comment

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

Yep, I'm just trying to get the tests to pass, then I'll reorder/squash the commits to make more sense. Also add the issue number

Copy link
Copy Markdown
Contributor

@dralley dralley Apr 27, 2026

Choose a reason for hiding this comment

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

Cool - if there's more than one distinct commit that we need to backport, would it make sense to use separate PRs?

Copy link
Copy Markdown
Contributor Author

@gerrod3 gerrod3 Apr 27, 2026

Choose a reason for hiding this comment

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

There are four fixes to the flatpak endpoint in this PR right now. Either I squish them all into one commit attached to the issue satellite found, or we make separate PRs for all of them.

@gerrod3 gerrod3 force-pushed the index-set-cache-fix branch 5 times, most recently from ce6fa54 to 37c26b8 Compare April 28, 2026 15:15
@gerrod3
Fix numerous flatpak issues
6d6cc5c 
https://redhat.atlassian.net/browse/PULP-1633

- Fix flatpak index cache serialization on pulpcore>=3.85
- Add domain prefix to flatpak index Name field via get_full_path
- Fix FlatpakIndexStaticCache key to include host, preventing cross-domain cache collisions
- Fix OS/architecture filters being silently dropped in recurse_through_manifest_lists
- Make test_flatpak_install domain-aware using the full_path fixture
- Fix host generation in index response when CONTENT_ORIGIN=None
- Fix CI TLS setup to use cp cert to the anchor location so flatpak/OSTree trusts the Pulp CA

Made-with: Cursor
@gerrod3 gerrod3 force-pushed the index-set-cache-fix branch from 37c26b8 to 6d6cc5c Compare April 28, 2026 15:27
dralley
dralley reviewed Apr 28, 2026
View reviewed changes
Comment thread CHANGES/+flatpak-domain-name.bugfix
@@ -0,0 +1 @@
Fixed flatpak index response to include the domain prefix in image names when domains are enabled.
Copy link
Copy Markdown
Contributor

@dralley dralley Apr 28, 2026

Choose a reason for hiding this comment

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

In the image names themselves, or is this more like "paths"?

@dralley
Copy link
Copy Markdown
Contributor

dralley commented Apr 28, 2026 •
edited
Loading

Not sure if the remaining CI failure is a flaky test or a true failure

@dralley dralley merged commit 1f08ceb into pulp:main Apr 28, 2026
24 of 27 checks passed
@patchback
Copy link
Copy Markdown

patchback Bot commented Apr 28, 2026 •
edited
Loading

Backport to 2.26: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.26/1f08cebbc2156b4bf55012c990cbf1bfe5c68400/pr-2329

Backported as #2346

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback patchback Bot mentioned this pull request Apr 28, 2026
Merged
4 tasks
@patchback
Copy link
Copy Markdown

patchback Bot commented Apr 28, 2026 •
edited
Loading

Backport to 2.24: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.24/1f08cebbc2156b4bf55012c990cbf1bfe5c68400/pr-2329

Backported as #2347

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback patchback Bot mentioned this pull request Apr 28, 2026
Merged
4 tasks
@patchback
Copy link
Copy Markdown

patchback Bot commented Apr 28, 2026 •
edited
Loading

Backport to 2.27: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.27/1f08cebbc2156b4bf55012c990cbf1bfe5c68400/pr-2329

Backported as #2348

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback patchback Bot mentioned this pull request Apr 28, 2026
Merged
4 tasks
@gerrod3 gerrod3 deleted the index-set-cache-fix branch April 28, 2026 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dralley dralley dralley approved these changes

@mdellweg mdellweg mdellweg left review comments

+1 more reviewer

@vsedmik vsedmik vsedmik approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport-2.24 backport-2.26 backport-2.27 no-issue

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@gerrod3 @dralley @mdellweg @vsedmik