fix - handle when tfstate file is not found

eclipse-xpanse · Dec 22, 2023 · ea1b6b4 · ea1b6b4
1 parent 9dbcc32
commit ea1b6b4
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/...n/java/org/eclipse/xpanse/modules/deployment/deployers/terraform/TerraformDeployment.java b/...n/java/org/eclipse/xpanse/modules/deployment/deployers/terraform/TerraformDeployment.java
@@ -144,17 +144,19 @@ private void handleTerraformExecuteResult(TerraformExecutor executor, DeployTask
             result.setState(failedState);
             result.setMessage(tfEx.getMessage());
         }
-        if (StringUtils.isNotEmpty(tfState)) {
-            result.getPrivateProperties().put(STATE_FILE_NAME, tfState);
-        }
+        if (Objects.nonNull(tfState)) {
+            if (StringUtils.isNotEmpty(tfState)) {
+                result.getPrivateProperties().put(STATE_FILE_NAME, tfState);
+            }
 
-        if (Objects.nonNull(task.getDeployResourceHandler())) {
-            try {
-                task.getDeployResourceHandler().handler(result);
-            } catch (TerraformExecutorException tfEx) {
-                log.error("Handle terraform resources failed. {}", tfEx.getMessage());
-                result.setState(TerraformExecState.DEPLOY_FAILED);
-                result.setMessage(tfEx.getMessage());
+            if (Objects.nonNull(task.getDeployResourceHandler())) {
+                try {
+                    task.getDeployResourceHandler().handler(result);
+                } catch (TerraformExecutorException tfEx) {
+                    log.error("Handle terraform resources failed. {}", tfEx.getMessage());
+                    result.setState(TerraformExecState.DEPLOY_FAILED);
+                    result.setMessage(tfEx.getMessage());
+                }
             }
         }
     }