diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index ed4b6a42..5136ca34 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -4,7 +4,7 @@ description: Installs the given GardenLinux Python library inputs: version: description: GardenLinux Python library version - default: "0.10.14" + default: "0.10.15" python_version: description: Python version to setup default: "3.13" diff --git a/pyproject.toml b/pyproject.toml index 62bcce9a..aac67772 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gardenlinux" -version = "0.10.14" +version = "0.10.15" description = "Contains tools to work with the features directory of gardenlinux, for example deducting dependencies from feature sets or validating cnames" authors = ["Garden Linux Maintainers "] license = "Apache-2.0" diff --git a/src/gardenlinux/github/release_notes/deployment_platform/__init__.py b/src/gardenlinux/github/release_notes/deployment_platform/__init__.py index 0ed84069..4b5c9f33 100644 --- a/src/gardenlinux/github/release_notes/deployment_platform/__init__.py +++ b/src/gardenlinux/github/release_notes/deployment_platform/__init__.py @@ -15,7 +15,7 @@ def full_name(self) -> str: def published_images_by_regions( self, image_metadata: Dict[str, Any] ) -> Dict[str, Any]: - published_image_metadata = image_metadata["published_image_metadata"] + published_image_metadata = image_metadata.get("published_image_metadata", {}) flavor_name = image_metadata["s3_key"].split("/")[-1] regions = [] diff --git a/src/gardenlinux/github/release_notes/deployment_platform/amazon_web_services.py b/src/gardenlinux/github/release_notes/deployment_platform/amazon_web_services.py index 3ca061d7..5e7e9476 100644 --- a/src/gardenlinux/github/release_notes/deployment_platform/amazon_web_services.py +++ b/src/gardenlinux/github/release_notes/deployment_platform/amazon_web_services.py @@ -13,7 +13,7 @@ def full_name(self) -> str: def published_images_by_regions( self, image_metadata: Dict[str, Any] ) -> Dict[str, Any]: - published_image_metadata = image_metadata["published_image_metadata"] + published_image_metadata = image_metadata.get("published_image_metadata", {}) flavor_name = image_metadata["s3_key"].split("/")[-1] regions = [] diff --git a/src/gardenlinux/github/release_notes/deployment_platform/azure.py b/src/gardenlinux/github/release_notes/deployment_platform/azure.py index 4a0cae1f..a0a00a4b 100644 --- a/src/gardenlinux/github/release_notes/deployment_platform/azure.py +++ b/src/gardenlinux/github/release_notes/deployment_platform/azure.py @@ -16,7 +16,7 @@ def image_extension(self) -> str: def published_images_by_regions( self, image_metadata: Dict[str, Any] ) -> Dict[str, Any]: - published_image_metadata = image_metadata["published_image_metadata"] + published_image_metadata = image_metadata.get("published_image_metadata", {}) flavor_name = image_metadata["s3_key"].split("/")[-1] gallery_images = [] diff --git a/src/gardenlinux/github/release_notes/deployment_platform/google_cloud.py b/src/gardenlinux/github/release_notes/deployment_platform/google_cloud.py index e7b4034a..ff9b6383 100644 --- a/src/gardenlinux/github/release_notes/deployment_platform/google_cloud.py +++ b/src/gardenlinux/github/release_notes/deployment_platform/google_cloud.py @@ -17,7 +17,7 @@ def image_extension(self) -> str: def published_images_by_regions( self, image_metadata: Dict[str, Any] ) -> Dict[str, Any]: - published_image_metadata = image_metadata["published_image_metadata"] + published_image_metadata = image_metadata.get("published_image_metadata", {}) flavor_name = image_metadata["s3_key"].split("/")[-1] details = {} diff --git a/src/gardenlinux/github/release_notes/deployment_platform/openstack.py b/src/gardenlinux/github/release_notes/deployment_platform/openstack.py index 970fb508..61eafe76 100644 --- a/src/gardenlinux/github/release_notes/deployment_platform/openstack.py +++ b/src/gardenlinux/github/release_notes/deployment_platform/openstack.py @@ -14,7 +14,7 @@ def full_name(self) -> str: def published_images_by_regions( self, image_metadata: Dict[str, Any] ) -> Dict[str, Any]: - published_image_metadata = image_metadata["published_image_metadata"] + published_image_metadata = image_metadata.get("published_image_metadata", {}) flavor_name = image_metadata["s3_key"].split("/")[-1] regions = [] diff --git a/src/gardenlinux/github/release_notes/sections.py b/src/gardenlinux/github/release_notes/sections.py index a6af90aa..de3ad2b4 100644 --- a/src/gardenlinux/github/release_notes/sections.py +++ b/src/gardenlinux/github/release_notes/sections.py @@ -1,6 +1,7 @@ import logging import re import textwrap +from collections.abc import Mapping from typing import Any, Dict import requests @@ -262,9 +263,13 @@ def release_notes_image_ids_section(metadata_files: list[str]) -> str: with open(metadata_file_path) as f: metadata = yaml.load(f, Loader=SafeLoader) - published_image_metadata = metadata["published_image_metadata"] + published_image_metadata = metadata.get("published_image_metadata", {}) + # Skip if no publishing metadata found - if published_image_metadata is None: + if ( + not isinstance(published_image_metadata, Mapping) + or len(published_image_metadata) < 1 + ): continue platform = metadata["platform"]