Error handling corrections and small code cleanup of unused stuff (os…

…ism#658) fixes osism#657 Signed-off-by: Robin van der Linden <[email protected]>
gndrmnn · Sep 19, 2023 · 363448c · 363448c
1 parent 4aa9fca
commit 363448c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 23 deletions.
diff --git a/openstack_image_manager/manage.py b/openstack_image_manager/manage.py
@@ -17,7 +17,6 @@
 from natsort import natsorted
 from yamale import YamaleError
 from openstack.image.v2.image import Image
-from openstack.exceptions import DuplicateResource
 
 
 class ImageManager:
@@ -291,48 +290,48 @@ def process_images(self, images) -> set:
                 versions = dict()
                 for version in image["versions"]:
                     versions[str(version["version"])] = {"url": version["url"]}
+
                     if "mirror_url" in version:
-                        versions[version["version"]]["mirror_url"] = version[
-                            "mirror_url"
-                        ]
+                        versions[version["version"]]["mirror_url"] = version["mirror_url"]
+
                     if "visibility" in version:
-                        versions[version["version"]]["visibility"] = version[
-                            "visibility"
-                        ]
+                        versions[version["version"]]["visibility"] = version["visibility"]
+
                     if "os_version" in version:
-                        versions[version["version"]]["os_version"] = version[
-                            "os_version"
-                        ]
+                        versions[version["version"]]["os_version"] = version["os_version"]
+
                     if "hidden" in version:
                         versions[version["version"]]["hidden"] = version["hidden"]
-                    if version["version"] == "latest":
+
+                    if version["version"] == "latest":#
                         if "checksums_url" in version:
-                            versions[version["version"]]["checksums_url"] = version[
-                                "checksums_url"
-                            ]
+                            versions[version["version"]]["checksums_url"] = version["checksums_url"]
                         else:
-                            raise Exception()
+                            raise ValueError('Key "checksums_url" is required when using version "latest"')
+
                     if "meta" in version:
                         versions[version["version"]]["meta"] = version["meta"]
                     else:
                         versions[version["version"]]["meta"] = {}
+
                     if "url" in version:
                         url = version["url"]
                         # 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]
                         versions[version["version"]]["meta"]["image_source"] = url
+
                     if "build_date" in version:
-                        versions[version["version"]]["meta"][
-                            "image_build_date"
-                        ] = date.isoformat(version["build_date"])
+                        versions[version["version"]]["meta"]["image_build_date"] = date.isoformat(version["build_date"])
+
                     if "id" in version:
                         versions[version["version"]]["id"] = version["id"]
-            except Exception:
-                logger.error(
-                    'Key "checksums_url" is required when using version "latest"'
-                )
+            except ValueError as e:
+                logger.error(str(e))
+                continue
+            except Exception as e:
+                logger.error(f"An unexpected error occurred: {e}")
                 continue
 
             sorted_versions = natsorted(versions.keys())

diff --git a/openstack_image_manager/mirror.py b/openstack_image_manager/mirror.py
@@ -83,7 +83,6 @@ def main(
                 filename += fileextension
 
             if fileextension2 == ".tar":
-                filename2 = filename
                 filename = os.path.basename(url.path)
 
             logging.debug("dirname: %s" % dirname)