Merge pull request #73 from catenax-ng/release1.4.4

feat: _Support DDTR_
catenax-ng · Sep 4, 2023 · 548d2ed · 548d2ed
2 parents c816127 + b447a75
commit 548d2ed
Show file tree

Hide file tree

Showing 10 changed files with 391 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ 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.0] - 2023-09-04
+
+### Changed
+ - Support DDTR 3.2 for external subject id
 
 ## [1.4.2] - 2023-08-22
 

diff --git a/README.md b/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.4.2
-Helm release version: 1.4.3
+Application version: 1.5.0
+Helm release version: 1.5.0
 ```
 
 # Container images

diff --git a/charts/orchestrator/Chart.yaml b/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.4.3
+version: 1.5.0
 
 # 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.4.2"
+appVersion: "1.5.0"
 
 dependencies:
   - condition: postgresql.enabled

diff --git a/charts/orchestrator/README.md b/charts/orchestrator/README.md
@@ -1,6 +1,6 @@
 # managed-service-orchestrator
 
-![Version: 1.4.3](https://img.shields.io/badge/Version-1.4.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.2](https://img.shields.io/badge/AppVersion-1.4.2-informational?style=flat-square)
+![Version: 1.5.0](https://img.shields.io/badge/Version-1.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.0](https://img.shields.io/badge/AppVersion-1.5.0-informational?style=flat-square)
 
 This service will help service provider to set up DFT/SDE with EDC and EDC as service in service provider environment.
 

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
 	</parent>
 	<groupId>org.eclipse.tractusx</groupId>
 	<artifactId>managed-service-orchestrator</artifactId>
-	<version>1.4.2</version>
+	<version>1.5.0</version>
 	<name>managed-service-orchestrator</name>
 	<description>managed-service-orchestrator</description>
 	<properties>

diff --git a/src/main/java/org/eclipse/tractusx/autosetup/constant/SDEConfigurationProperty.java b/src/main/java/org/eclipse/tractusx/autosetup/constant/SDEConfigurationProperty.java
@@ -51,6 +51,7 @@ public class SDEConfigurationProperty {
 	private String dtregistryidpClientId;
 	private String dtregistrytenantId;
 	private String dtregistryUrlPrefix;
+	private String dtregistryApiUri;
 
 	private String bpndiscoveryHostname;
 	private String discoveryAuthenticationUrl;

diff --git a/src/main/java/org/eclipse/tractusx/autosetup/manager/DTRegistryManager.java b/src/main/java/org/eclipse/tractusx/autosetup/manager/DTRegistryManager.java
@@ -26,6 +26,7 @@
 import java.util.Map;
 import java.util.UUID;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.tractusx.autosetup.apiproxy.EDCProxyService;
 import org.eclipse.tractusx.autosetup.constant.AppActions;
 import org.eclipse.tractusx.autosetup.constant.SDEConfigurationProperty;
@@ -70,8 +71,10 @@ public Map<String, String> managePackage(Customer customerDetails, AppActions ac
 			String dnsName = inputData.get("dnsName");
 			String dnsNameURLProtocol = inputData.get("dnsNameURLProtocol");
 
+			String dturi = sDEConfigurationProperty.getDtregistryApiUri();
+			dturi = StringUtils.isAllEmpty(dturi) ? "/api/v3.0" : dturi;
 			String dtregistryUrl = dnsNameURLProtocol + "://" + dnsName + "/"
-					+ sDEConfigurationProperty.getDtregistryUrlPrefix();
+					+ sDEConfigurationProperty.getDtregistryUrlPrefix() + dturi;
 
 			inputData.put("rgdatabase", "registry");
 			inputData.put("rgdbpass", "admin@123");

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -115,6 +115,7 @@ sde.portal-backend-clientSecret=${sde_portal-backend-clientSecret}
 sde.dtregistryidp-client-id=${sde_dtregistryidp-client-id}
 sde.dtregistrytenant-id=${sde_dtregistrytenant-id}
 sde.dtregistry-url-prefix=${sde_dtregistry-url-prefix}
+sde.dtregistry-api-uri=${sde_dtregistry-api-uri}
 
 sde.bpndiscovery-hostname=${sde_bpndiscovery-hostname}
 sde.discovery-authentication-url=${sde_discovery-authentication-url}