From 8a006afe8bc12aa4306b9d66d3c9f98f5d391abb Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman@redhat.com>
Date: Fri, 27 Sep 2024 13:06:12 +0200
Subject: [PATCH] fix(SBOMER-166): proper handling of umb notifications for
 non-product-related manifests

Failure in sending messages for non-product related manifests should not
be fatal.
---
 .../image/syft/controller/SyftImageController.java        | 3 ++-
 .../sbom/features/umb/producer/NotificationService.java   | 5 +++--
 .../feature/sbom/umb/producer/NotificationServiceIT.java  | 8 +-------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/service/src/main/java/org/jboss/sbomer/service/feature/sbom/features/generator/image/syft/controller/SyftImageController.java b/service/src/main/java/org/jboss/sbomer/service/feature/sbom/features/generator/image/syft/controller/SyftImageController.java
index 348c7999f..97bffacf8 100644
--- a/service/src/main/java/org/jboss/sbomer/service/feature/sbom/features/generator/image/syft/controller/SyftImageController.java
+++ b/service/src/main/java/org/jboss/sbomer/service/feature/sbom/features/generator/image/syft/controller/SyftImageController.java
@@ -205,7 +205,8 @@ protected UpdateControl<GenerationRequest> reconcileGenerating(
                     generationRequest,
                     SbomGenerationStatus.FAILED,
                     GenerationResult.ERR_GENERATION,
-                    "Generation failed. One or more generated SBOMs failed validation: {}. See logs for more information.", e.getMessage());
+                    "Generation failed. One or more generated SBOMs failed validation: {}. See logs for more information.",
+                    e.getMessage());
         }
 
         try {
diff --git a/service/src/main/java/org/jboss/sbomer/service/feature/sbom/features/umb/producer/NotificationService.java b/service/src/main/java/org/jboss/sbomer/service/feature/sbom/features/umb/producer/NotificationService.java
index 3b3863a86..13ba7cabc 100644
--- a/service/src/main/java/org/jboss/sbomer/service/feature/sbom/features/umb/producer/NotificationService.java
+++ b/service/src/main/java/org/jboss/sbomer/service/feature/sbom/features/umb/producer/NotificationService.java
@@ -128,10 +128,11 @@ public void notifyCompleted(List<org.jboss.sbomer.service.feature.sbom.model.Sbo
              * Skips sending UMB messages for manifests not related to a product build.
              */
             if (ProductConfig.ErrataProductConfig.fromBom(bom) == null) {
-                throw new NotificationException(
+                log.warn(
                         "Could not retrieve product configuration from the main component (purl = '{}') in the '{}' SBOM, skipping sending UMB notification",
-                        component.getPurl(),
+                        sbom.getRootPurl(),
                         sbom.getId());
+                return;
             }
 
             // Check whether we should send UMB notification for a given type.
diff --git a/service/src/test/java/org/jboss/sbomer/service/test/integ/feature/sbom/umb/producer/NotificationServiceIT.java b/service/src/test/java/org/jboss/sbomer/service/test/integ/feature/sbom/umb/producer/NotificationServiceIT.java
index b3668077f..38dcb332a 100644
--- a/service/src/test/java/org/jboss/sbomer/service/test/integ/feature/sbom/umb/producer/NotificationServiceIT.java
+++ b/service/src/test/java/org/jboss/sbomer/service/test/integ/feature/sbom/umb/producer/NotificationServiceIT.java
@@ -322,13 +322,7 @@ void shouldSkipNotificationForNonProductBuilds() throws IOException {
         // Remove all product properties
         sbom.setSbom(SbomUtils.removeErrataProperties(sbom.getSbom()));
 
-        ApplicationException ex = assertThrows(ApplicationException.class, () -> {
-            notificationService.notifyCompleted(List.of(sbom));
-        });
-
-        assertEquals(
-                "Could not retrieve product configuration from the main component (purl = 'pkg:maven/com.github.michalszynkiewicz.test/empty@1.0.0.redhat-00271?type=jar') in the '416640206274228333' SBOM, skipping sending UMB notification",
-                ex.getMessage());
+        notificationService.notifyCompleted(List.of(sbom));
 
         verify(amqpMessageProducer, times(0)).notify(any(GenerationFinishedMessageBody.class));
     }