Merge pull request #129 from catenax-ng/release1.5.2

Release1.5.3

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
  - The customer already gets an email from Portal and the third-Party-provider after the successful deployment that the SDE-Service is ready to use. If the connector End2End test is unsuccessful (this might be based on the cloud communication issue), the customer will be informed about the failing connectivity. This behavior might need to be clarified for the customer. We will change this behavior in the next release.
+
+
+## [1.5.3] - 2023-10-30
+
+### Changed
+ - Refactor DT registry local use
 
 ## [1.5.2] - 2023-10-27
 
@@ -14,7 +20,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
  - Email send refactor
  - Refactor s3 policy template use
 
-
 ## [1.5.1] - 2023-10-16
 
 ### Changed

README.md

@@ -12,8 +12,8 @@ This service will help service provider to set up DFT/SDE with EDC and EDC as se
 ### Software Version
 
 ```shell
-Application version: 1.5.2
-Helm release version: 1.5.2
+Application version: 1.5.3
+Helm release version: 1.5.3
 ```
 
 # Container images

charts/orchestrator/Chart.yaml

@@ -38,13 +38,13 @@ sources:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.5.2
+version: 1.5.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.5.2"
+appVersion: "1.5.3"
 
 dependencies:
   - condition: postgresql.enabled

pom.xml

@@ -32,7 +32,7 @@
 	</parent>
 	<groupId>org.eclipse.tractusx</groupId>
 	<artifactId>managed-service-orchestrator</artifactId>
-	<version>1.5.2</version>
+	<version>1.5.3</version>
 	<name>managed-service-orchestrator</name>
 	<description>managed-service-orchestrator</description>
 	<properties>

src/main/java/org/eclipse/tractusx/autosetup/manager/DTRegistryManager.java

@@ -39,6 +39,7 @@
 import org.eclipse.tractusx.autosetup.model.SelectedTools;
 import org.eclipse.tractusx.autosetup.utility.LogUtil;
 import org.eclipse.tractusx.autosetup.utility.WaitingTimeUtility;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.retry.annotation.Backoff;
 import org.springframework.retry.annotation.Retryable;
 import org.springframework.retry.support.RetrySynchronizationManager;
@@ -59,6 +60,9 @@ public class DTRegistryManager {
 
 	private final EDCProxyService eDCProxyService;
 
+	@Value("${managed.dt-registry.local:true}")
+	private boolean managedDTRegistryLocal;
+
 	@Retryable(retryFor = {
 			ServiceException.class }, maxAttemptsExpression = "${retry.maxAttempts}", backoff = @Backoff(delayExpression = "#{${retry.backOffDelay}}"))
 	public Map<String, String> managePackage(Customer customerDetails, AppActions action, SelectedTools tool,
@@ -74,8 +78,17 @@ public Map<String, String> managePackage(Customer customerDetails, AppActions ac
 
 			String dturi = sDEConfigurationProperty.getDtregistryApiUri();
 			dturi = StringUtils.isAllEmpty(dturi) ? "/api/v3.0" : dturi;
-			String dtregistryUrl = dnsNameURLProtocol + "://" + dnsName + "/"
-					+ sDEConfigurationProperty.getDtregistryUrlPrefix() + dturi;
+			if (managedDTRegistryLocal) {
+				String appName = DT_REGISTRY.name().replace("_", "");
+				String localDTUrl = "http://cx-" + packageName + "-" + appName.toLowerCase() + "-registry-svc:8080";
+				inputData.put("dtregistryUrl", localDTUrl);
+				inputData.put("dtregistryUrlWithURI", localDTUrl + dturi);
+			} else {
+				String dtregistryUrl = dnsNameURLProtocol + "://" + dnsName + "/"
+						+ sDEConfigurationProperty.getDtregistryUrlPrefix() + dturi;
+				inputData.put("dtregistryUrl", dtregistryUrl);
+				inputData.put("dtregistryUrlWithURI", dtregistryUrl + dturi);
+			}
 
 			inputData.put("rgdatabase", "registry");
 			inputData.put("rgdbpass", "admin@123");
@@ -84,8 +97,7 @@ public Map<String, String> managePackage(Customer customerDetails, AppActions ac
 			inputData.put("idpIssuerUri", sDEConfigurationProperty.getResourceServerIssuer());
 			inputData.put("tenantId", sDEConfigurationProperty.getDtregistrytenantId());
 			inputData.put("dtregistryUrlPrefix", sDEConfigurationProperty.getDtregistryUrlPrefix());
-
-			inputData.put("dtregistryUrl", dtregistryUrl);
+			inputData.put("dtregistryURI", dturi);
 
 			if (AppActions.CREATE.equals(action))
 				appManagement.createPackage(DT_REGISTRY, packageName, inputData);

src/main/java/org/eclipse/tractusx/autosetup/service/AutoSetupOrchitestratorService.java

@@ -638,7 +638,7 @@ private List<Map<String, String>> extractDTResultMap(Map<String, String> outputM
 
 		Map<String, String> dt = new LinkedHashMap<>();
 		dt.put("name", "DT");
-		dt.put("dtregistryUrl", outputMap.get("dtregistryUrl"));
+		dt.put("dtregistryUrlWithURI", outputMap.get("dtregistryUrlWithURI"));
 		dt.put("idpClientId", outputMap.get("idpClientId"));
 		processResult.add(dt);
 

src/main/resources/application.properties

@@ -130,7 +130,7 @@ edc.ssi.authorityId=${edc_ssi_authorityId}
 
 #Flag to make optional use of managed DT regitry, if value not set default value is true
 managed.dt-registry=true
-
+managed.dt-registry.local=true
 
 #automatic storage Media for minio
 automatic.storage.media=true

src/main/resources/flyway/V9__update_app_version.sql

@@ -86,9 +86,9 @@ update app_tbl set expected_input_data='{
 							
 							spring.jpa.open-in-view=false
 							
-							digital-twins.hostname=http://cx-dt-sdeedctx-dtregistry-registry-svc:8080
+							digital-twins.hostname=$\{dtregistryUrl\}
 							
-							digital-twins.api=/api/v3.0
+							digital-twins.api=$\{dtregistryURI\}
 							
 							digital-twins.authentication.url=$\{sde.digital-twins.authentication.url\}
 							
@@ -311,6 +311,6 @@ update app_tbl set expected_input_data= '{
                 "tls": false
             }
     }
-}', package_version='0.3.24' where app_name='DT_REGISTRY';
+}', package_version='0.3.27' where app_name='DT_REGISTRY';
 
 update app_tbl set expected_input_data= replace(replace(expected_input_data,'\{','{'),'\}','}'), required_yaml_configuration=replace(replace(required_yaml_configuration,'\{','{'),'\}','}');

src/main/resources/request-template/asset.json

@@ -26,7 +26,7 @@
     },
     "edc:dataAddress": {
         "edc:type": "HttpData",
-        "edc:baseUrl": "${dtregistryUrl}",
+        "edc:baseUrl": "${dtregistryUrlWithURI}",
         "oauth2:tokenUrl": "${idpIssuerUri}",
         "oauth2:clientId": "${keycloakAuthenticationClientId}",
         "oauth2:clientSecretKey": "client-secret",