Merge pull request #1361 from baixinsui/fix/destroy_failed

fix destroy services with scripts from git repo failed

Author: swaroopar

Diff for: modules/deployment/pom.xml

@@ -106,7 +106,7 @@
                             <goal>generate</goal>
                         </goals>
                         <configuration>
-                            <inputSpec>${project.basedir}/src/main/resources/terraformBootApis.json</inputSpec>
+                            <inputSpec>${project.basedir}/src/main/resources/terraform-boot-openapi.json</inputSpec>
                             <generatorName>java</generatorName>
                             <output>${project.basedir}</output>
                             <apiPackage>
@@ -141,7 +141,7 @@
                             <goal>generate</goal>
                         </goals>
                         <configuration>
-                            <inputSpec>${project.basedir}/src/main/resources/tofuMakerApis.json</inputSpec>
+                            <inputSpec>${project.basedir}/src/main/resources/tofu-maker-openapi.json</inputSpec>
                             <generatorName>java</generatorName>
                             <output>${project.basedir}</output>
                             <apiPackage>

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/DeployResultManager.java

@@ -70,26 +70,34 @@ private void updateEntityWithDeployResult(DeployResult deployResult,
         deployServiceEntity.setServiceDeploymentState(
                 getServiceDeploymentState(deployResult.getState()));
 
-        if (!CollectionUtils.isEmpty(deployServiceEntity.getProperties())) {
-            deployServiceEntity.getProperties().clear();
-        }
-        if (!CollectionUtils.isEmpty(deployServiceEntity.getPrivateProperties())) {
-            deployServiceEntity.getPrivateProperties().clear();
-        }
-        if (!CollectionUtils.isEmpty(deployServiceEntity.getDeployResourceList())) {
-            deployServiceEntity.getDeployResourceList().clear();
-        }
+        boolean taskExecutedSuccess = deployResult.getState() == DeployerTaskStatus.DESTROY_SUCCESS
+                || deployResult.getState() == DeployerTaskStatus.ROLLBACK_SUCCESS
+                || deployResult.getState() == DeployerTaskStatus.PURGE_SUCCESS
+                || deployResult.getState() == DeployerTaskStatus.DEPLOY_SUCCESS;
 
-        if (!CollectionUtils.isEmpty(deployResult.getPrivateProperties())) {
+        if (CollectionUtils.isEmpty(deployResult.getPrivateProperties())) {
+            if (taskExecutedSuccess) {
+                deployServiceEntity.getPrivateProperties().clear();
+            }
+        } else {
             deployServiceEntity.setPrivateProperties(deployResult.getPrivateProperties());
         }
-        if (!CollectionUtils.isEmpty(deployResult.getProperties())) {
+
+        if (CollectionUtils.isEmpty(deployResult.getProperties())) {
+            if (taskExecutedSuccess) {
+                deployServiceEntity.getProperties().clear();
+            }
+        } else {
             deployServiceEntity.setProperties(deployResult.getProperties());
         }
-        if (!CollectionUtils.isEmpty(deployResult.getResources())) {
+
+        if (CollectionUtils.isEmpty(deployResult.getResources())) {
+            if (taskExecutedSuccess) {
+                deployServiceEntity.getDeployResourceList().clear();
+            }
+        } else {
             deployServiceEntity.setDeployResourceList(
-                    getDeployResourceEntityList(deployResult.getResources(),
-                            deployServiceEntity));
+                    getDeployResourceEntityList(deployResult.getResources(), deployServiceEntity));
         }
         sensitiveDataHandler.maskSensitiveFields(deployServiceEntity);
     }

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/opentofumaker/OpenTofuMakerServiceDestroyer.java

@@ -118,6 +118,9 @@ private OpenTofuAsyncDestroyFromGitRepoRequest getDestroyFromGitRepoRequest(Depl
         request.setDestroyScenario(
                 OpenTofuAsyncDestroyFromGitRepoRequest.DestroyScenarioEnum.fromValue(
                         task.getDestroyScenario().toValue()));
+        request.setGitRepoDetails(
+                openTofuMakerHelper.convertOpenTofuScriptGitRepoDetailsFromDeployFromGitRepo(
+                        task.getOcl().getDeployment().getScriptsRepo()));
         return request;
     }
 

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/opentofumaker/generated/ApiClient.java

@@ -7,6 +7,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRequest;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.InvalidMediaTypeException;
 import org.springframework.http.MediaType;
 import org.springframework.http.RequestEntity;
@@ -39,6 +40,7 @@
 import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
 import java.text.ParseException;
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -49,13 +51,14 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TimeZone;
+import java.util.function.Supplier;
 import java.time.OffsetDateTime;
 
 import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.auth.Authentication;
 import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.auth.OAuth;
 
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@Component("org.eclipse.xpanse.modules.deployment.deployers.opentofu.tofumaker.generated.ApiClient")
+@Component("org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.ApiClient")
 public class ApiClient extends JavaTimeFormatter {
     public enum CollectionFormat {
         CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null);

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/opentofumaker/generated/ServerConfiguration.java

@@ -38,7 +38,7 @@ public String URL(Map<String, String> variables) {
 
             if (variables != null && variables.containsKey(name)) {
                 value = variables.get(name);
-                if (!serverVariable.enumValues.isEmpty() && !serverVariable.enumValues.contains(value)) {
+                if (serverVariable.enumValues.size() > 0 && !serverVariable.enumValues.contains(value)) {
                     throw new IllegalArgumentException("The variable " + name + " in the server URL has invalid value " + value + ".");
                 }
             }

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/opentofumaker/generated/api/AdminApi.java

@@ -3,23 +3,31 @@
 import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.ApiClient;
 
 import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.OpenTofuMakerSystemStatus;
+import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.Response;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@Component("org.eclipse.xpanse.modules.deployment.deployers.opentofu.tofumaker.generated.api.AdminApi")
+@Component("org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.api.AdminApi")
 public class AdminApi {
     private ApiClient apiClient;
 

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/opentofumaker/generated/api/OpenTofuFromDirectoryApi.java

@@ -10,11 +10,15 @@
 import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.OpenTofuPlanFromDirectoryRequest;
 import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.OpenTofuResult;
 import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.OpenTofuValidationResult;
+import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.Response;
 import java.util.UUID;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -23,14 +27,15 @@
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@Component("org.eclipse.xpanse.modules.deployment.deployers.opentofu.tofumaker.generated.api.OpenTofuFromDirectoryApi")
+@Component("org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.api.OpenTofuFromDirectoryApi")
 public class OpenTofuFromDirectoryApi {
     private ApiClient apiClient;
 

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/opentofumaker/generated/api/OpenTofuFromGitRepoApi.java

@@ -10,10 +10,15 @@
 import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.OpenTofuPlanFromGitRepoRequest;
 import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.OpenTofuResult;
 import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.OpenTofuValidationResult;
+import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.Response;
 import java.util.UUID;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -22,14 +27,15 @@
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@Component("org.eclipse.xpanse.modules.deployment.deployers.opentofu.tofumaker.generated.api.OpenTofuFromGitRepoApi")
+@Component("org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.api.OpenTofuFromGitRepoApi")
 public class OpenTofuFromGitRepoApi {
     private ApiClient apiClient;
 

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/opentofumaker/generated/api/OpenTofuFromScriptsApi.java

@@ -10,10 +10,15 @@
 import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.OpenTofuPlanWithScriptsRequest;
 import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.OpenTofuResult;
 import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.OpenTofuValidationResult;
+import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.Response;
 import java.util.UUID;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -22,14 +27,15 @@
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@Component("org.eclipse.xpanse.modules.deployment.deployers.opentofu.tofumaker.generated.api.OpenTofuFromScriptsApi")
+@Component("org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.api.OpenTofuFromScriptsApi")
 public class OpenTofuFromScriptsApi {
     private ApiClient apiClient;
 

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/opentofumaker/generated/model/OpenTofuAsyncDeployFromDirectoryRequest.java

@@ -14,11 +14,17 @@
 package org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model;
 
 import java.util.Objects;
+import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
+import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.WebhookConfig;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
  * OpenTofuAsyncDeployFromDirectoryRequest

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/opentofumaker/generated/model/OpenTofuAsyncDeployFromGitRepoRequest.java

@@ -14,11 +14,18 @@
 package org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model;
 
 import java.util.Objects;
+import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
+import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.OpenTofuScriptGitRepoDetails;
+import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.WebhookConfig;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
  * OpenTofuAsyncDeployFromGitRepoRequest
@@ -151,17 +158,17 @@ public OpenTofuAsyncDeployFromGitRepoRequest gitRepoDetails(OpenTofuScriptGitRep
    * Get gitRepoDetails
    * @return gitRepoDetails
   **/
-  @jakarta.annotation.Nullable
+  @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_GIT_REPO_DETAILS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public OpenTofuScriptGitRepoDetails getGitRepoDetails() {
     return gitRepoDetails;
   }
 
 
   @JsonProperty(JSON_PROPERTY_GIT_REPO_DETAILS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public void setGitRepoDetails(OpenTofuScriptGitRepoDetails gitRepoDetails) {
     this.gitRepoDetails = gitRepoDetails;
   }

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/opentofumaker/generated/model/OpenTofuAsyncDeployFromScriptsRequest.java

@@ -14,13 +14,20 @@
 package org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model;
 
 import java.util.Objects;
+import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.WebhookConfig;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
  * OpenTofuAsyncDeployFromScriptsRequest

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/opentofumaker/generated/model/OpenTofuAsyncDestroyFromDirectoryRequest.java

@@ -14,13 +14,17 @@
 package org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model;
 
 import java.util.Objects;
+import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
+import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.WebhookConfig;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
  * OpenTofuAsyncDestroyFromDirectoryRequest

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/opentofumaker/generated/model/OpenTofuAsyncDestroyFromGitRepoRequest.java

@@ -14,13 +14,18 @@
 package org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model;
 
 import java.util.Objects;
+import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
+import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.OpenTofuScriptGitRepoDetails;
+import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.WebhookConfig;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
  * OpenTofuAsyncDestroyFromGitRepoRequest

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/opentofumaker/generated/model/OpenTofuAsyncDestroyFromScriptsRequest.java

@@ -14,15 +14,20 @@
 package org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model;
 
 import java.util.Objects;
+import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.eclipse.xpanse.modules.deployment.deployers.opentofu.opentofumaker.generated.model.WebhookConfig;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
  * OpenTofuAsyncDestroyFromScriptsRequest