From 58ac206c94352018e6a6cf5da21df4f447e52618 Mon Sep 17 00:00:00 2001
From: Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com>
Date: Wed, 2 Jun 2021 13:37:32 +0200
Subject: Improve handling exception path for HelmValidator

- Change log level for exception in HelmValidatorHttpClient
- Correct exception message and logging in HelmValidator

Issue-ID: SDC-3185
Signed-off-by: Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com>
Change-Id: If6391e9e95d420108e4dd4d9ecf5541df607329f
---
 .../openecomp/sdc/validation/impl/util/HelmValidatorHttpClient.java | 2 +-
 .../org/openecomp/sdc/validation/impl/validators/HelmValidator.java | 6 +++---
 .../openecomp/sdc/validation/impl/validators/HelmValidatorTest.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl')

diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/util/HelmValidatorHttpClient.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/util/HelmValidatorHttpClient.java
index 299d996562..133a1edfe5 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/util/HelmValidatorHttpClient.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/util/HelmValidatorHttpClient.java
@@ -61,7 +61,7 @@ public class HelmValidatorHttpClient {
 
             return httpResponse;
         } catch (HttpExecuteException e) {
-            LOGGER.info("Exception during call to Helm validator {}", e.getMessage());
+            LOGGER.error("Exception during call to Helm validator {}", e.getMessage(), e);
         }
         throw new Exception("Http response is invalid.");
     }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HelmValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HelmValidator.java
index 272d0a88b9..7e771bc8bf 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HelmValidator.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HelmValidator.java
@@ -42,7 +42,7 @@ public class HelmValidator implements Validator {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(HelmValidator.class);
     private static final ErrorMessageCode VALIDATOR_ERROR_CODE = new ErrorMessageCode("HELM VALIDATOR");
-    private static final String EXCEPTION_MESSAGE = "Could not execute file %s validation using Helm";
+    private static final String EXCEPTION_MESSAGE = "Could not execute validation of file %s. Helm validator service is unavailable";
 
     private final HelmValidatorHttpClient helmValidatorHttpClient;
     private final HelmValidatorConfig helmValidatorConfig;
@@ -72,7 +72,7 @@ public class HelmValidator implements Validator {
                 validateSingleHelmChart(fileName, fileContent.get().readAllBytes(), globalContext);
             } catch (Exception exception) {
                 String validationErrorMessage = String.format(EXCEPTION_MESSAGE, fileName);
-                LOGGER.error(validationErrorMessage + " exception: " + exception.getMessage());
+                LOGGER.error(validationErrorMessage + " exception: " + exception.getMessage(), exception);
                 addError(fileName, globalContext, validationErrorMessage, ErrorLevel.WARNING);
             }
         } else {
@@ -94,7 +94,7 @@ public class HelmValidator implements Validator {
                 addError(fileName, globalContext, lintWarning, ErrorLevel.WARNING));
         } else {
             var errorResponse = new Gson().fromJson(httpResponse.getResponse(), HelmValidatorErrorResponse.class);
-            addError(fileName, globalContext, errorResponse.getMessage(), ErrorLevel.WARNING);
+            addError(fileName, globalContext, "Message from Helm validator service: " + errorResponse.getMessage(), ErrorLevel.WARNING);
         }
     }
 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/HelmValidatorTest.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/HelmValidatorTest.java
index f639acafab..83cc91aed1 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/HelmValidatorTest.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/HelmValidatorTest.java
@@ -135,7 +135,7 @@ class HelmValidatorTest {
         var chartErrors = messages.get("chart.tgz").getErrorMessageList();
         assertEquals(1, chartErrors.size());
         assertEquals(ErrorLevel.WARNING, chartErrors.get(0).getLevel());
-        assertEquals("WARNING: [HELM VALIDATOR]: Error response message", chartErrors.get(0).getMessage());
+        assertEquals("WARNING: [HELM VALIDATOR]: Message from Helm validator service: Error response message", chartErrors.get(0).getMessage());
     }
 
 }
-- 
cgit 1.2.3-korg