openstack-image-manager 0.20240318.0__py3-none-any.whl → 0.20240327.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
@@ -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
 
@@ -461,7 +462,7 @@ class ImageManager:
                     )
         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
 

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]
@@ -241,12 +241,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.20240327.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openstack-image-manager
-Version: 0.20240318.0
+Version: 0.20240327.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.11.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.20240327.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+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.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,,