openstack-image-manager 0.20240327.0__py3-none-any.whl → 0.20240411.0__py3-none-any.whl

openstack_image_manager/{manage.py → main.py}

@@ -203,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
@@ -281,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()
@@ -332,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:
@@ -353,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"]
@@ -383,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",
@@ -404,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:
@@ -436,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}):
@@ -452,13 +446,11 @@ 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
 
@@ -483,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:
@@ -498,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(
@@ -526,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":
@@ -554,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 (
@@ -564,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 (
@@ -585,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
 
@@ -597,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
@@ -620,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
@@ -629,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
@@ -648,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)
@@ -660,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"]:
@@ -698,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(
@@ -709,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"])}
@@ -719,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"])}
@@ -735,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"]}
                     )
@@ -757,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:
@@ -787,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]:
@@ -804,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])}
@@ -817,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(
@@ -869,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:
@@ -892,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:
@@ -1065,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"
                         )
@@ -1077,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 (
@@ -1104,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(
@@ -1121,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
 
@@ -1142,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-0.20240327.0.dist-info → openstack_image_manager-0.20240411.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openstack-image-manager
-Version: 0.20240327.0
+Version: 0.20240411.0
 Summary: OpenStack image manager
 Author-email: OSISM community <info@osism.tech>
 License: Apache License
@@ -232,7 +232,7 @@ 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.11.0
+Requires-Dist: typer[all] ==0.12.3
 Requires-Dist: yamale ==5.1.0
 
 # openstack-image-manager

openstack_image_manager-0.20240411.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+openstack_image_manager/__init__.py,sha256=z6lQHDMfCV8IkUz5pM1QYfQ37O2Rdy82jYovN8N9DIU,240
+openstack_image_manager/main.py,sha256=gh8Cf5XAKTOCoKL8jMe-Q6V_d3pQryLc2b457OQLZPI,46764
+openstack_image_manager-0.20240411.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+openstack_image_manager-0.20240411.0.dist-info/METADATA,sha256=UkQZX6SI8bbZtJS5LfGOQzCee1DufFyR4sNzGRR5vtY,14871
+openstack_image_manager-0.20240411.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+openstack_image_manager-0.20240411.0.dist-info/entry_points.txt,sha256=IrOGjHJbCa6-jmCQiqiKFqHeVvjGa1p25s2mLkt0da8,78
+openstack_image_manager-0.20240411.0.dist-info/top_level.txt,sha256=iLfREddId51T97Dr9IGRQtJXKJgVy1PB6uHCaQk1j44,24
+openstack_image_manager-0.20240411.0.dist-info/RECORD,,

openstack_image_manager-0.20240411.0.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+openstack-image-manager = openstack_image_manager.main:main

openstack_image_manager/mirror.py

@@ -1,144 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-import os
-import patoolib
-import requests
-import shutil
-import sys
-import typer
-import yaml
-
-from loguru import logger
-from minio import Minio
-from minio.error import S3Error
-from os import listdir
-from os.path import isfile, join
-from urllib.parse import urlparse
-
-
-app = typer.Typer(add_completion=False)
-
-
-@app.command()
-def main(
-    debug: bool = typer.Option(False, "--debug", help="Enable debug logging"),
-    dry_run: bool = typer.Option(False, "--dry-run", help="Do not perform any changes"),
-    images: str = typer.Option(
-        "etc/images/", help="Path to the directory containing all image files"
-    ),
-    minio_access_key: str = typer.Option(
-        None, help="Minio access key", envvar="MINIO_ACCESS_KEY"
-    ),
-    minio_secret_key: str = typer.Option(
-        None, help="Minio secret key", envvar="MINIO_SECRET_KEY"
-    ),
-    minio_server: str = typer.Option(
-        "swift.services.a.regiocloud.tech", help="Minio server"
-    ),
-    minio_bucket: str = typer.Option("openstack-images", help="Minio bucket"),
-):
-    if debug:
-        level = "DEBUG"
-    else:
-        level = "INFO"
-
-    log_fmt = (
-        "<green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level: <8}</level> | "
-        "<level>{message}</level>"
-    )
-
-    logger.remove()
-    logger.add(sys.stderr, format=log_fmt, level=level, colorize=True)
-
-    client = Minio(
-        minio_server,
-        access_key=minio_access_key,
-        secret_key=minio_secret_key,
-    )
-
-    result = client.bucket_exists(minio_bucket)
-    if not result:
-        logger.error(f"Create bucket '{minio_bucket}' first")
-        if not dry_run:
-            sys.exit(1)
-
-    onlyfiles = []
-    for f in listdir(images):
-        if isfile(join(images, f)):
-            logger.debug(f"Adding {f} to the list of files")
-            onlyfiles.append(f)
-
-    all_images = []
-    for file in [x for x in onlyfiles if x.endswith(".yml")]:
-        logger.info(f"Processing file {file}")
-        with open(join(images, file)) as fp:
-            data = yaml.load(fp, Loader=yaml.SafeLoader)
-            for image in data.get("images"):
-                logger.debug(f"Adding {image['name']} to the list of images")
-                all_images.append(image)
-
-    for image in all_images:
-        logger.info(f"Processing image {image['name']}")
-
-        if "versions" not in image:
-            continue
-
-        for version in image["versions"]:
-            if "source" not in version:
-                continue
-            else:
-                source = version["source"]
-
-            logger.debug(f"source: {source}")
-
-            path = urlparse(source)
-            url = urlparse(version["url"])
-
-            dirname = f"{image['shortname']}/{version['version']}"
-            filename, fileextension = os.path.splitext(os.path.basename(path.path))
-            _, fileextension2 = os.path.splitext(filename)
-
-            if fileextension not in [".bz2", ".zip", ".xz", ".gz"]:
-                filename += fileextension
-
-            if fileextension2 == ".tar":
-                filename = os.path.basename(url.path)
-
-            logger.debug(f"dirname: {dirname}")
-            logger.debug(f"filename: {filename}")
-
-            try:
-                client.stat_object(minio_bucket, os.path.join(dirname, filename))
-                logger.info(f"File {filename} available in bucket {dirname}")
-            except S3Error:
-                logger.info(f"File {filename} not yet available in bucket {dirname}")
-
-                if not isfile(os.path.basename(path.path)):
-                    logger.info(f"Downloading {version['source']}")
-                    response = requests.get(
-                        version["source"], stream=True, allow_redirects=True
-                    )
-                    with open(os.path.basename(path.path), "wb") as fp:
-                        shutil.copyfileobj(response.raw, fp)
-                    del response
-
-                if fileextension in [".bz2", ".zip", ".xz", ".gz"]:
-                    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))
-
-                if not dry_run:
-                    logger.info(f"Uploading {filename} to bucket {dirname}")
-                    client.fput_object(
-                        minio_bucket, os.path.join(dirname, filename), filename
-                    )
-                else:
-                    logger.info(
-                        f"Not uploading {filename} to bucket {dirname} (dry-run enabled)"
-                    )
-
-                os.remove(filename)
-
-
-if __name__ == "__main__":
-    app()

openstack_image_manager/table.py

@@ -1,47 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-import tabulate
-import typer
-import yaml
-
-from munch import Munch
-from os import listdir
-from os.path import isfile, join
-
-
-app = typer.Typer(add_completion=False)
-
-
-@app.command()
-def main(
-    images: str = typer.Option(
-        "etc/images/", help="Path to the directory containing all image files"
-    )
-):
-    CONF = Munch.fromDict(locals())
-
-    onlyfiles = []
-    for f in listdir(CONF.images):
-        if isfile(join(CONF.images, f)):
-            onlyfiles.append(f)
-
-    all_images = []
-    for file in onlyfiles:
-        with open(join(CONF.images, file)) as fp:
-            data = yaml.load(fp, Loader=yaml.SafeLoader)
-            imgs = data.get("images")
-            for image in imgs:
-                all_images.append(image)
-
-    data = []
-    for image in all_images:
-        data.append([image["name"], image["login"], image.get("password", "")])
-
-    result = tabulate.tabulate(
-        sorted(data), headers=["Name", "Login user", "Password"], tablefmt="rst"
-    )
-    print(result)
-
-
-if __name__ == "__main__":
-    app()

openstack_image_manager/update.py

@@ -1,343 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-# source of latest URLs: https://gitlab.com/libosinfo/osinfo-db
-
-from datetime import datetime
-import os
-import re
-import shutil
-import sys
-from urllib.parse import urlparse
-from urllib.request import urlopen
-
-from loguru import logger
-from minio import Minio
-from minio.error import S3Error
-from natsort import natsorted
-import patoolib
-import requests
-import ruamel.yaml
-import typer
-
-app = typer.Typer()
-DEBUBU_REGEX = r'<a href="([^"]+)/">(?:release-)?([0-9]+)(\-[0-9]+)?/</a>'
-
-
-def get_latest_default(
-    shortname, latest_checksum_url, latest_url, checksum_type="sha256"
-):
-    result = requests.get(latest_checksum_url)
-    result.raise_for_status()
-
-    latest_filename = os.path.basename(urlparse(latest_url).path)
-    filename_pattern = None
-    if shortname in ["centos-stream-8", "centos-stream-9", "centos-7"]:
-        filename_pattern = latest_filename.replace("HEREBE", "")
-        filename_pattern = filename_pattern.replace("DRAGONS", "")
-
-    checksums = {}
-    for line in result.text.split("\n"):
-        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]
-        elif shortname in ["centos-7"]:
-            if len(cs) == 2 and re.search(filename_pattern, cs[1]):
-                checksums[cs[1]] = cs[0]
-        elif shortname in ["centos-stream-8", "centos-stream-9"]:
-            if (
-                len(cs) == 4
-                and cs[0] == "SHA256"
-                and re.search(filename_pattern, cs[1][1:-1])
-            ):
-                checksums[cs[1][1:-1]] = cs[3]
-        else:
-            if len(cs) == 2:
-                checksums[cs[1]] = cs[0]
-
-    if filename_pattern:
-        new_latest_filename = natsorted(checksums.keys())[-1]
-        new_latest_url = latest_url.replace(latest_filename, new_latest_filename)
-
-        logger.info(f"Latest URL is now {new_latest_url}")
-        logger.info(f"Latest filename is now {new_latest_filename}")
-
-        latest_filename = new_latest_filename
-        latest_url = new_latest_url
-
-    current_checksum = f"{checksum_type}:{checksums[latest_filename]}"
-    return current_checksum, latest_url, None
-
-
-def resolve_debubu(base_url, rex=re.compile(DEBUBU_REGEX)):
-    result = requests.get(base_url)
-    result.raise_for_status()
-    latest_folder, latest_date, latest_build = sorted(rex.findall(result.text))[-1]
-    return latest_folder, latest_date, latest_build
-
-
-def get_latest_debubu(shortname, latest_checksum_url, latest_url, checksum_type=None):
-    base_url, _, filename = latest_url.rsplit("/", 2)
-    latest_folder, latest_date, latest_build = resolve_debubu(base_url)
-    current_base_url = f"{base_url}/{latest_folder}"
-    current_checksum_url = (
-        f"{current_base_url}/{latest_checksum_url.rsplit('/', 1)[-1]}"
-    )
-    result = requests.get(current_checksum_url)
-    result.raise_for_status()
-    current_checksum = None
-    current_filename = filename
-    if latest_build:  # Debian includes date-build in file name
-        fn_pre, fn_suf = filename.rsplit(".", 1)
-        current_filename = f"{fn_pre}-{latest_date}{latest_build}.{fn_suf}"
-    for line in result.text.splitlines():
-        cs = line.split()
-        if len(cs) != 2:
-            continue
-        if cs[1].startswith("*"):  # Ubuntu has the asterisk in front of the name
-            cs[1] = cs[1][1:]
-        if cs[1] != current_filename:
-            continue
-        if checksum_type is None:  # use heuristics to distinguish sha256/sha512
-            checksum_type = "sha256" if len(cs[0]) == 64 else "sha512"
-        current_checksum = f"{checksum_type}:{cs[0]}"
-        break
-    if current_checksum is None:
-        raise RuntimeError(
-            f"{current_checksum_url} does not contain {current_filename}"
-        )
-    current_url = f"{current_base_url}/{current_filename}"
-    return current_checksum, current_url, latest_date
-
-
-IMAGES = {
-    "almalinux": get_latest_default,
-    "centos": get_latest_default,
-    "debian": get_latest_debubu,
-    "rockylinux": get_latest_default,
-    "ubuntu": get_latest_debubu,
-}
-
-
-def mirror_image(
-    image, latest_url, minio_server, minio_bucket, minio_access_key, minio_secret_key
-):
-    client = Minio(
-        minio_server,
-        access_key=minio_access_key,
-        secret_key=minio_secret_key,
-    )
-
-    result = client.bucket_exists(minio_bucket)
-    if not result:
-        logger.error(f"Create bucket '{minio_bucket}' first")
-        return
-
-    version = image["versions"][0]
-
-    path = urlparse(version["url"])
-    dirname = image["shortname"]
-    filename, fileextension = os.path.splitext(os.path.basename(path.path))
-
-    if fileextension not in [".bz2", ".zip", ".xz", ".gz"]:
-        filename += fileextension
-
-    shortname = image["shortname"]
-    format = image["format"]
-    new_version = version["version"]
-    new_filename = f"{new_version}-{shortname}.{format}"
-
-    try:
-        client.stat_object(minio_bucket, os.path.join(dirname, new_filename))
-        logger.info("'%s' available in '%s'" % (new_filename, dirname))
-    except S3Error:
-        logger.info("'%s' not yet available in '%s'" % (new_filename, dirname))
-        logger.info("Downloading '%s'" % latest_url)
-
-        response = requests.get(latest_url, stream=True)
-        with open(os.path.basename(path.path), "wb") as fp:
-            shutil.copyfileobj(response.raw, fp)
-        del response
-
-        if fileextension in [".bz2", ".zip", ".xz", ".gz"]:
-            logger.info("Decompressing '%s'" % 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)
-        )
-
-        client.fput_object(minio_bucket, os.path.join(dirname, new_filename), filename)
-        os.remove(filename)
-
-
-def update_image(
-    image,
-    getter,
-    minio_server,
-    minio_bucket,
-    minio_access_key,
-    minio_secret_key,
-    dry_run=False,
-    swift_prefix="",
-):
-    name = image["name"]
-    logger.info(f"Checking image {name}")
-
-    latest_url = image["latest_url"]
-    logger.info(f"Latest download URL is {latest_url}")
-
-    latest_checksum_url = image["latest_checksum_url"]
-    logger.info(f"Getting checksums from {latest_checksum_url}")
-
-    shortname = image["shortname"]
-    current_checksum, current_url, current_version = getter(
-        shortname, latest_checksum_url, latest_url
-    )
-
-    logger.info(
-        f"Checksum of current {current_url.rsplit('/', 1)[-1]} is {current_checksum}"
-    )
-
-    if not image["versions"]:
-        logger.info("No image available so far")
-        image["versions"].append(
-            {
-                "build_date": None,
-                "checksum": None,
-                "url": None,
-                "version": None,
-            }
-        )
-
-    latest_checksum = image["versions"][0]["checksum"]
-    logger.info(f"Our checksum is {latest_checksum}")
-
-    if latest_checksum == current_checksum:
-        logger.info(f"Image {name} is up-to-date, nothing to do")
-        return 0
-
-    if current_version is None:
-        logger.info(f"Checking {current_url}")
-
-        conn = urlopen(current_url, timeout=30)
-        dt = datetime.strptime(
-            conn.headers["last-modified"], "%a, %d %b %Y %H:%M:%S %Z"
-        )
-        current_version = dt.strftime("%Y%m%d")
-
-    new_values = {
-        "version": current_version,
-        "build_date": datetime.strptime(current_version, "%Y%m%d").date(),
-        "checksum": current_checksum,
-        "url": current_url,
-    }
-    logger.info(f"New values are {new_values}")
-    image["versions"][0].update(new_values)
-
-    shortname = image["shortname"]
-    format = image["format"]
-
-    minio_server = str(minio_server)
-    minio_bucket = str(minio_bucket)
-    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 {mirror_url}, dry-run enabled")
-    else:
-        mirror_image(
-            image,
-            current_url,
-            minio_server,
-            minio_bucket,
-            minio_access_key,
-            minio_secret_key,
-        )
-    return 1
-
-
-@app.command()
-def main(
-    debug: bool = typer.Option(False, "--debug", help="Enable debug logging"),
-    dry_run: bool = typer.Option(False, "--dry-run", help="Do not perform any changes"),
-    minio_access_key: str = typer.Option(
-        None, help="Minio access key", envvar="MINIO_ACCESS_KEY"
-    ),
-    minio_secret_key: str = typer.Option(
-        None, help="Minio secret key", envvar="MINIO_SECRET_KEY"
-    ),
-    minio_server: str = typer.Option(
-        "swift.services.a.regiocloud.tech", help="Minio server", envvar="MINIO_SERVER"
-    ),
-    minio_bucket: str = typer.Option(
-        "openstack-images", help="Minio bucket", envvar="MINIO_BUCKET"
-    ),
-    swift_prefix: str = typer.Option(
-        "swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/",
-        help="Swift prefix",
-        envvar="SWIFT_PREFIX",
-    ),
-):
-    if debug:
-        level = "DEBUG"
-    else:
-        level = "INFO"
-
-    logger.remove()  # remove the default sink
-    log_fmt = (
-        "<green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level: <8}</level> | "
-        "<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>"
-    )
-    logger.add(sys.stderr, format=log_fmt, level=level, colorize=True)
-
-    for image, getter in IMAGES.items():
-        p = f"etc/images/{image}.yml"
-        logger.info(f"Processing file {p}")
-
-        ryaml = ruamel.yaml.YAML()
-        with open(p) as fp:
-            data = ryaml.load(fp)
-
-        updates = 0
-        for index, image in enumerate(data["images"]):
-            if "latest_url" not in image:
-                continue
-
-            updates += update_image(
-                image,
-                getter,
-                minio_server,
-                minio_bucket,
-                minio_access_key,
-                minio_secret_key,
-                dry_run,
-                swift_prefix,
-            )
-
-        if not updates:
-            continue
-
-        with open(p, "w+") as fp:
-            ryaml.explicit_start = True
-            ryaml.indent(sequence=4, offset=2)
-            ryaml.dump(data, fp)
-
-
-if __name__ == "__main__":
-    app()

openstack_image_manager-0.20240327.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-openstack_image_manager/__init__.py,sha256=z6lQHDMfCV8IkUz5pM1QYfQ37O2Rdy82jYovN8N9DIU,240
-openstack_image_manager/manage.py,sha256=zEspJ8vKHg3xT2trKOmf1fCUsIMlJFxXU1BeOt-At-E,47728
-openstack_image_manager/mirror.py,sha256=_84-vAFfF1a3IuDBzluwTJWo20cyJEJaNIcxn3X87QI,4737
-openstack_image_manager/table.py,sha256=cZ6Xuqp8uh2V5_uzT4KwWoiLAUdvsPZkrPjOXdxFeU4,1080
-openstack_image_manager/update.py,sha256=kSEG3HJPAtazIy9S2uEuLOZq4VDOpZifeO8OngClcK0,11103
-openstack_image_manager-0.20240327.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-openstack_image_manager-0.20240327.0.dist-info/METADATA,sha256=zg24GictICQvJaQm_BuP6llALIY4s-8ri_kW03Pb6cU,14871
-openstack_image_manager-0.20240327.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-openstack_image_manager-0.20240327.0.dist-info/entry_points.txt,sha256=AEHPHHHZ3jAZfpvaI5ZzLi3DHb9vGQwL7TJcw_G_5nc,80
-openstack_image_manager-0.20240327.0.dist-info/top_level.txt,sha256=iLfREddId51T97Dr9IGRQtJXKJgVy1PB6uHCaQk1j44,24
-openstack_image_manager-0.20240327.0.dist-info/RECORD,,

openstack_image_manager-0.20240327.0.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-openstack-image-manager = openstack_image_manager.manage:main