From 9943c931f8913d9cf3ea20d4d2c91f5a4b4d001d Mon Sep 17 00:00:00 2001 From: "Mitch Harding (the weird one)" Date: Wed, 9 Oct 2024 15:55:29 -0400 Subject: [PATCH] If an image artifact lacks boot_parameters, log this as informational instead of a warning --- CHANGELOG.md | 4 ++++ src/bos/server/controllers/v2/boot_set/artifacts.py | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a4ebeb1..63dd242b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [2.30.2] - 2024-10-09 +### Changed +- If an image artifact lacks `boot_parameters`, log this as informational instead of a warning. + ## [2.30.1] - 2024-10-09 ### Fixed - Fix bug in sessions controller, attempting >= comparison with enumerated types. diff --git a/src/bos/server/controllers/v2/boot_set/artifacts.py b/src/bos/server/controllers/v2/boot_set/artifacts.py index b21a411d..087b850e 100644 --- a/src/bos/server/controllers/v2/boot_set/artifacts.py +++ b/src/bos/server/controllers/v2/boot_set/artifacts.py @@ -26,6 +26,7 @@ from bos.operators.utils.boot_image_metadata.factory import BootImageMetaDataFactory from bos.operators.utils.clients.s3 import S3Object, ArtifactNotFound +from .defs import LOGGER from .exceptions import BootSetError, BootSetWarning @@ -59,8 +60,11 @@ def validate_boot_artifacts(bs: dict): obj = S3Object(path, etag) _ = obj.object_header except ArtifactNotFound as err: - raise BootSetWarning( - f"{image_metadata.manifest_s3_url.url} doesn't contain a {boot_artifact}") from err + msg = f"{image_metadata.manifest_s3_url.url} doesn't contain a {boot_artifact}" + # Plenty of images lack boot_parameters, and this is not a big deal. + if boot_artifact != "boot_parameters": + raise BootSetWarning(msg) from err + LOGGER.info(msg) except Exception as err: raise BootSetWarning( f"Unable to check {boot_artifact} in {image_metadata.manifest_s3_url.url}. "