handle RestClientException from terraform-boot API for validate request

eclipse-xpanse · Dec 9, 2023 · 72f032e · 72f032e
1 parent c93072f
commit 72f032e
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/...va/org/eclipse/xpanse/modules/deployment/deployers/terraform/TerraformBootDeployment.java b/...va/org/eclipse/xpanse/modules/deployment/deployers/terraform/TerraformBootDeployment.java
@@ -136,14 +136,19 @@ public DeployerKind getDeployerKind() {
     @Override
     public DeployValidationResult validate(Ocl ocl) {
         setHeaderTokenByProfiles();
-        TerraformValidationResult validate =
-                terraformApi.validateWithScripts(getDeployWithScriptsRequest(ocl));
         DeployValidationResult result = null;
         try {
-            result = objectMapper.readValue(objectMapper.writeValueAsString(validate),
-                    DeployValidationResult.class);
-        } catch (JsonProcessingException e) {
-            log.error("JsonProcessingException", e);
+            TerraformValidationResult validate =
+                    terraformApi.validateWithScripts(getDeployWithScriptsRequest(ocl));
+            try {
+                result = objectMapper.readValue(objectMapper.writeValueAsString(validate),
+                        DeployValidationResult.class);
+            } catch (JsonProcessingException e) {
+                log.error("JsonProcessingException", e);
+            }
+        } catch (RestClientException restClientException) {
+            log.error("Request to terraform-boot API failed", restClientException);
+            throw new TerraformBootRequestFailedException(restClientException.getMessage());
         }
         return result;
     }