LXC: Fix lxc image list regression
#14563
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kadinsayani
changed the title
GetImagesAllProjects and GetImagesAllProjectsWithFilter …lxc image list regression
…lter` client functions and interfaces to `simplestreams_images.go` This commit fixes a regression introduced with support for fetching images across all projects by adding `GetImagesAllProjects` and `GetImagesAllProjectsWithFilter` functions to `client/simplestreams_images.go`, and moving their method signatures to the `ImageServer` interface. Signed-off-by: Kadin Sayani <[email protected]>
kadinsayani
force-pushed
the
14561-image-list-fix
branch
from
b15c1c7 to
003e928
Compare
tomponline
added a commit
that referenced
this pull request
Jan 24, 2025
#14563 attempted to fix #14561 by adding `GetImagesAllProjects` and `GetImagesAllProjectsWithFilter` functions to `client/simplestreams_images.go`, and moving their method signatures to the `ImageServer` interface. Instead, we should only expand the `InstanceServer` interface and correctly use the client functions when `--all-projects` is set.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #14561 introduced with #14260.
This PR fixes a regression introduced with #14260 by adding
GetImagesAllProjectsandGetImagesAllProjectsWithFilterfunctions toclient/simplestreams_images.go, and moving their method signatures tothe
ImageServerinterface. While adding support for fetching images across all projects, we changed the logic in thelxc image listcommand to call different functions based on whether the--all-projectsflag is passed in or not:1fae6e6
This is fine, but we needed to add
simplestreamsprotocol support as well to facilitate listing public images from remotes such asimagesandubuntu-minimal-daily.The actual bug comes from the following LOC:
lxd/lxc/image.go
Lines 1356 to 1359 in 4a3c4a3
Fetching from an instance server isn't applicable for
simplestreamsservers, soGetImagesAllProjectsis never reached due to the error raised byc.global.conf.GetInstanceServer. Instead, we should fetch an image server before fetching images, hence why moving the new client functions method signatures to theImageServerinterface fixes the regression.