openstack-image-manager 0.20240318.0__py3-none-any.whl → 0.20240403.0__py3-none-any.whl

openstack_image_manager/manage.py

@@ -8,6 +8,7 @@ import os
 import re
 import sys
 import typer
+import typing
 from typing import Dict, Set
 import yamale
 import urllib.parse
@@ -202,12 +203,12 @@ class ImageManager:
         Read all files in etc/images/ and process each image
         Rename outdated images when not dry-running
         """
-        logger.debug("cloud = %s" % self.CONF.cloud)
-        logger.debug("dry-run = %s" % self.CONF.dry_run)
-        logger.debug("images = %s" % self.CONF.images)
-        logger.debug("tag = %s" % self.CONF.tag)
+        logger.debug(f"cloud = {self.CONF.cloud}")
+        logger.debug(f"dry-run = {self.CONF.dry_run}")
+        logger.debug(f"images = {self.CONF.images}")
+        logger.debug(f"tag = {self.CONF.tag}")
         logger.debug(
-            "yes-i-really-know-what-i-do = %s" % self.CONF.yes_i_really_know_what_i_do
+            f"yes-i-really-know-what-i-do = {self.CONF.yes_i_really_know_what_i_do}"
         )
 
         # check local image definitions with yamale
@@ -280,13 +281,12 @@ class ImageManager:
             for required_key in REQUIRED_KEYS:
                 if required_key not in image:
                     logger.error(
-                        "'%s' lacks the necessary key %s"
-                        % (image["name"], required_key)
+                        f"'{image['name']}' lacks the necessary key {required_key}"
                     )
                     self.exit_with_error = True
                     continue
 
-            logger.debug("Processing '%s'" % image["name"])
+            logger.debug(f"Processing '{image['name']}'")
 
             try:
                 versions = dict()
@@ -331,7 +331,8 @@ class ImageManager:
                         # strip any directory path for file: urls in order to
                         # avoid exposing local filesystem details to other users
                         if url.startswith("file:") and "/" in url:
-                            url = "file:%s" % url.rsplit("/", 1)[1]
+                            urlfile = url.rsplit("/", 1)[1]
+                            url = f"file:{urlfile}"
                         versions[version["version"]]["meta"]["image_source"] = url
 
                     if "build_date" in version:
@@ -352,7 +353,7 @@ class ImageManager:
             image["tags"].append(self.CONF.tag)
 
             if "os_distro" in image["meta"]:
-                image["tags"].append("os:%s" % image["meta"]["os_distro"])
+                image["tags"].append(f"os:{image['meta']['os_distro']}")
 
             if "image_description" not in image["meta"]:
                 image["meta"]["image_description"] = image["name"]
@@ -371,7 +372,7 @@ class ImageManager:
 
     def import_image(
         self, image: dict, name: str, url: str, versions: dict, version: str
-    ) -> Image | None:
+    ) -> typing.Union[Image, None]:
         """
         Create a new image in Glance and upload it using the web-download method
 
@@ -382,7 +383,8 @@ class ImageManager:
             versions: versions dict generated by main()
             version: currently processed version
         """
-        logger.info("Importing image %s" % name)
+        logger.info(f"Importing image {name}")
+        logger.info(f"Importing from URL {url}")
 
         properties = {
             "container_format": "bare",
@@ -403,16 +405,13 @@ class ImageManager:
             with local_file:
                 try:
                     logger.info(
-                        "Uploading local file '%s' as image %s"
-                        % (parsed_url.path, name)
+                        f"Uploading local file '{parsed_url.path}' as image {name}"
                     )
                     new_image.data = local_file
                     new_image.upload(self.conn.image)
                 except Exception as e:
                     self.conn.image.delete_image(new_image)
-                    logger.error(
-                        "Failed to upload local file for image %s\n%s" % (name, e)
-                    )
+                    logger.error(f"Failed to upload local file for image {name}\n{e}")
                     self.exit_with_error = True
                     return None
         else:
@@ -435,13 +434,9 @@ class ImageManager:
                 or image.owner == self.conn.current_project_id
             ):
                 result[image.name] = image
-                logger.debug(
-                    "Managed image '%s' (tags = %s)" % (image.name, image.tags)
-                )
+                logger.debug(f"Managed image '{image.name}' (tags = {image.tags})")
             else:
-                logger.debug(
-                    "Unmanaged image '%s' (tags = %s)" % (image.name, image.tags)
-                )
+                logger.debug(f"Unmanaged image '{image.name}' (tags = {image.tags})")
 
         if self.CONF.use_os_hidden:
             for image in self.conn.image.images(**{"os_hidden": True}):
@@ -451,17 +446,15 @@ class ImageManager:
                 ):
                     result[image.name] = image
                     logger.debug(
-                        "Managed hidden image '%s' (tags = %s)"
-                        % (image.name, image.tags)
+                        f"Managed hidden image '{image.name}' (tags = {image.tags})"
                     )
                 else:
                     logger.debug(
-                        "Unmanaged hidden image '%s' (tags = %s)"
-                        % (image.name, image.tags)
+                        f"Unmanaged hidden image '{image.name}' (tags = {image.tags})"
                     )
         return result
 
-    def wait_for_image(self, image: Image) -> Image | None:
+    def wait_for_image(self, image: Image) -> typing.Union[Image, None]:
         """
         Wait for an imported image to reach "active" state
 
@@ -482,9 +475,7 @@ class ImageManager:
                 # indefinitely stuck in "queued" state.
                 if imported_image.status == "queued":
                     if retry_attempts_for_queued_state < 0:
-                        logger.error(
-                            "Image %s seems stuck in queued state" % image.name
-                        )
+                        logger.error(f"Image {image.name} seems stuck in queued state")
                         self.exit_with_error = True
                         return None
                     else:
@@ -497,7 +488,7 @@ class ImageManager:
                 else:
                     return imported_image
             except Exception as e:
-                logger.error("Exception while importing image %s\n%s" % (image.name, e))
+                logger.error(f"Exception while importing image {image.name}\n{e}")
                 self.exit_with_error = True
 
     def process_image(
@@ -525,12 +516,12 @@ class ImageManager:
 
         for version in sorted_versions:
             if image["multi"]:
-                name = "%s (%s)" % (image["name"], version)
+                name = f"{image['name']} ({version})"
             else:
-                name = "%s %s" % (image["name"], version)
+                name = f"{image['name']} {version}"
 
-            logger.info("Processing image '%s'" % name)
-            logger.debug("Checking existence of '%s'" % name)
+            logger.info(f"Processing image '{name}'")
+            logger.debug(f"Checking existence of '{name}'")
             existence = name in cloud_images
 
             if existence and cloud_images[name].status != "active":
@@ -553,8 +544,7 @@ class ImageManager:
                         )
                 except KeyError:
                     logger.error(
-                        "Image %s is missing property 'internal_version'"
-                        % image["name"]
+                        f"Image {image['name']} is missing property 'internal_version'"
                     )
 
             elif (
@@ -563,7 +553,7 @@ class ImageManager:
                 and version == sorted_versions[-1]
                 and not existence
             ):
-                previous = "%s (%s)" % (image["name"], sorted_versions[-2])
+                previous = f"{image['name']} ({sorted_versions[-2]})"
                 existence = previous in cloud_images and image["name"] in cloud_images
 
             elif (
@@ -584,8 +574,7 @@ class ImageManager:
                 )
                 if not upstream_checksum:
                     logger.error(
-                        "Could not find checksum for image '%s', check the checksums_url"
-                        % image["name"]
+                        f"Could not find checksum for image '{image['name']}', check the checksums_url"
                     )
                     return existing_images, imported_image, previous_image
 
@@ -596,11 +585,11 @@ class ImageManager:
                         else ""
                     )
                     if image_checksum == upstream_checksum:
-                        logger.info("No new version for '%s'" % image["name"])
+                        logger.info(f"No new version for '{image['name']}'")
                         existing_images.add(image["name"])
                         return existing_images, imported_image, previous_image
                     else:
-                        logger.info("New version for '%s'" % image["name"])
+                        logger.info(f"New version for '{image['name']}'")
                         existence = False
                 except KeyError:
                     # when switching from a release pointer to a latest pointer, the image has no checksum property
@@ -619,8 +608,7 @@ class ImageManager:
                     file_path = parsed_url.path
                     if not (os.path.exists(file_path) and os.path.isfile(file_path)):
                         logger.error(
-                            "Skipping '%s' due to file '%s' not found locally"
-                            % (name, file_path)
+                            f"Skipping '{name}' due to file '{file_path}' not found locally"
                         )
                         self.exit_with_error = True
                         return existing_images, imported_image, previous_image
@@ -628,12 +616,11 @@ class ImageManager:
                     r = requests.head(url)
 
                     if r.status_code in [200, 302]:
-                        logger.info("Tested URL %s: %s" % (url, r.status_code))
+                        logger.info(f"Tested URL {url}: {r.status_code}")
                     else:
-                        logger.error("Tested URL %s: %s" % (url, r.status_code))
+                        logger.error(f"Tested URL {url}: {r.status_code}")
                         logger.error(
-                            "Skipping '%s' due to HTTP status code %s"
-                            % (name, r.status_code)
+                            f"Skipping '{name}' due to HTTP status code {r.status_code}"
                         )
                         self.exit_with_error = True
                         return existing_images, imported_image, previous_image
@@ -647,8 +634,7 @@ class ImageManager:
                     )
                     if import_result:
                         logger.info(
-                            "Import of '%s' successfully completed, reloading images"
-                            % name
+                            f"Import of '{name}' successfully completed, reloading images"
                         )
                         cloud_images = self.get_images()
                         imported_image = cloud_images.get(name, None)
@@ -659,8 +645,7 @@ class ImageManager:
 
             elif self.CONF.latest and version != sorted_versions[-1]:
                 logger.info(
-                    "Skipping image '%s' (only importing the latest version from type multi)"
-                    % name
+                    f"Skipping image '{name}' (only importing the latest version from type multi)"
                 )
 
             if image["multi"]:
@@ -697,7 +682,7 @@ class ImageManager:
         image["meta"] = meta.copy()
 
         if name in cloud_images:
-            logger.info("Checking parameters of '%s'" % name)
+            logger.info(f"Checking parameters of '{name}'")
 
             cloud_image = cloud_images[name]
             real_image_size = int(
@@ -708,8 +693,7 @@ class ImageManager:
 
             if "min_disk" in image and image["min_disk"] != cloud_image.min_disk:
                 logger.info(
-                    "Setting min_disk: %s != %s"
-                    % (image["min_disk"], cloud_image.min_disk)
+                    f"Setting min_disk: {image['min_disk']} != {cloud_image.min_disk}"
                 )
                 self.conn.image.update_image(
                     cloud_image.id, **{"min_disk": int(image["min_disk"])}
@@ -718,15 +702,14 @@ class ImageManager:
             if (
                 "min_disk" in image and real_image_size > image["min_disk"]
             ) or "min_disk" not in image:
-                logger.info("Setting min_disk = %d" % real_image_size)
+                logger.info(f"Setting min_disk = {real_image_size}")
                 self.conn.image.update_image(
                     cloud_image.id, **{"min_disk": real_image_size}
                 )
 
             if "min_ram" in image and image["min_ram"] != cloud_image.min_ram:
                 logger.info(
-                    "Setting min_ram: %s != %s"
-                    % (image["min_ram"], cloud_image.min_ram)
+                    f"Setting min_ram: {image['min_ram']} != {cloud_image.min_ram}"
                 )
                 self.conn.image.update_image(
                     cloud_image.id, **{"min_ram": int(image["min_ram"])}
@@ -734,7 +717,7 @@ class ImageManager:
 
             if self.CONF.use_os_hidden:
                 if "hidden" in versions[version]:
-                    logger.info("Setting os_hidden = %s" % versions[version]["hidden"])
+                    logger.info(f"Setting os_hidden = {versions[version]['hidden']}")
                     self.conn.image.update_image(
                         cloud_image.id, **{"os_hidden": versions[version]["hidden"]}
                     )
@@ -756,24 +739,23 @@ class ImageManager:
                     )
                     modify_date = modify_date.replace("-", "")
 
-                    logger.info("Setting internal_version = %s" % modify_date)
+                    logger.info(f"Setting internal_version = {modify_date}")
                     image["meta"]["internal_version"] = modify_date
                 except Exception:
                     logger.error(
-                        "Error when retrieving the modification date of image '%s'",
-                        image["name"],
+                        f"Error when retrieving the modification date of image '{image['name']}'"
                     )
-                    logger.info("Setting internal_version = %s" % version)
+                    logger.info(f"Setting internal_version = {version}")
                     image["meta"]["internal_version"] = version
             else:
-                logger.info("Setting internal_version = %s" % version)
+                logger.info(f"Setting internal_version = {version}")
                 image["meta"]["internal_version"] = version
 
-            logger.info("Setting image_original_user = %s" % image["login"])
+            logger.info(f"Setting image_original_user = {image['login']}")
             image["meta"]["image_original_user"] = image["login"]
 
             if self.CONF.hypervisor:
-                logger.info("Setting hypervisor type = %s" % self.CONF.hypervisor)
+                logger.info(f"Setting hypervisor type = {self.CONF.hypervisor}")
                 image["meta"]["hypervisor_type"] = self.CONF.hypervisor
 
             if version == "latest" and upstream_checksum:
@@ -786,12 +768,12 @@ class ImageManager:
 
             for tag in image["tags"]:
                 if tag not in cloud_image.tags:
-                    logger.info("Adding tag %s" % (tag))
+                    logger.info(f"Adding tag {tag}")
                     self.conn.image.add_tag(cloud_image.id, tag)
 
             for tag in cloud_image.tags:
                 if tag not in image["tags"]:
-                    logger.info("Deleting tag %s" % (tag))
+                    logger.info(f"Deleting tag {tag}")
                     self.conn.image.remove_tag(cloud_image.id, tag)
 
             if "meta" in versions[version]:
@@ -803,8 +785,7 @@ class ImageManager:
                 if property in image["meta"]:
                     if image["meta"][property] != properties[property]:
                         logger.info(
-                            "Setting property %s: %s != %s"
-                            % (property, properties[property], image["meta"][property])
+                            f"Setting property {property}: {properties[property]} != {image['meta'][property]}"
                         )
                         self.conn.image.update_image(
                             cloud_image.id, **{property: str(image["meta"][property])}
@@ -816,37 +797,37 @@ class ImageManager:
                     "stores",
                 ] or not property.startswith("os_"):
                     # FIXME: handle deletion of properties
-                    logger.debug("Deleting property %s" % (property))
+                    logger.debug(f"Deleting property {property}")
 
             for property in image["meta"]:
                 if property not in properties:
                     logger.info(
-                        "Setting property %s: %s" % (property, image["meta"][property])
+                        f"Setting property {property}: {image['meta'][property]}"
                     )
                     self.conn.image.update_image(
                         cloud_image.id, **{property: str(image["meta"][property])}
                     )
 
-            logger.info("Checking status of '%s'" % name)
+            logger.info(f"Checking status of '{name}'")
             if (
                 cloud_image.status != image["status"]
                 and image["status"] == "deactivated"
             ):
-                logger.info("Deactivating image '%s'" % name)
+                logger.info(f"Deactivating image '{name}'")
                 self.conn.image.deactivate_image(cloud_image.id)
 
             elif cloud_image.status != image["status"] and image["status"] == "active":
-                logger.info("Reactivating image '%s'" % name)
+                logger.info(f"Reactivating image '{name}'")
                 self.conn.image.reactivate_image(cloud_image.id)
 
-            logger.info("Checking visibility of '%s'" % name)
+            logger.info(f"Checking visibility of '{name}'")
             if "visibility" in versions[version]:
                 visibility = versions[version]["visibility"]
             else:
                 visibility = image["visibility"]
 
             if cloud_image.visibility != visibility:
-                logger.info("Setting visibility of '%s' to '%s'" % (name, visibility))
+                logger.info(f"Setting visibility of '{name}' to '{visibility}'")
                 self.conn.image.update_image(cloud_image.id, visibility=visibility)
 
     def rename_images(
@@ -868,17 +849,17 @@ class ImageManager:
         cloud_images = self.get_images()
 
         if len(sorted_versions) > 1:
-            latest = "%s (%s)" % (name, sorted_versions[-1])
-            previous_latest = "%s (%s)" % (name, sorted_versions[-2])
+            latest = f"{name} ({sorted_versions[-1]})"
+            previous_latest = f"{name} ({sorted_versions[-2]})"
 
             if name in cloud_images and previous_latest not in cloud_images:
-                logger.info("Renaming %s to %s" % (name, previous_latest))
+                logger.info(f"Renaming {name} to {previous_latest}")
                 self.conn.image.update_image(
                     cloud_images[name].id, name=previous_latest
                 )
 
             if latest in cloud_images:
-                logger.info("Renaming %s to %s" % (latest, name))
+                logger.info(f"Renaming {latest} to {name}")
                 self.conn.image.update_image(cloud_images[latest].id, name=name)
 
         elif len(sorted_versions) == 1 and name in cloud_images:
@@ -891,34 +872,30 @@ class ImageManager:
                 )
                 create_date = create_date.replace("-", "")
 
-                previous_latest = "%s (%s)" % (name, create_date)
+                previous_latest = f"{name} ({create_date})"
 
                 logger.info(
-                    "Setting internal_version: %s for %s"
-                    % (create_date, previous_latest)
+                    f"Setting internal_version: {create_date} for {previous_latest}"
                 )
                 self.conn.image.update_image(
                     previous_image.id, **{"internal_version": create_date}
                 )
             else:
-                previous_latest = "%s (%s)" % (
-                    name,
-                    previous_image["properties"]["internal_version"],
+                previous_latest = (
+                    f"{name} ({previous_image['properties']['internal_version']})"
                 )
 
-            logger.info("Renaming old latest '%s' to '%s'" % (name, previous_latest))
+            logger.info(f"Renaming old latest '{name}' to '{previous_latest}'")
             self.conn.image.update_image(previous_image.id, name=previous_latest)
 
-            logger.info(
-                "Renaming imported image '%s' to '%s'" % (imported_image.name, name)
-            )
+            logger.info(f"Renaming imported image '{imported_image.name}' to '{name}'")
             self.conn.image.update_image(imported_image.id, name=name)
 
         elif len(sorted_versions) == 1:
-            latest = "%s (%s)" % (name, sorted_versions[-1])
+            latest = f"{name} ({sorted_versions[-1]})"
 
             if latest in cloud_images:
-                logger.info("Renaming %s to %s" % (latest, name))
+                logger.info(f"Renaming {latest} to {name}")
                 self.conn.image.update_image(cloud_images[latest].id, name=name)
 
     def check_image_age(self) -> set:
@@ -1064,10 +1041,10 @@ class ImageManager:
                     and not self.CONF.dry_run
                 ):
                     try:
-                        logger.info("Deactivating image '%s'" % image)
+                        logger.info(f"Deactivating image '{image}'")
                         self.conn.image.deactivate_image(cloud_image.id)
 
-                        logger.info("Setting visibility of '%s' to 'community'" % image)
+                        logger.info(f"Setting visibility of '{image}' to 'community'")
                         self.conn.image.update_image(
                             cloud_image.id, visibility="community"
                         )
@@ -1076,25 +1053,24 @@ class ImageManager:
                             "keep" not in image_definition
                             or not image_definition["keep"]
                         ):
-                            logger.info("Deleting %s" % image)
+                            logger.info(f"Deleting {image}")
                             self.conn.image.delete_image(cloud_image.id)
                         else:
                             logger.info(
-                                "Image '%s' will not be deleted, because 'keep' flag is True"
-                                % image
+                                f"Image '{image}' will not be deleted, because 'keep' flag is True"
                             )
                     except Exception as e:
                         logger.info(
-                            "%s is still in use and cannot be deleted\n %s" % (image, e)
+                            f"{image} is still in use and cannot be deleted\n {e}"
                         )
 
                 else:
                     logger.warning(
-                        "Image %s should be deleted, but deletion is disabled" % image
+                        f"Image {image} should be deleted, but deletion is disabled"
                     )
                     try:
                         if self.CONF.deactivate and not self.CONF.dry_run:
-                            logger.info("Deactivating image '%s'" % image)
+                            logger.info(f"Deactivating image '{image}'")
                             self.conn.image.deactivate_image(cloud_image.id)
 
                         if (
@@ -1103,13 +1079,13 @@ class ImageManager:
                             and cloud_image.visibility != "community"
                         ):
                             logger.info(
-                                "Setting visibility of '%s' to 'community'" % image
+                                f"Setting visibility of '{image}' to 'community'"
                             )
                             self.conn.image.update_image(
                                 cloud_image.id, visibility="community"
                             )
                     except Exception as e:
-                        logger.error("An Exception occurred: \n%s" % e)
+                        logger.error(f"An Exception occurred: \n{e}")
                         self.exit_with_error = True
             elif counter[image_name] <= last:
                 logger.info(
@@ -1120,12 +1096,12 @@ class ImageManager:
                     and not self.CONF.dry_run
                     and cloud_image.visibility != "community"
                 ):
-                    logger.info("Setting visibility of '%s' to 'community'" % image)
+                    logger.info(f"Setting visibility of '{image}' to 'community'")
                     self.conn.image.update_image(cloud_image.id, visibility="community")
             elif (
                 counter[image_name] < last and self.CONF.hide and not self.CONF.dry_run
             ):
-                logger.info("Setting visibility of '%s' to 'community'" % image)
+                logger.info(f"Setting visibility of '{image}' to 'community'")
                 self.conn.image.update_image(cloud_image.id, visibility="community")
         return unmanaged_images
 
@@ -1141,39 +1117,32 @@ class ImageManager:
                     self.exit_with_error = True
                     for result in e.results:
                         logger.error(
-                            "Error validating data '%s' with '%s'"
-                            % (result.data, result.schema)
+                            f"Error validating data '{result.data}' with '{result.schema}'"
                         )
                         for error in result.errors:
-                            logger.error("\t%s" % error)
+                            logger.error(f"\t{error}")
                 else:
-                    logger.debug("Image file %s is valid" % file)
+                    logger.debug(f"Image file {file} is valid")
         except FileNotFoundError:
-            logger.error("Invalid path '%s'" % self.CONF.images)
+            logger.error(f"Invalid path '{self.CONF.images}'")
 
     def share_image_with_project(self, image, project):
         member = self.conn.image.find_member(project.id, image.id)
 
         if not member:
-            logger.info(
-                "add - %s - %s (%s)" % (image.name, project.name, project.domain_id)
-            )
+            logger.info(f"add - {image.name} - {project.name} ({project.domain_id})")
             if not self.CONF.dry_run:
                 member = self.conn.image.add_member(image.id, member_id=project.id)
 
         if not self.CONF.dry_run and member.status != "accepted":
-            logger.info(
-                "accept - %s - %s (%s)" % (image.name, project.name, project.domain_id)
-            )
+            logger.info(f"accept - {image.name} - {project.name} ({project.domain_id})")
             self.conn.image.update_member(member, image.id, status="accepted")
 
     def unshare_image_with_project(self, image, project):
         member = self.conn.image.find_member(project.id, image.id)
 
         if member:
-            logger.info(
-                "del - %s - %s (%s)" % (image.name, project.name, project.domain_id)
-            )
+            logger.info(f"del - {image.name} - {project.name} ({project.domain_id})")
             if not self.CONF.dry_run:
                 self.conn.image.remove_member(member, image.id)
 

openstack_image_manager/update.py

@@ -37,7 +37,7 @@ def get_latest_default(
 
     checksums = {}
     for line in result.text.split("\n"):
-        cs = re.split("\s+", line)  # noqa W605
+        cs = re.split(r"\s+", line)
         if shortname in ["rocky-8", "rocky-9"]:
             if len(cs) == 4 and cs[0] == "SHA256":
                 checksums[latest_filename] = cs[3]
@@ -149,10 +149,10 @@ def mirror_image(
 
     try:
         client.stat_object(minio_bucket, os.path.join(dirname, new_filename))
-        logger.info("'%s' available in '%s'" % (new_filename, dirname))
+        logger.info(f"'{new_filename}' available in '{dirname}'")
     except S3Error:
-        logger.info("'%s' not yet available in '%s'" % (new_filename, dirname))
-        logger.info("Downloading '%s'" % latest_url)
+        logger.info(f"'{new_filename}' not yet available in '{dirname}'")
+        logger.info(f"Downloading '{latest_url}'")
 
         response = requests.get(latest_url, stream=True)
         with open(os.path.basename(path.path), "wb") as fp:
@@ -160,13 +160,11 @@ def mirror_image(
         del response
 
         if fileextension in [".bz2", ".zip", ".xz", ".gz"]:
-            logger.info("Decompressing '%s'" % os.path.basename(path.path))
+            logger.info(f"Decompressing '{os.path.basename(path.path)}'")
             patoolib.extract_archive(os.path.basename(path.path), outdir=".")
             os.remove(os.path.basename(path.path))
 
-        logger.info(
-            "Uploading '%s' to '%s' as '%s'" % (filename, dirname, new_filename)
-        )
+        logger.info(f"Uploading '{filename}' to '{dirname}' as '{new_filename}'")
 
         client.fput_object(minio_bucket, os.path.join(dirname, new_filename), filename)
         os.remove(filename)
@@ -241,12 +239,25 @@ def update_image(
 
     minio_server = str(minio_server)
     minio_bucket = str(minio_bucket)
-    new_url = f"https://{minio_server}/{swift_prefix}{minio_bucket}/{shortname}/{current_version}-{shortname}.{format}"
-    logger.info(f"New URL is {new_url}")
-    image["versions"][0]["url"] = new_url
+    mirror_url = f"https://{minio_server}/{swift_prefix}{minio_bucket}/{shortname}/{current_version}-{shortname}.{format}"  # noqa E501
+    logger.info(f"New URL is {mirror_url}")
+
+    # If `mirror_url` is given, the manage.py script will
+    # use `mirror_url` for the download and will use `url`
+    # to set the `image_source` property. This way we keep
+    # track of the original source of the image.
+
+    image["versions"][0]["mirror_url"] = mirror_url
+
+    # We use `current_url` here and not `latest_url` to keep track
+    # of the original source of the image. Even if we know that `current_url`
+    # will not be available in the future. The `latest_url` will always
+    # be part of the image definition itself.
+
+    image["versions"][0]["url"] = current_url
 
     if dry_run:
-        logger.info(f"Not mirroring {new_url}, dry-run enabled")
+        logger.info(f"Not mirroring {mirror_url}, dry-run enabled")
     else:
         mirror_image(
             image,

{openstack_image_manager-0.20240318.0.dist-info → openstack_image_manager-0.20240403.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openstack-image-manager
-Version: 0.20240318.0
+Version: 0.20240403.0
 Summary: OpenStack image manager
 Author-email: OSISM community <info@osism.tech>
 License: Apache License
@@ -232,13 +232,13 @@ Requires-Dist: patool ==2.2.0
 Requires-Dist: requests ==2.31.0
 Requires-Dist: ruamel.yaml ==0.18.6
 Requires-Dist: tabulate ==0.9.0
-Requires-Dist: typer[all] ==0.9.0
-Requires-Dist: yamale ==5.0.0
+Requires-Dist: typer[all] ==0.12.0
+Requires-Dist: yamale ==5.1.0
 
 # openstack-image-manager
 
 [![PyPi version](https://badgen.net/pypi/v/openstack-image-manager/)](https://pypi.org/project/openstack-image-manager/)
 [![PyPi license](https://badgen.net/pypi/license/openstack-image-manager/)](https://pypi.org/project/openstack-image-manager/)
-[![Documentation](https://img.shields.io/static/v1?label=&message=documentation&color=blue)](https://osism.github.io/docs/guides/operations-guide/openstack/day2-operations/image-manager)
+[![Documentation](https://img.shields.io/static/v1?label=&message=documentation&color=blue)](https://osism.tech/docs/guides/operations-guide/openstack/day2-operations/image-manager)
 
 Easily manage and keep up to date a large number of images on an OpenStack environment

openstack_image_manager-0.20240403.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+openstack_image_manager/__init__.py,sha256=z6lQHDMfCV8IkUz5pM1QYfQ37O2Rdy82jYovN8N9DIU,240
+openstack_image_manager/manage.py,sha256=gh8Cf5XAKTOCoKL8jMe-Q6V_d3pQryLc2b457OQLZPI,46764
+openstack_image_manager/mirror.py,sha256=_84-vAFfF1a3IuDBzluwTJWo20cyJEJaNIcxn3X87QI,4737
+openstack_image_manager/table.py,sha256=cZ6Xuqp8uh2V5_uzT4KwWoiLAUdvsPZkrPjOXdxFeU4,1080
+openstack_image_manager/update.py,sha256=MFx7wZ1kEQb4WXYfvdjgSCeyXflkJqbBBx-4z8pQQ4Y,11057
+openstack_image_manager-0.20240403.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+openstack_image_manager-0.20240403.0.dist-info/METADATA,sha256=yydaIZqhbmwnh_HU0b6LRrouNba065I5W-1PueTV2NU,14871
+openstack_image_manager-0.20240403.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+openstack_image_manager-0.20240403.0.dist-info/entry_points.txt,sha256=AEHPHHHZ3jAZfpvaI5ZzLi3DHb9vGQwL7TJcw_G_5nc,80
+openstack_image_manager-0.20240403.0.dist-info/top_level.txt,sha256=iLfREddId51T97Dr9IGRQtJXKJgVy1PB6uHCaQk1j44,24
+openstack_image_manager-0.20240403.0.dist-info/RECORD,,

openstack_image_manager-0.20240318.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-openstack_image_manager/__init__.py,sha256=z6lQHDMfCV8IkUz5pM1QYfQ37O2Rdy82jYovN8N9DIU,240
-openstack_image_manager/manage.py,sha256=biCPWdV5-_4rI_6DtieOWe_HXrcnWP67hs1RzwnOdts,47688
-openstack_image_manager/mirror.py,sha256=_84-vAFfF1a3IuDBzluwTJWo20cyJEJaNIcxn3X87QI,4737
-openstack_image_manager/table.py,sha256=cZ6Xuqp8uh2V5_uzT4KwWoiLAUdvsPZkrPjOXdxFeU4,1080
-openstack_image_manager/update.py,sha256=RBH47LjWsWVKaYVwBxlDviSSZY6RxUyUQdrwtKG5bKs,10545
-openstack_image_manager-0.20240318.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-openstack_image_manager-0.20240318.0.dist-info/METADATA,sha256=IEeNJuQY-DBWauuhBsj2CZzHGRWHLbGg4LeU6X_Ua1g,14875
-openstack_image_manager-0.20240318.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-openstack_image_manager-0.20240318.0.dist-info/entry_points.txt,sha256=AEHPHHHZ3jAZfpvaI5ZzLi3DHb9vGQwL7TJcw_G_5nc,80
-openstack_image_manager-0.20240318.0.dist-info/top_level.txt,sha256=iLfREddId51T97Dr9IGRQtJXKJgVy1PB6uHCaQk1j44,24
-openstack_image_manager-0.20240318.0.dist-info/RECORD,,