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

lxc: Check the image really exists on the remote before exporting it #13161

Merged
merged 2 commits into from
Mar 19, 2024
Merged

lxc: Check the image really exists on the remote before exporting it #13161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
860c719
lxc: handle `GetImage` logic inside `dereferenceAlias`
gabrielmougard Mar 15, 2024
aeb045a
i18n: update .pot files
gabrielmougard Mar 18, 2024
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
89 changes: 51 additions & 38 deletions lxc/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,17 +109,30 @@ hash or alias name (if one is set).`))
return cmd
}

func (c *cmdImage) dereferenceAlias(d lxd.ImageServer, imageType string, inName string) string {
// dereferenceAlias resolves an alias (or a fingerprint) to an image and returns the image and its etag.
func (c *cmdImage) dereferenceAlias(d lxd.ImageServer, imageType string, inName string) (image *api.Image, etag string, err error) {
if inName == "" {
inName = "default"
}

result, _, _ := d.GetImageAliasType(imageType, inName)
if result == nil {
return inName
result, _, err := d.GetImageAliasType(imageType, inName)
if err != nil {
// Maybe that inName is a fingerprint and can't be found as an alias
image, etag, errImage := d.GetImage(inName)
if errImage != nil {
return nil, "", fmt.Errorf(i18n.G("Failed fetching fingerprint %q: %w"), inName, errImage)
}

return image, etag, nil
}

// Alias could be resolved, return its image
image, etag, err = d.GetImage(result.Target)
if err != nil {
return nil, "", fmt.Errorf(i18n.G("Failed fetching fingerprint %q for alias %q: %w"), result.Target, inName, err)
}

return result.Target
return image, etag, nil
}

// Copy.
Expand Down Expand Up @@ -229,8 +242,7 @@ func (c *cmdImageCopy) Run(cmd *cobra.Command, args []string) error {
imgInfo.Public = true
} else {
// Resolve any alias and then grab the image information from the source
image := c.image.dereferenceAlias(sourceServer, imageType, name)
imgInfo, _, err = sourceServer.GetImage(image)
imgInfo, _, err = c.image.dereferenceAlias(sourceServer, imageType, name)
if err != nil {
return err
}
Expand Down Expand Up @@ -335,8 +347,12 @@ func (c *cmdImageDelete) Run(cmd *cobra.Command, args []string) error {
return fmt.Errorf(i18n.G("Image identifier missing"))
}

image := c.image.dereferenceAlias(resource.server, "", resource.name)
op, err := resource.server.DeleteImage(image)
image, _, err := c.image.dereferenceAlias(resource.server, "", resource.name)
if err != nil {
return err
}

op, err := resource.server.DeleteImage(image.Fingerprint)
if err != nil {
return err
}
Expand Down Expand Up @@ -404,9 +420,9 @@ func (c *cmdImageEdit) Run(cmd *cobra.Command, args []string) error {
}

// Resolve any aliases
image := c.image.dereferenceAlias(resource.server, "", resource.name)
if image == "" {
image = resource.name
image, etag, err := c.image.dereferenceAlias(resource.server, "", resource.name)
if err != nil {
return err
}

// If stdin isn't a terminal, read text from it
Expand All @@ -422,16 +438,10 @@ func (c *cmdImageEdit) Run(cmd *cobra.Command, args []string) error {
return err
}

return resource.server.UpdateImage(image, newdata, "")
return resource.server.UpdateImage(image.Fingerprint, newdata, "")
}

// Extract the current value
imgInfo, etag, err := resource.server.GetImage(image)
if err != nil {
return err
}

brief := imgInfo.Writable()
brief := image.Writable()
data, err := yaml.Marshal(&brief)
if err != nil {
return err
Expand All @@ -448,7 +458,7 @@ func (c *cmdImageEdit) Run(cmd *cobra.Command, args []string) error {
newdata := api.ImagePut{}
err = yaml.Unmarshal(content, &newdata)
if err == nil {
err = resource.server.UpdateImage(image, newdata, etag)
err = resource.server.UpdateImage(image.Fingerprint, newdata, etag)
}

// Respawn the editor
Expand Down Expand Up @@ -522,11 +532,14 @@ func (c *cmdImageExport) Run(cmd *cobra.Command, args []string) error {
imageType = "virtual-machine"
}

fingerprint := c.image.dereferenceAlias(remoteServer, imageType, name)
image, _, err := c.image.dereferenceAlias(remoteServer, imageType, name)
if err != nil {
return err
}

// Default target is current directory
target := "."
targetMeta := fingerprint
targetMeta := image.Fingerprint
if len(args) > 1 {
target = args[1]
if shared.IsDir(shared.HostPathFollow(args[1])) {
Expand Down Expand Up @@ -566,7 +579,7 @@ func (c *cmdImageExport) Run(cmd *cobra.Command, args []string) error {
}

// Download the image
resp, err := remoteServer.GetImageFile(fingerprint, req)
resp, err := remoteServer.GetImageFile(image.Fingerprint, req)
if err != nil {
_ = os.Remove(targetMeta)
_ = os.Remove(targetRootfs)
Expand Down Expand Up @@ -914,8 +927,7 @@ func (c *cmdImageInfo) Run(cmd *cobra.Command, args []string) error {
imageType = "virtual-machine"
}

image := c.image.dereferenceAlias(remoteServer, imageType, name)
info, _, err := remoteServer.GetImage(image)
info, _, err := c.image.dereferenceAlias(remoteServer, imageType, name)
if err != nil {
return err
}
Expand Down Expand Up @@ -1361,13 +1373,17 @@ func (c *cmdImageRefresh) Run(cmd *cobra.Command, args []string) error {
return fmt.Errorf(i18n.G("Image identifier missing"))
}

image := c.image.dereferenceAlias(resource.server, "", resource.name)
image, _, err := c.image.dereferenceAlias(resource.server, "", resource.name)
if err != nil {
return err
}

progress := cli.ProgressRenderer{
Format: i18n.G("Refreshing the image: %s"),
Quiet: c.global.flagQuiet,
}

op, err := resource.server.RefreshImage(image)
op, err := resource.server.RefreshImage(image.Fingerprint)
if err != nil {
return err
}
Expand Down Expand Up @@ -1448,13 +1464,12 @@ func (c *cmdImageShow) Run(cmd *cobra.Command, args []string) error {
imageType = "virtual-machine"
}

image := c.image.dereferenceAlias(remoteServer, imageType, name)
info, _, err := remoteServer.GetImage(image)
image, _, err := c.image.dereferenceAlias(remoteServer, imageType, name)
if err != nil {
return err
}

properties := info.Writable()
properties := image.Writable()
data, err := yaml.Marshal(&properties)
if err != nil {
return err
Expand Down Expand Up @@ -1501,13 +1516,12 @@ func (c *cmdImageGetProp) Run(cmd *cobra.Command, args []string) error {
}

// Get the corresponding property
image := c.image.dereferenceAlias(remoteServer, "", name)
info, _, err := remoteServer.GetImage(image)
image, _, err := c.image.dereferenceAlias(remoteServer, "", name)
if err != nil {
return err
}

prop, propFound := info.Properties[args[1]]
prop, propFound := image.Properties[args[1]]
if !propFound {
return fmt.Errorf(i18n.G("Property not found"))
}
Expand Down Expand Up @@ -1554,17 +1568,16 @@ func (c *cmdImageSetProp) Run(cmd *cobra.Command, args []string) error {
}

// Show properties
image := c.image.dereferenceAlias(resource.server, "", resource.name)
info, etag, err := resource.server.GetImage(image)
image, etag, err := c.image.dereferenceAlias(resource.server, "", resource.name)
if err != nil {
return err
}

properties := info.Writable()
properties := image.Writable()
properties.Properties[args[1]] = args[2]

// Update image
err = resource.server.UpdateImage(image, properties, etag)
err = resource.server.UpdateImage(image.Fingerprint, properties, etag)
if err != nil {
return err
}
Expand Down