Merge pull request #1671 from swaroopar/feature/fixReleaseFindings

fix typo in API method tag name

modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServiceModificationApi.java

@@ -70,7 +70,7 @@ public class ServiceModificationApi {
      * @return response
      */
     @Tag(name = "ServiceModification",
-            description = "APIs to manage modifications of the service instances.")
+            description = "APIs to manage modifications of the service instances")
     @Operation(description = "Start a modification to modify the deployed service instance.")
     @PutMapping(value = "/services/modify/{serviceId}",
             produces = MediaType.APPLICATION_JSON_VALUE)
@@ -109,7 +109,7 @@ public UUID modify(@Parameter(name = "serviceId", description = "id of deployed
      */
     @Tag(name = "ServiceModification",
             description = "APIs to manage modifications of the service instances.")
-    @Operation(description = "List modification audits of the service instance.")
+    @Operation(description = "List modification audits of the service instance")
     @GetMapping(value = "/services/{serviceId}/modifications", produces =
             MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(HttpStatus.OK)

modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServiceTemplateApi.java

@@ -190,7 +190,7 @@ public ServiceTemplateDetailVo reRegisterServiceTemplate(
             @PathVariable("id") String id) {
         ServiceTemplateEntity templateEntity =
                 serviceTemplateManage.reRegisterServiceTemplate(UUID.fromString(id));
-        log.info("Unregister service template with id {} successfully.", id);
+        log.info("Re-register service template with id {} successfully.", id);
         return convertToServiceTemplateDetailVo(templateEntity);
     }
 

modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/tofumaker/config/TofuMakerApiClientConfig.java

@@ -7,7 +7,7 @@
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
-import org.eclipse.xpanse.modules.deployment.deployers.terraform.terraformboot.generated.ApiClient;
+import org.eclipse.xpanse.modules.deployment.deployers.opentofu.tofumaker.generated.ApiClient;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;

modules/deployment/src/test/java/org/eclipse/xpanse/modules/deployment/deployers/opentofu/tofumaker/config/TofuMakerApiClientConfigTest.java

@@ -2,7 +2,7 @@
 
 import static org.mockito.Mockito.verify;
 
-import org.eclipse.xpanse.modules.deployment.deployers.terraform.terraformboot.generated.ApiClient;
+import org.eclipse.xpanse.modules.deployment.deployers.opentofu.tofumaker.generated.ApiClient;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

modules/models/src/main/java/org/eclipse/xpanse/modules/models/system/enums/BackendSystemType.java

@@ -15,11 +15,11 @@
  */
 public enum BackendSystemType {
 
-    IDENTITY_PROVIDER("IdentityProvider"),
+    IDENTITY_PROVIDER("Identity Provider"),
     DATABASE("Database"),
     TERRAFORM_BOOT("Terraform Boot"),
     TOFU_MAKER("Tofu Maker"),
-    POLICY_MAN("PolicyMan"),
+    POLICY_MAN("Policy Man"),
     OPEN_TELEMETRY_COLLECTOR("OpenTelemetry Collector");
 
     private final String code;

modules/models/src/test/java/org/eclipse/xpanse/modules/models/system/enums/BackendSystemTypeTest.java

@@ -18,7 +18,7 @@ class BackendSystemTypeTest {
 
     @Test
     public void testGetByValue() {
-        BackendSystemType type = BackendSystemType.getByValue("identityProvider");
+        BackendSystemType type = BackendSystemType.getByValue("identity provider");
         Assertions.assertEquals(type, BackendSystemType.IDENTITY_PROVIDER);
 
         BackendSystemType type1 = BackendSystemType.getByValue("database");
@@ -30,7 +30,7 @@ public void testGetByValue() {
         BackendSystemType type3 = BackendSystemType.getByValue("tofu maker");
         Assertions.assertEquals(type3, BackendSystemType.TOFU_MAKER);
 
-        BackendSystemType type4 = BackendSystemType.getByValue("policyMan");
+        BackendSystemType type4 = BackendSystemType.getByValue("policy man");
         Assertions.assertEquals(type4, BackendSystemType.POLICY_MAN);
 
         BackendSystemType type5 = BackendSystemType.getByValue("OpenTelemetry Collector");
@@ -43,7 +43,7 @@ public void testGetByValue() {
     @Test
     public void testToValue() {
         String value = BackendSystemType.IDENTITY_PROVIDER.toValue();
-        Assertions.assertEquals("IdentityProvider", value);
+        Assertions.assertEquals("Identity Provider", value);
         String name = BackendSystemType.IDENTITY_PROVIDER.name();
         Assertions.assertEquals("IDENTITY_PROVIDER", name);
         String string = BackendSystemType.IDENTITY_PROVIDER.toString();
@@ -71,7 +71,7 @@ public void testToValue() {
         Assertions.assertEquals("TOFU_MAKER", string3);
 
         String value4 = BackendSystemType.POLICY_MAN.toValue();
-        Assertions.assertEquals("PolicyMan", value4);
+        Assertions.assertEquals("Policy Man", value4);
         String name4 = BackendSystemType.POLICY_MAN.name();
         Assertions.assertEquals("POLICY_MAN", name4);
         String string4 = BackendSystemType.POLICY_MAN.toString();

plugins/scs/src/main/java/org/eclipse/xpanse/plugins/scs/common/keystone/ScsKeystoneManager.java

@@ -96,7 +96,7 @@ public OSClient.OSClientV3 getAuthenticatedClient(UUID serviceId,
         // there is no need to return the authenticated client because the below method already sets
         // the authentication details in the thread context.
         String url = Objects.nonNull(serviceId) ? getUrlFromDeploymentVariables(serviceId)
-                : System.getProperty(ScsEnvironmentConstants.AUTH_URL);
+                : System.getenv(ScsEnvironmentConstants.AUTH_URL);
 
         return OSFactory
                 .builderV3()