openstack-image-manager 0.20240812.0__tar.gz → 0.20240829.0__tar.gz

{openstack_image_manager-0.20240812.0/openstack_image_manager.egg-info → openstack_image_manager-0.20240829.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openstack-image-manager
-Version: 0.20240812.0
+Version: 0.20240829.0
 Summary: OpenStack image manager
 Author-email: OSISM community <info@osism.tech>
 License:                                  Apache License
@@ -223,16 +223,16 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: loguru==0.7.2
-Requires-Dist: minio==7.2.7
+Requires-Dist: minio==7.2.8
 Requires-Dist: munch==4.0.0
 Requires-Dist: natsort==8.4.0
 Requires-Dist: openstacksdk==3.3.0
 Requires-Dist: paramiko==3.4.1
-Requires-Dist: patool==2.3.0
+Requires-Dist: patool==2.4.0
 Requires-Dist: requests==2.32.3
 Requires-Dist: ruamel.yaml==0.18.6
 Requires-Dist: tabulate==0.9.0
-Requires-Dist: typer[all]==0.12.3
+Requires-Dist: typer[all]==0.12.5
 Requires-Dist: yamale==5.2.1
 
 # openstack-image-manager

{openstack_image_manager-0.20240812.0 → openstack_image_manager-0.20240829.0}/etc/images/gardenlinux.yml

@@ -33,3 +33,13 @@ images:
         mirror_url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/gardenlinux/1443.10/openstack-gardener_prod-amd64-1443.10-8d098305.qcow2
         checksum: "sha256:fb85ca67608638167b876df2988f927815c00c4a4b3e6d11d20565aa55b0f268"
         build_date: 2024-07-23
+      - version: '1592.0'
+        url: https://github.com/gardenlinux/gardenlinux/releases/download/1592.0/openstack-gardener_prod-amd64-1592.0-0cc2b85d.tar.xz
+        mirror_url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/gardenlinux/1592.0/openstack-gardener_prod-amd64-1592.0-0cc2b85d.qcow2
+        checksum: "sha256:43fbd3af61b6c531bb32fb4b74a09371c538839e3afab6ca7fe023e854c40e67"
+        build_date: 2024-08-12
+      - version: '1592.1'
+        url: https://github.com/gardenlinux/gardenlinux/releases/download/1592.1/openstack-gardener_prod-amd64-1592.1-ec945aa9.tar.xz
+        mirror_url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/gardenlinux/1592.1/openstack-gardener_prod-amd64-1592.1-ec945aa9.qcow2
+        checksum: "sha256:990f4843f4bb08dd5972710fb8909d4b3d34d53d1adecbec477f8c2e6bbc0db4"
+        build_date: 2024-08-22

{openstack_image_manager-0.20240812.0 → openstack_image_manager-0.20240829.0}/etc/schema.yaml

@@ -17,6 +17,7 @@ image:
   password: str(required=False)
   shortname: str(required=False)
   status: enum('active', 'deactivated')
+  separator: str(required=False)
   tags: list(str())
   versions: list(include('versions'))
   visibility: enum('public', 'private', 'community', 'shared')

{openstack_image_manager-0.20240812.0 → openstack_image_manager-0.20240829.0}/openstack_image_manager/main.py

@@ -12,6 +12,7 @@ import typing
 from typing import Dict, Set
 import yamale
 import urllib.parse
+import pkgutil
 
 from datetime import datetime, date
 from decimal import Decimal, ROUND_UP
@@ -92,9 +93,14 @@ class ImageManager:
             "project", "--share-type", help="Share - Type: 'project' or 'domain'"
         ),
         check: bool = typer.Option(
+            True,
+            "--check/--no-check",
+            help="Check the local image definitions against the SCS Image Metadata Standard (and process the images)",
+        ),
+        check_only: bool = typer.Option(
             False,
-            "--check",
-            help="Check the local image definitions against the SCS Image Metadata Standard",
+            "--check-only",
+            help="Quit after checking the image definitions against the SCS Image Metadata Standard",
         ),
     ):
         self.CONF = Munch.fromDict(locals())
@@ -209,11 +215,14 @@ class ImageManager:
         )
 
         # check local image definitions with yamale
-        if self.CONF.check:
+        if self.CONF.check or self.CONF.check_only:
             self.validate_yaml_schema()
 
+        if self.CONF.check_only:
+            return
+
         # share image (previously share.py)
-        elif self.CONF.share_image:
+        if self.CONF.share_image:
             self.create_connection()
             image = self.conn.get_image(self.CONF.share_image)
 
@@ -355,6 +364,9 @@ class ImageManager:
             if "image_description" not in image["meta"]:
                 image["meta"]["image_description"] = image["name"]
 
+            if "image_name" not in image["meta"]:
+                image["meta"]["image_name"] = image["name"]
+
             existing_images, imported_image, previous_image = self.process_image(
                 image, versions, sorted_versions, image["meta"].copy()
             )
@@ -362,7 +374,7 @@ class ImageManager:
 
             if imported_image and image["multi"]:
                 self.rename_images(
-                    image["name"], sorted_versions, imported_image, previous_image
+                    image, sorted_versions, imported_image, previous_image
                 )
 
         return managed_images
@@ -511,11 +523,14 @@ class ImageManager:
         previous_image = None
         upstream_checksum = ""
 
+        separator = image.get("separator", " ")
+        image_name = image["name"]
+
         for version in sorted_versions:
             if image["multi"]:
-                name = f"{image['name']} ({version})"
+                name = f"{image_name}{separator}({version})"
             else:
-                name = f"{image['name']} {version}"
+                name = f"{image_name}{separator}{version}"
 
             logger.info(f"Processing image '{name}'")
             logger.debug(f"Checking existence of '{name}'")
@@ -550,7 +565,7 @@ class ImageManager:
                 and version == sorted_versions[-1]
                 and not existence
             ):
-                previous = f"{image['name']} ({sorted_versions[-2]})"
+                previous = f"{image['name']}{separator}({sorted_versions[-2]})"
                 existence = previous in cloud_images and image["name"] in cloud_images
 
             elif (
@@ -825,7 +840,7 @@ class ImageManager:
 
     def rename_images(
         self,
-        name: str,
+        image: dict,
         sorted_versions: list,
         imported_image: Image,
         previous_image: Image,
@@ -834,16 +849,18 @@ class ImageManager:
         Rename outdated images in Glance (only applies to images of type multi)
 
         Params:
-            name: the name of the image from images.yml
+            image: image dict from images.yml
             sorted_versions: list with all sorted image versions
             imported_image: the newly imported image
             previous_image: the previous latest image
         """
+        name = image["name"]
+        separator = image.get("separator", " ")
         cloud_images = self.get_images()
 
         if len(sorted_versions) > 1:
-            latest = f"{name} ({sorted_versions[-1]})"
-            previous_latest = f"{name} ({sorted_versions[-2]})"
+            latest = f"{name}{separator}({sorted_versions[-1]})"
+            previous_latest = f"{name}{separator}({sorted_versions[-2]})"
 
             if name in cloud_images and previous_latest not in cloud_images:
                 logger.info(f"Renaming {name} to {previous_latest}")
@@ -865,7 +882,7 @@ class ImageManager:
                 )
                 create_date = create_date.replace("-", "")
 
-                previous_latest = f"{name} ({create_date})"
+                previous_latest = f"{name}{separator}({create_date})"
 
                 logger.info(
                     f"Setting internal_version: {create_date} for {previous_latest}"
@@ -874,9 +891,7 @@ class ImageManager:
                     previous_image.id, **{"internal_version": create_date}
                 )
             else:
-                previous_latest = (
-                    f"{name} ({previous_image['properties']['internal_version']})"
-                )
+                previous_latest = f"{name}{separator}({previous_image['properties']['internal_version']})"
 
             logger.info(f"Renaming old latest '{name}' to '{previous_latest}'")
             self.conn.image.update_image(previous_image.id, name=previous_latest)
@@ -885,7 +900,7 @@ class ImageManager:
             self.conn.image.update_image(imported_image.id, name=name)
 
         elif len(sorted_versions) == 1:
-            latest = f"{name} ({sorted_versions[-1]})"
+            latest = f"{name}{separator}({sorted_versions[-1]})"
 
             if latest in cloud_images:
                 logger.info(f"Renaming {latest} to {name}")
@@ -1100,25 +1115,37 @@ class ImageManager:
 
     def validate_yaml_schema(self):
         """Validate all image.yaml files against the SCS Metadata spec"""
-        schema = yamale.make_schema("etc/schema.yaml")
         try:
+            # We are a pip package
+            schema_data = pkgutil.get_data(__name__, "etc/schema.yaml").decode("utf-8")
+            schema = yamale.make_schema(content=schema_data)
+        except Exception:
+            # We are a cloned repo
+            schema = yamale.make_schema("etc/schema.yaml")
+        try:
+            validation_error_log = []
             for file in os.listdir(self.CONF.images):
                 try:
                     data = yamale.make_data(self.CONF.images + file)
                     yamale.validate(schema, data)
                 except YamaleError as e:
-                    self.exit_with_error = True
                     for result in e.results:
                         logger.error(
                             f"Error validating data '{result.data}' with '{result.schema}'"
                         )
                         for error in result.errors:
                             logger.error(f"\t{error}")
+                            validation_error_log.append((file, error))
                 else:
                     logger.debug(f"Image file {file} is valid")
         except FileNotFoundError:
             logger.error(f"Invalid path '{self.CONF.images}'")
 
+        if len(validation_error_log) > 0:
+            sys.exit(
+                f"Image definition validation failed with these error(s): {validation_error_log}"
+            )
+
     def share_image_with_project(self, image, project):
         member = self.conn.image.find_member(project.id, image.id)
 

{openstack_image_manager-0.20240812.0 → openstack_image_manager-0.20240829.0/openstack_image_manager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openstack-image-manager
-Version: 0.20240812.0
+Version: 0.20240829.0
 Summary: OpenStack image manager
 Author-email: OSISM community <info@osism.tech>
 License:                                  Apache License
@@ -223,16 +223,16 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: loguru==0.7.2
-Requires-Dist: minio==7.2.7
+Requires-Dist: minio==7.2.8
 Requires-Dist: munch==4.0.0
 Requires-Dist: natsort==8.4.0
 Requires-Dist: openstacksdk==3.3.0
 Requires-Dist: paramiko==3.4.1
-Requires-Dist: patool==2.3.0
+Requires-Dist: patool==2.4.0
 Requires-Dist: requests==2.32.3
 Requires-Dist: ruamel.yaml==0.18.6
 Requires-Dist: tabulate==0.9.0
-Requires-Dist: typer[all]==0.12.3
+Requires-Dist: typer[all]==0.12.5
 Requires-Dist: yamale==5.2.1
 
 # openstack-image-manager

{openstack_image_manager-0.20240812.0 → openstack_image_manager-0.20240829.0}/openstack_image_manager.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ MANIFEST.in
 README.md
 pyproject.toml
 requirements.txt
+etc/__init__.py
 etc/schema.yaml
 etc/images/almalinux.yml
 etc/images/centos.yml

{openstack_image_manager-0.20240812.0 → openstack_image_manager-0.20240829.0}/openstack_image_manager.egg-info/requires.txt

@@ -1,12 +1,12 @@
 loguru==0.7.2
-minio==7.2.7
+minio==7.2.8
 munch==4.0.0
 natsort==8.4.0
 openstacksdk==3.3.0
 paramiko==3.4.1
-patool==2.3.0
+patool==2.4.0
 requests==2.32.3
 ruamel.yaml==0.18.6
 tabulate==0.9.0
-typer[all]==0.12.3
+typer[all]==0.12.5
 yamale==5.2.1

{openstack_image_manager-0.20240812.0 → openstack_image_manager-0.20240829.0}/pyproject.toml

@@ -30,12 +30,15 @@ dynamic = ["dependencies", "version"]
 [tool.mypy]
 exclude = ["doc"]
 
+[tool.setuptools]
+packages = ["openstack_image_manager", "openstack_image_manager.etc"]
+package-dir = {"openstack_image_manager.etc" = "etc"}
+
 [tool.setuptools.dynamic]
 dependencies = {file = ["requirements.txt"]}
 
-[tool.setuptools.packages.find]
-where = ["."]
-include = ["openstack_image_manager"]
+[tool.setuptools.package-data]
+"openstack_image_manager.etc" = ["**/*"]
 
 [tool.setuptools-git-versioning]
 enabled = true

{openstack_image_manager-0.20240812.0 → openstack_image_manager-0.20240829.0}/requirements.txt

@@ -1,12 +1,12 @@
 loguru==0.7.2
-minio==7.2.7
+minio==7.2.8
 munch==4.0.0
 natsort==8.4.0
 openstacksdk==3.3.0
 paramiko==3.4.1
-patool==2.3.0
+patool==2.4.0
 requests==2.32.3
 ruamel.yaml==0.18.6
 tabulate==0.9.0
-typer[all]==0.12.3
+typer[all]==0.12.5
 yamale==5.2.1