From bd938de0e527f0e95b7caae61dad8aefff4c4cc5 Mon Sep 17 00:00:00 2001
From: Sachin Argade <sachin.argade@t-systems.com>
Date: Fri, 17 Mar 2023 10:34:54 +0530
Subject: [PATCH 01/15] Connector Test service integration with autosetup

---
 .../autosetup/constant/AppNameConstant.java   |  5 +-
 .../manager/TestConnectorServiceManager.java  | 65 +++++++++++++++++++
 .../service/EDCConnectorWorkFlow.java         |  7 +-
 .../proxy/ConnectorTestRequest.java           | 16 +++++
 .../proxy/ConnectorTestServiceProxy.java      | 13 ++++
 src/main/resources/application.properties     |  2 +
 .../templates/edc_success_activate.html       |  3 +-
 7 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
 create mode 100644 src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestRequest.java
 create mode 100644 src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java

diff --git a/src/main/java/org/eclipse/tractusx/autosetup/constant/AppNameConstant.java b/src/main/java/org/eclipse/tractusx/autosetup/constant/AppNameConstant.java
index 2a1766d9..11210cc2 100644
--- a/src/main/java/org/eclipse/tractusx/autosetup/constant/AppNameConstant.java
+++ b/src/main/java/org/eclipse/tractusx/autosetup/constant/AppNameConstant.java
@@ -35,7 +35,6 @@ public enum AppNameConstant {
 	
 	DFT_FRONTEND,
 	
-	DFT_BACKEND
-
-
+	DFT_BACKEND,
+	
 }
diff --git a/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java b/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
new file mode 100644
index 00000000..675acb53
--- /dev/null
+++ b/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
@@ -0,0 +1,65 @@
+package org.eclipse.tractusx.autosetup.manager;
+
+import java.util.Map;
+import java.util.UUID;
+
+import org.eclipse.tractusx.autosetup.constant.TriggerStatusEnum;
+import org.eclipse.tractusx.autosetup.entity.AutoSetupTriggerDetails;
+import org.eclipse.tractusx.autosetup.entity.AutoSetupTriggerEntry;
+import org.eclipse.tractusx.autosetup.exception.ServiceException;
+import org.eclipse.tractusx.autosetup.model.Customer;
+import org.eclipse.tractusx.autosetup.testservice.proxy.ConnectorTestRequest;
+import org.eclipse.tractusx.autosetup.testservice.proxy.ConnectorTestServiceProxy;
+import org.springframework.retry.annotation.Backoff;
+import org.springframework.retry.annotation.Retryable;
+import org.springframework.retry.support.RetrySynchronizationManager;
+import org.springframework.stereotype.Service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class TestConnectorServiceManager {
+
+	private final AutoSetupTriggerManager autoSetupTriggerManager;
+
+	private final ConnectorTestServiceProxy connectorTestServiceProxy;
+
+	@Retryable(value = {
+			ServiceException.class }, maxAttemptsExpression = "${retry.maxAttempts}", backoff = @Backoff(delayExpression = "${retry.backOffDelay}"))
+	public Map<String, String> verifyConnectorTestingThroughTestService(Customer customerDetails,
+			Map<String, String> inputData, AutoSetupTriggerEntry triger) {
+
+		AutoSetupTriggerDetails autoSetupTriggerDetails = AutoSetupTriggerDetails.builder()
+				.id(UUID.randomUUID().toString()).step("CONNECTOR_TEST_SERVICE").build();
+		try {
+
+			ConnectorTestRequest connectorTestRequest = ConnectorTestRequest.builder()
+					.apiKeyHeader(inputData.get("edcApiKey")).apiKeyValue(inputData.get("edcApiKeyValue"))
+					.connectorHost(inputData.get("controlPlaneEndpoint")).build();
+
+			String testResult = connectorTestServiceProxy
+					.verifyConnectorTestingThroughTestService(connectorTestRequest);
+
+			inputData.put("connectorTestResult", testResult);
+
+			autoSetupTriggerDetails.setStatus(TriggerStatusEnum.SUCCESS.name());
+
+		} catch (Exception ex) {
+
+			log.error("ConnectorTestService failed retry attempt: : {}",
+					RetrySynchronizationManager.getContext().getRetryCount() + 1);
+
+			autoSetupTriggerDetails.setStatus(TriggerStatusEnum.FAILED.name());
+			autoSetupTriggerDetails.setRemark(ex.getMessage());
+			throw new ServiceException("ConnectorTestService Oops! We have an exception - " + ex.getMessage());
+		} finally {
+			autoSetupTriggerManager.saveTriggerDetails(autoSetupTriggerDetails, triger);
+		}
+
+		return inputData;
+	}
+
+}
diff --git a/src/main/java/org/eclipse/tractusx/autosetup/service/EDCConnectorWorkFlow.java b/src/main/java/org/eclipse/tractusx/autosetup/service/EDCConnectorWorkFlow.java
index 44076592..f12a3126 100644
--- a/src/main/java/org/eclipse/tractusx/autosetup/service/EDCConnectorWorkFlow.java
+++ b/src/main/java/org/eclipse/tractusx/autosetup/service/EDCConnectorWorkFlow.java
@@ -22,8 +22,8 @@
 
 import static org.eclipse.tractusx.autosetup.constant.AppNameConstant.EDC_CONTROLPLANE;
 import static org.eclipse.tractusx.autosetup.constant.AppNameConstant.EDC_DATAPLANE;
-import static org.eclipse.tractusx.autosetup.constant.AppNameConstant.TRACTUS_CONNECTOR;
 import static org.eclipse.tractusx.autosetup.constant.AppNameConstant.POSTGRES_DB;
+import static org.eclipse.tractusx.autosetup.constant.AppNameConstant.TRACTUS_CONNECTOR;
 
 import java.util.Map;
 
@@ -35,6 +35,7 @@
 import org.eclipse.tractusx.autosetup.manager.EDCControlplaneManager;
 import org.eclipse.tractusx.autosetup.manager.EDCDataplaneManager;
 import org.eclipse.tractusx.autosetup.manager.PostgresDBManager;
+import org.eclipse.tractusx.autosetup.manager.TestConnectorServiceManager;
 import org.eclipse.tractusx.autosetup.manager.TractusConnectorManager;
 import org.eclipse.tractusx.autosetup.manager.VaultManager;
 import org.eclipse.tractusx.autosetup.model.Customer;
@@ -54,6 +55,7 @@ public class EDCConnectorWorkFlow {
 	private final EDCDataplaneManager edcDataplaneManager;
 	private final TractusConnectorManager tractusConnectorManager;
 	private final ConnectorRegistrationManager connectorRegistrationManager;
+	private final TestConnectorServiceManager testConnectorServiceManager;
 
 	private final AppDeleteManager appDeleteManager;
 
@@ -70,6 +72,9 @@ public Map<String, String> getWorkFlow(Customer customerDetails, SelectedTools t
 		inputConfiguration.putAll(
 				connectorRegistrationManager.registerConnector(customerDetails, tool, inputConfiguration, triger));
 
+		inputConfiguration.putAll(testConnectorServiceManager.verifyConnectorTestingThroughTestService(customerDetails,
+				inputConfiguration, triger));
+
 		return inputConfiguration;
 	}
 
diff --git a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestRequest.java b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestRequest.java
new file mode 100644
index 00000000..6f8cd1a0
--- /dev/null
+++ b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestRequest.java
@@ -0,0 +1,16 @@
+package org.eclipse.tractusx.autosetup.testservice.proxy;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ConnectorTestRequest {
+
+	private String connectorHost;
+
+	private String apiKeyHeader;
+
+	private String apiKeyValue;
+
+}
diff --git a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java
new file mode 100644
index 00000000..9de7fbce
--- /dev/null
+++ b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java
@@ -0,0 +1,13 @@
+package org.eclipse.tractusx.autosetup.testservice.proxy;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(name = "ConnectorTestServiceProxy", url = "${connector.test.service.url}")
+public interface ConnectorTestServiceProxy {
+
+	@PostMapping("/connector-test")
+	public String verifyConnectorTestingThroughTestService(@RequestBody ConnectorTestRequest connectorTestRequest);
+
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 997ce591..8b318b80 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -64,6 +64,8 @@ vault.url=${vaultUrl}
 vault.token=${vaultToken}
 vault.timeout=30
 
+#Connector Test service details
+connector.test.service.url=${connectorTestServiceUrl}
 
 #Portal interface info
 portal.url=${portalurl}
diff --git a/src/main/resources/templates/edc_success_activate.html b/src/main/resources/templates/edc_success_activate.html
index cdc116ca..2d37880c 100644
--- a/src/main/resources/templates/edc_success_activate.html
+++ b/src/main/resources/templates/edc_success_activate.html
@@ -41,7 +41,8 @@
 		<p>EDC ApiKey : <a href="#">${edcApiKey}</a>
 		<p>EDC ApiKeyValue : <a href="#">${edcApiKeyValue}</a>
 		<p>Data Plane URL : <a href="#">${dataPlanePublicEndpoint}</a>
-		
+		<p>Your connector status through connector test service:${connectorTestResult}</p>
+
 		<p>Kind Regards<br />Catina-X</p>
 
 	</div>

From 9290811a185e5e0157dc59cec7fa056fc1279a63 Mon Sep 17 00:00:00 2001
From: Sachin Argade <sachin.argade@t-systems.com>
Date: Wed, 22 Mar 2023 14:23:52 +0530
Subject: [PATCH 02/15] Update email template, add waiting for connector test

---
 .../manager/TestConnectorServiceManager.java  | 21 +++++++++++++++++--
 .../service/EDCConnectorWorkFlow.java         |  3 +++
 .../proxy/ConnectorTestServiceProxy.java      |  2 +-
 .../proxy/ConnectorTestServiceResponse.java   | 10 +++++++++
 .../templates/edc_success_activate.html       |  2 +-
 .../resources/templates/success_activate.html |  1 +
 6 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceResponse.java

diff --git a/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java b/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
index 675acb53..5d2864d4 100644
--- a/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
+++ b/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
@@ -10,6 +10,8 @@
 import org.eclipse.tractusx.autosetup.model.Customer;
 import org.eclipse.tractusx.autosetup.testservice.proxy.ConnectorTestRequest;
 import org.eclipse.tractusx.autosetup.testservice.proxy.ConnectorTestServiceProxy;
+import org.eclipse.tractusx.autosetup.testservice.proxy.ConnectorTestServiceResponse;
+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;
@@ -26,6 +28,9 @@ public class TestConnectorServiceManager {
 	private final AutoSetupTriggerManager autoSetupTriggerManager;
 
 	private final ConnectorTestServiceProxy connectorTestServiceProxy;
+	
+	@Value("${connector.test.service.url}")
+	private String connectorTestServiceURL;
 
 	@Retryable(value = {
 			ServiceException.class }, maxAttemptsExpression = "${retry.maxAttempts}", backoff = @Backoff(delayExpression = "${retry.backOffDelay}"))
@@ -40,10 +45,22 @@ public Map<String, String> verifyConnectorTestingThroughTestService(Customer cus
 					.apiKeyHeader(inputData.get("edcApiKey")).apiKeyValue(inputData.get("edcApiKeyValue"))
 					.connectorHost(inputData.get("controlPlaneEndpoint")).build();
 
-			String testResult = connectorTestServiceProxy
+			try {
+				log.info("Waiting after connector setup to get pod up to test connector as data provider/consumer");
+				Thread.sleep(60000);
+			} catch (InterruptedException e) {
+
+				Thread.currentThread().interrupt();
+			}
+
+			ConnectorTestServiceResponse testResult = connectorTestServiceProxy
 					.verifyConnectorTestingThroughTestService(connectorTestRequest);
 
-			inputData.put("connectorTestResult", testResult);
+			log.info("Connector status: " + testResult.getMessage());
+
+			inputData.put("connectorTestResult", testResult.getMessage());
+			
+			inputData.put("testServiceURL", connectorTestServiceURL);
 
 			autoSetupTriggerDetails.setStatus(TriggerStatusEnum.SUCCESS.name());
 
diff --git a/src/main/java/org/eclipse/tractusx/autosetup/service/EDCConnectorWorkFlow.java b/src/main/java/org/eclipse/tractusx/autosetup/service/EDCConnectorWorkFlow.java
index f12a3126..38b11c58 100644
--- a/src/main/java/org/eclipse/tractusx/autosetup/service/EDCConnectorWorkFlow.java
+++ b/src/main/java/org/eclipse/tractusx/autosetup/service/EDCConnectorWorkFlow.java
@@ -99,6 +99,9 @@ public Map<String, String> getWorkFlowSeparateCPandDP(Customer customerDetails,
 				edcDataplaneManager.managePackage(customerDetails, workflowAction, tool, inputConfiguration, triger));
 		inputConfiguration.putAll(
 				connectorRegistrationManager.registerConnector(customerDetails, tool, inputConfiguration, triger));
+		
+		inputConfiguration.putAll(testConnectorServiceManager.verifyConnectorTestingThroughTestService(customerDetails,
+				inputConfiguration, triger));
 
 		return inputConfiguration;
 	}
diff --git a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java
index 9de7fbce..2358c5ac 100644
--- a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java
+++ b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java
@@ -8,6 +8,6 @@
 public interface ConnectorTestServiceProxy {
 
 	@PostMapping("/connector-test")
-	public String verifyConnectorTestingThroughTestService(@RequestBody ConnectorTestRequest connectorTestRequest);
+	public ConnectorTestServiceResponse verifyConnectorTestingThroughTestService(@RequestBody ConnectorTestRequest connectorTestRequest);
 
 }
diff --git a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceResponse.java b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceResponse.java
new file mode 100644
index 00000000..8c00c7bf
--- /dev/null
+++ b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceResponse.java
@@ -0,0 +1,10 @@
+package org.eclipse.tractusx.autosetup.testservice.proxy;
+
+import lombok.Data;
+
+@Data
+public class ConnectorTestServiceResponse {
+
+	private String message;
+
+}
diff --git a/src/main/resources/templates/edc_success_activate.html b/src/main/resources/templates/edc_success_activate.html
index 2d37880c..2e8d5fbe 100644
--- a/src/main/resources/templates/edc_success_activate.html
+++ b/src/main/resources/templates/edc_success_activate.html
@@ -41,7 +41,7 @@
 		<p>EDC ApiKey : <a href="#">${edcApiKey}</a>
 		<p>EDC ApiKeyValue : <a href="#">${edcApiKeyValue}</a>
 		<p>Data Plane URL : <a href="#">${dataPlanePublicEndpoint}</a>
-		<p>Your connector status through connector test service:${connectorTestResult}</p>
+		<p>Your connector status through connector test service: ${connectorTestResult}, check status again <a href="${testServiceURL}">here</a></p>
 
 		<p>Kind Regards<br />Catina-X</p>
 
diff --git a/src/main/resources/templates/success_activate.html b/src/main/resources/templates/success_activate.html
index 1cc49b9b..6333062f 100644
--- a/src/main/resources/templates/success_activate.html
+++ b/src/main/resources/templates/success_activate.html
@@ -33,6 +33,7 @@
 		<p><strong>Hello ${orgname},</strong></p>
 		<p>The SDE/DFT tool successfully activated for your use.</p>
 		<p>Please click <a href="${dftFrontEndUrl}">here</a> to start using it.</p>
+		<p>Your connector status through connector test service: ${connectorTestResult}, check status again <a href="${testServiceURL}">here</a></p>
 		<p>Note: You need to use your own organization login credential to login SDE/DFT tool.</p>
 
 		<p>Kind Regards<br />Catina-X</p>

From ab80b21f1571d40f7272ca388c24b76123d3cfb0 Mon Sep 17 00:00:00 2001
From: Sachin Argade <sachin.argade@t-systems.com>
Date: Wed, 22 Mar 2023 14:39:05 +0530
Subject: [PATCH 03/15] fix sonar issue

---
 .../manager/TestConnectorServiceManager.java        | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java b/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
index 5d2864d4..a60a2061 100644
--- a/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
+++ b/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
@@ -28,7 +28,7 @@ public class TestConnectorServiceManager {
 	private final AutoSetupTriggerManager autoSetupTriggerManager;
 
 	private final ConnectorTestServiceProxy connectorTestServiceProxy;
-	
+
 	@Value("${connector.test.service.url}")
 	private String connectorTestServiceURL;
 
@@ -45,13 +45,8 @@ public Map<String, String> verifyConnectorTestingThroughTestService(Customer cus
 					.apiKeyHeader(inputData.get("edcApiKey")).apiKeyValue(inputData.get("edcApiKeyValue"))
 					.connectorHost(inputData.get("controlPlaneEndpoint")).build();
 
-			try {
-				log.info("Waiting after connector setup to get pod up to test connector as data provider/consumer");
-				Thread.sleep(60000);
-			} catch (InterruptedException e) {
-
-				Thread.currentThread().interrupt();
-			}
+			log.info("Waiting after connector setup to get pod up to test connector as data provider/consumer");
+			Thread.sleep(60000);
 
 			ConnectorTestServiceResponse testResult = connectorTestServiceProxy
 					.verifyConnectorTestingThroughTestService(connectorTestRequest);
@@ -59,7 +54,7 @@ public Map<String, String> verifyConnectorTestingThroughTestService(Customer cus
 			log.info("Connector status: " + testResult.getMessage());
 
 			inputData.put("connectorTestResult", testResult.getMessage());
-			
+
 			inputData.put("testServiceURL", connectorTestServiceURL);
 
 			autoSetupTriggerDetails.setStatus(TriggerStatusEnum.SUCCESS.name());

From 7650c5cd257328d0ae8c947a584a7a7e14c2396e Mon Sep 17 00:00:00 2001
From: adkumar1 <aditya.kumar@t-systems.com>
Date: Thu, 23 Mar 2023 11:54:53 +0530
Subject: [PATCH 04/15] 1.2.2 version

---
 CHANGELOG.md                   |   6 ++
 README.md                      |   4 +-
 charts/orchestrator/Chart.yaml |   4 +-
 charts/orchestrator/README.md  |   2 +-
 index.yaml                     | 105 +++++++++++++++++++++++++++++++++
 pom.xml                        |   2 +-
 6 files changed, 117 insertions(+), 6 deletions(-)
 create mode 100644 index.yaml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c966f59..ed01afb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [1.2.2] - 2023-03-23
+
+### Added
+ - Connector test service integration for managed connector connectivity test
+ - Update email template for connector status
+
 ## [1.2.1] - 2023-03-18
 
 ### Fixed
diff --git a/README.md b/README.md
index 6dce7be2..2778b049 100644
--- 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.2.1
-Helm release version: 1.2.1
+Application version: 1.2.2
+Helm release version: 1.2.2
 ```
 
 
diff --git a/charts/orchestrator/Chart.yaml b/charts/orchestrator/Chart.yaml
index 78be3efe..c3e16efc 100644
--- a/charts/orchestrator/Chart.yaml
+++ b/charts/orchestrator/Chart.yaml
@@ -38,14 +38,14 @@ 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.2.1
+version: 1.2.2
 
 
 # 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.2.1"
+appVersion: "1.2.2"
 dependencies:
   - condition: postgresql.enabled
     name: postgresql
diff --git a/charts/orchestrator/README.md b/charts/orchestrator/README.md
index 7d130d31..c5b6b4e0 100644
--- a/charts/orchestrator/README.md
+++ b/charts/orchestrator/README.md
@@ -1,6 +1,6 @@
 # autosetup
 
-![Version: 1.2.1](https://img.shields.io/badge/Version-1.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.1](https://img.shields.io/badge/AppVersion-1.2.1-informational?style=flat-square)
+![Version: 1.2.2](https://img.shields.io/badge/Version-1.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.2](https://img.shields.io/badge/AppVersion-1.2.2-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/index.yaml b/index.yaml
new file mode 100644
index 00000000..4227ecfa
--- /dev/null
+++ b/index.yaml
@@ -0,0 +1,105 @@
+apiVersion: v1
+entries:
+  autosetup:
+  - apiVersion: v2
+    appVersion: 1.2.2
+    created: "2023-03-23T11:52:03.751385+05:30"
+    dependencies:
+    - condition: postgresql.enabled
+      name: postgresql
+      repository: https://charts.bitnami.com/bitnami
+      version: 11.x.x
+    description: This service will help service provider to set up DFT/SDE with EDC
+      and EDC as service in service provider environment.
+    digest: cfe3552cc5cb1a6af6a42f0db1ec3c539cce7dfdfe92f16a03222f3b2c061335
+    name: autosetup
+    sources:
+    - https://github.com/eclipse-tractusx/autosetup-backend
+    type: application
+    urls:
+    - https://catenax-ng.github.io/tx-autosetup-backend/autosetup-1.2.2.tgz
+    version: 1.2.2
+  - apiVersion: v2
+    appVersion: 1.2.1
+    created: "2023-03-23T11:52:03.747811+05:30"
+    dependencies:
+    - condition: postgresql.enabled
+      name: postgresql
+      repository: https://charts.bitnami.com/bitnami
+      version: 11.x.x
+    description: This service will help service provider to set up DFT/SDE with EDC
+      and EDC as service in service provider environment.
+    digest: d786a44bcefc16692922febb7e2aa8c8cf1e9c26a90f5f7f9ab96bd7be7ab6d3
+    name: autosetup
+    sources:
+    - https://github.com/eclipse-tractusx/autosetup-backend
+    type: application
+    urls:
+    - https://catenax-ng.github.io/tx-autosetup-backend/autosetup-1.2.1.tgz
+    version: 1.2.1
+  - apiVersion: v2
+    appVersion: 1.2.0
+    created: "2023-03-23T11:52:03.744139+05:30"
+    dependencies:
+    - condition: postgresql.enabled
+      name: postgresql
+      repository: https://charts.bitnami.com/bitnami
+      version: 11.x.x
+    description: This service will help service provider to set up DFT/SDE with EDC
+      and EDC as service in service provider environment.
+    digest: 445bb07d54c5122c0a77d167217a7177da0714d302aa394fc6c758a46c8d2fb5
+    name: autosetup
+    sources:
+    - https://github.com/eclipse-tractusx/autosetup-backend
+    type: application
+    urls:
+    - https://catenax-ng.github.io/tx-autosetup-backend/autosetup-1.2.0.tgz
+    version: 1.2.0
+  - apiVersion: v2
+    appVersion: 1.1.5
+    created: "2023-03-23T11:52:03.739837+05:30"
+    dependencies:
+    - condition: postgresql.enabled
+      name: postgresql
+      repository: https://charts.bitnami.com/bitnami
+      version: 11.x.x
+    description: A Helm chart for Kubernetes
+    digest: 04563b2e84ff94388d09e3645699f47be07fbc985fccc4dbc5997b6c754608bd
+    name: autosetup
+    sources:
+    - https://github.com/eclipse-tractusx/autosetup-backend
+    type: application
+    urls:
+    - https://catenax-ng.github.io/tx-autosetup-backend/autosetup-1.1.5.tgz
+    version: 1.1.5
+  - apiVersion: v2
+    appVersion: 1.1.4
+    created: "2023-03-23T11:52:03.736098+05:30"
+    dependencies:
+    - condition: postgresql.enabled
+      name: postgresql
+      repository: https://charts.bitnami.com/bitnami
+      version: 11.x.x
+    description: A Helm chart for Kubernetes
+    digest: 31f30dfcab47c6a905522d96508d0c810995504b9cebe76bdf428b735298c7b6
+    name: autosetup
+    type: application
+    urls:
+    - https://catenax-ng.github.io/tx-autosetup-backend/autosetup-1.1.4.tgz
+    version: 1.1.4
+  - apiVersion: v2
+    appVersion: 0.0.8
+    created: "2023-03-23T11:52:03.73211+05:30"
+    dependencies:
+    - condition: postgresql.enabled
+      name: postgresql
+      repository: https://charts.bitnami.com/bitnami
+      version: 11.x.x
+    description: A Helm chart for Kubernetes
+    digest: fc8fbb6b7f5ca9ba828c217ccf260e06ee4fa6ed3633568ce7d74cdf5f0c1051
+    name: autosetup
+    type: application
+    urls:
+    - https://catenax-ng.github.io/tx-autosetup-backend/autosetup-1.1.3.tgz
+    version: 1.1.3
+generated: "2023-03-23T11:52:03.726464+05:30"
diff --git a/pom.xml b/pom.xml
index 588b3abd..dffd5254 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.eclipse.tractusx</groupId>
 	<artifactId>auto-setup</artifactId>
-	<version>1.2.1</version>
+	<version>1.2.2</version>
 	<name>auto-setup</name>
 	<description>auto-setup</description>
 	<properties>

From e640e63a579a6898bd97b64b0c20b80e01564cd4 Mon Sep 17 00:00:00 2001
From: Sachin Argade <sachin.argade@t-systems.com>
Date: Thu, 23 Mar 2023 12:08:02 +0530
Subject: [PATCH 05/15] sonar fix

---
 .../manager/TestConnectorServiceManager.java     | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java b/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
index a60a2061..89979a0c 100644
--- a/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
+++ b/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
@@ -18,6 +18,7 @@
 import org.springframework.stereotype.Service;
 
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
 @Service
@@ -45,8 +46,7 @@ public Map<String, String> verifyConnectorTestingThroughTestService(Customer cus
 					.apiKeyHeader(inputData.get("edcApiKey")).apiKeyValue(inputData.get("edcApiKeyValue"))
 					.connectorHost(inputData.get("controlPlaneEndpoint")).build();
 
-			log.info("Waiting after connector setup to get pod up to test connector as data provider/consumer");
-			Thread.sleep(60000);
+			waitingTime();
 
 			ConnectorTestServiceResponse testResult = connectorTestServiceProxy
 					.verifyConnectorTestingThroughTestService(connectorTestRequest);
@@ -74,4 +74,16 @@ public Map<String, String> verifyConnectorTestingThroughTestService(Customer cus
 		return inputData;
 	}
 
+	@SneakyThrows
+	private void waitingTime() {
+		
+		try {
+			log.info("Waiting after connector setup to get pod up to test connector as data provider/consumer");
+			Thread.sleep(60000);
+		} catch (InterruptedException e) {
+
+			Thread.currentThread().interrupt();
+		}
+	}
+
 }

From 4b63c8ed14e88ff6f1e492584ea3c3d2dee99be7 Mon Sep 17 00:00:00 2001
From: Sachin Argade <sachin.argade@t-systems.com>
Date: Fri, 24 Mar 2023 10:24:52 +0530
Subject: [PATCH 06/15] test execution fix

---
 .../tractusx/autosetup/manager/DFTBackendManagerTest.java       | 2 +-
 src/test/resources/application-test.properties                  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/eclipse/tractusx/autosetup/manager/DFTBackendManagerTest.java b/src/test/java/org/eclipse/tractusx/autosetup/manager/DFTBackendManagerTest.java
index c901d277..272bea8f 100644
--- a/src/test/java/org/eclipse/tractusx/autosetup/manager/DFTBackendManagerTest.java
+++ b/src/test/java/org/eclipse/tractusx/autosetup/manager/DFTBackendManagerTest.java
@@ -63,7 +63,7 @@ void managePackage() {
 		mockInputMap.put("dnsNameURLProtocol", "https");
 		Map<String, String> resultMap = dftBackendManager.managePackage(null, AppActions.CREATE, selectedTools,
 				mockInputMap, null);
-		assertEquals(18, resultMap.size());
+		assertEquals(17, resultMap.size());
 		assertEquals("test", mockInputMap.get("dnsName"));
 	}
 }
\ No newline at end of file
diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties
index 224024dc..57d6dc56 100644
--- a/src/test/resources/application-test.properties
+++ b/src/test/resources/application-test.properties
@@ -36,6 +36,8 @@ vault.url=test
 vault.token=test
 vault.timeout=30
 
+#Connector Test service details
+connector.test.service.url=test
 
 #Portal interface info
 portal.url=test

From 5f1acdb1414c166f7d52df7d3c0adb230a6483d6 Mon Sep 17 00:00:00 2001
From: Sachin Argade <sachin.argade@t-systems.com>
Date: Mon, 27 Mar 2023 20:35:46 +0530
Subject: [PATCH 07/15] Avoid autosetup failure on connector test failed

---
 .../manager/TestConnectorServiceManager.java  |  6 ++++--
 .../service/EDCConnectorWorkFlow.java         | 21 ++++++++++++++-----
 .../resources/flyway/V1__auto-setup-table.sql |  4 ++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java b/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
index 89979a0c..32ff3272 100644
--- a/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
+++ b/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
@@ -46,6 +46,8 @@ public Map<String, String> verifyConnectorTestingThroughTestService(Customer cus
 					.apiKeyHeader(inputData.get("edcApiKey")).apiKeyValue(inputData.get("edcApiKeyValue"))
 					.connectorHost(inputData.get("controlPlaneEndpoint")).build();
 
+			inputData.put("testServiceURL", connectorTestServiceURL);
+
 			waitingTime();
 
 			ConnectorTestServiceResponse testResult = connectorTestServiceProxy
@@ -55,12 +57,12 @@ public Map<String, String> verifyConnectorTestingThroughTestService(Customer cus
 
 			inputData.put("connectorTestResult", testResult.getMessage());
 
-			inputData.put("testServiceURL", connectorTestServiceURL);
-
 			autoSetupTriggerDetails.setStatus(TriggerStatusEnum.SUCCESS.name());
 
 		} catch (Exception ex) {
 
+			inputData.put("connectorTestResult", "The automatic test wasn't successfully completed");
+			
 			log.error("ConnectorTestService failed retry attempt: : {}",
 					RetrySynchronizationManager.getContext().getRetryCount() + 1);
 
diff --git a/src/main/java/org/eclipse/tractusx/autosetup/service/EDCConnectorWorkFlow.java b/src/main/java/org/eclipse/tractusx/autosetup/service/EDCConnectorWorkFlow.java
index 38b11c58..892f2f51 100644
--- a/src/main/java/org/eclipse/tractusx/autosetup/service/EDCConnectorWorkFlow.java
+++ b/src/main/java/org/eclipse/tractusx/autosetup/service/EDCConnectorWorkFlow.java
@@ -29,6 +29,7 @@
 
 import org.eclipse.tractusx.autosetup.constant.AppActions;
 import org.eclipse.tractusx.autosetup.entity.AutoSetupTriggerEntry;
+import org.eclipse.tractusx.autosetup.exception.ServiceException;
 import org.eclipse.tractusx.autosetup.manager.AppDeleteManager;
 import org.eclipse.tractusx.autosetup.manager.CertificateManager;
 import org.eclipse.tractusx.autosetup.manager.ConnectorRegistrationManager;
@@ -43,9 +44,11 @@
 import org.springframework.stereotype.Component;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 @Component
 @RequiredArgsConstructor
+@Slf4j
 public class EDCConnectorWorkFlow {
 
 	private final CertificateManager certificateManager;
@@ -72,8 +75,12 @@ public Map<String, String> getWorkFlow(Customer customerDetails, SelectedTools t
 		inputConfiguration.putAll(
 				connectorRegistrationManager.registerConnector(customerDetails, tool, inputConfiguration, triger));
 
-		inputConfiguration.putAll(testConnectorServiceManager.verifyConnectorTestingThroughTestService(customerDetails,
-				inputConfiguration, triger));
+		try {
+			inputConfiguration.putAll(testConnectorServiceManager
+					.verifyConnectorTestingThroughTestService(customerDetails, inputConfiguration, triger));
+		} catch (ServiceException ex) {
+			log.warn(ex.getMessage());
+		}
 
 		return inputConfiguration;
 	}
@@ -99,9 +106,13 @@ public Map<String, String> getWorkFlowSeparateCPandDP(Customer customerDetails,
 				edcDataplaneManager.managePackage(customerDetails, workflowAction, tool, inputConfiguration, triger));
 		inputConfiguration.putAll(
 				connectorRegistrationManager.registerConnector(customerDetails, tool, inputConfiguration, triger));
-		
-		inputConfiguration.putAll(testConnectorServiceManager.verifyConnectorTestingThroughTestService(customerDetails,
-				inputConfiguration, triger));
+
+		try {
+			inputConfiguration.putAll(testConnectorServiceManager
+					.verifyConnectorTestingThroughTestService(customerDetails, inputConfiguration, triger));
+		} catch (ServiceException ex) {
+			log.warn(ex.getMessage());
+		}
 
 		return inputConfiguration;
 	}
diff --git a/src/main/resources/flyway/V1__auto-setup-table.sql b/src/main/resources/flyway/V1__auto-setup-table.sql
index 2c26c246..73490e53 100644
--- a/src/main/resources/flyway/V1__auto-setup-table.sql
+++ b/src/main/resources/flyway/V1__auto-setup-table.sql
@@ -112,7 +112,7 @@ connector.discovery.token-url=$\{sde.connector.discovery.token-url\}
 
 connector.discovery.clientId=$\{sde.connector.discovery.clientId\}
 
-connector.discovery.clientSecret=$\{sde.connector.discovery.clientSecret\}', NULL, 'sde-backend/dftbackend', '1.9.0', 'helm.packages', 'v1alpha1', '{"dftpostgresql": {"enabled": true, "auth" : {"secretKeys":{"password":"$\{postgresPassword}"\},"username":"$\{username\}","database":"$\{database\}"}},"ingresses":[{"enabled": true, "hostname":"$\{dnsName\}",  "annotations": {}, "className": "nginx", "endpoints":["default"], "tls":{"enabled":true, "secretName":"dftbackend"}, "certManager":{"clusterIssuer":"letsencrypt-prod"}}], "configuration": {"properties": "$\{yamlValues\}"}}', 'PROPERTY');
+connector.discovery.clientSecret=$\{sde.connector.discovery.clientSecret\}', NULL, 'sde-backend/dftbackend', '2.0.0', 'helm.packages', 'v1alpha1', '{"dftpostgresql": {"enabled": true, "primary":{"persistence":{"size" :"1Gi"}},"persistence":{"size" :"1Gi"}, "auth" : {"secretKeys":{"password":"$\{postgresPassword}"\},"username":"$\{username\}","database":"$\{database\}"}},"ingresses":[{"enabled": true, "hostname":"$\{dnsName\}",  "annotations": {}, "className": "nginx", "endpoints":["default"], "tls":{"enabled":true, "secretName":"dftbackend"}, "certManager":{"clusterIssuer":"letsencrypt-prod"}}], "configuration": {"properties": "$\{yamlValues\}"}}', 'PROPERTY');
 INSERT INTO app_tbl
 (app_name, context_cluster, context_namespace, expected_input_data, output_data, package_identifier, package_version, plugin_name, plugin_version, required_yaml_configuration, yaml_value_field_type)
 VALUES('DFT_FRONTEND', 'default', 'kubeapps', 'REACT_APP_API_URL=$\{dftBackEndUrl\}
@@ -125,7 +125,7 @@ REACT_APP_CLIENT_ID=$\{dftfrontendkeycloakclientid\}
 
 REACT_APP_DEFAULT_COMPANY_BPN=$\{bpnNumber\}
 
-REACT_APP_FILESIZE=268435456', NULL, 'sde-frontend/dftfrontend', '1.9.0', 'helm.packages', 'v1alpha1', '{"ingresses":[{"enabled": true, "hostname":"$\{dnsName\}",  "annotations": {}, "className": "nginx", "endpoints":["default"], "tls":{"enabled":true, "secretName":"dftfrontend"}, "certManager":{"clusterIssuer":"letsencrypt-prod"}}], "configuration": {"properties": "$\{yamlValues\}"}}', 'PROPERTY');
+REACT_APP_FILESIZE=268435456', NULL, 'sde-frontend/dftfrontend', '2.0.0', 'helm.packages', 'v1alpha1', '{"ingresses":[{"enabled": true, "hostname":"$\{dnsName\}",  "annotations": {}, "className": "nginx", "endpoints":["default"], "tls":{"enabled":true, "secretName":"dftfrontend"}, "certManager":{"clusterIssuer":"letsencrypt-prod"}}], "configuration": {"properties": "$\{yamlValues\}"}}', 'PROPERTY');
 INSERT INTO app_tbl
 (app_name, context_cluster, context_namespace, expected_input_data, output_data, package_identifier, package_version, plugin_name, plugin_version, required_yaml_configuration, yaml_value_field_type)
 VALUES('EDC_CONTROLPLANE', 'default', 'kubeapps', 'edc.receiver.http.endpoint=$\{dftAddress\}

From 224b95b5481a91af6576b835559b12dd91dd586f Mon Sep 17 00:00:00 2001
From: adityagajbhiye <adityagajbhiye1@gmail.com>
Date: Mon, 27 Mar 2023 20:42:31 +0530
Subject: [PATCH 08/15] workflow update

---
 .github/workflows/build.yaml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2cca8069..079f09c3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -25,7 +25,7 @@ name: build
 on:
   push:
     branches:
-      - main
+      - support-test-connector-service
     paths:
       - './**'
     tags:
@@ -65,13 +65,7 @@ jobs:
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}
-            type=semver,pattern={{major}}.{{minor}}
-          flavor: |
-              latest=true
+            type=semver,pattern={{version}},value=v1.2.2
 
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'

From 0af100cf347ab838a740bb428f5c7fae01b4dedd Mon Sep 17 00:00:00 2001
From: Sachin Argade <sachin.argade@t-systems.com>
Date: Mon, 27 Mar 2023 20:42:49 +0530
Subject: [PATCH 09/15] vercode Vulnerability fix

---
 pom.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dffd5254..2b2cc7d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>6.0.7</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -138,7 +143,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>net.minidev</groupId>
+			<artifactId>json-smart</artifactId>
+			<version>2.4.9</version>
+		</dependency>
 		<!-- Thanks for using https://jar-download.com -->
 		<dependency>
 			<groupId>org.flywaydb</groupId>
@@ -208,6 +217,12 @@
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-oauth2-client</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>net.minidev</groupId>
+					<artifactId>json-smart</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>

From 3fc049178c6dd020da2e36715972b672ae7c348d Mon Sep 17 00:00:00 2001
From: adkumar1 <aditya.kumar@t-systems.com>
Date: Thu, 30 Mar 2023 11:23:34 +0530
Subject: [PATCH 10/15] test connector

---
 CHANGELOG.md |   3 +-
 index.yaml   | 105 ---------------------------------------------------
 2 files changed, 2 insertions(+), 106 deletions(-)
 delete mode 100644 index.yaml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed01afb7..bdc555db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
+ - NA
 
-## [1.2.2] - 2023-03-23
+## [1.2.2] - 2023-03-30
 
 ### Added
  - Connector test service integration for managed connector connectivity test
diff --git a/index.yaml b/index.yaml
deleted file mode 100644
index 4227ecfa..00000000
--- a/index.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-apiVersion: v1
-entries:
-  autosetup:
-  - apiVersion: v2
-    appVersion: 1.2.2
-    created: "2023-03-23T11:52:03.751385+05:30"
-    dependencies:
-    - condition: postgresql.enabled
-      name: postgresql
-      repository: https://charts.bitnami.com/bitnami
-      version: 11.x.x
-    description: This service will help service provider to set up DFT/SDE with EDC
-      and EDC as service in service provider environment.
-    digest: cfe3552cc5cb1a6af6a42f0db1ec3c539cce7dfdfe92f16a03222f3b2c061335
-    name: autosetup
-    sources:
-    - https://github.com/eclipse-tractusx/autosetup-backend
-    type: application
-    urls:
-    - https://catenax-ng.github.io/tx-autosetup-backend/autosetup-1.2.2.tgz
-    version: 1.2.2
-  - apiVersion: v2
-    appVersion: 1.2.1
-    created: "2023-03-23T11:52:03.747811+05:30"
-    dependencies:
-    - condition: postgresql.enabled
-      name: postgresql
-      repository: https://charts.bitnami.com/bitnami
-      version: 11.x.x
-    description: This service will help service provider to set up DFT/SDE with EDC
-      and EDC as service in service provider environment.
-    digest: d786a44bcefc16692922febb7e2aa8c8cf1e9c26a90f5f7f9ab96bd7be7ab6d3
-    name: autosetup
-    sources:
-    - https://github.com/eclipse-tractusx/autosetup-backend
-    type: application
-    urls:
-    - https://catenax-ng.github.io/tx-autosetup-backend/autosetup-1.2.1.tgz
-    version: 1.2.1
-  - apiVersion: v2
-    appVersion: 1.2.0
-    created: "2023-03-23T11:52:03.744139+05:30"
-    dependencies:
-    - condition: postgresql.enabled
-      name: postgresql
-      repository: https://charts.bitnami.com/bitnami
-      version: 11.x.x
-    description: This service will help service provider to set up DFT/SDE with EDC
-      and EDC as service in service provider environment.
-    digest: 445bb07d54c5122c0a77d167217a7177da0714d302aa394fc6c758a46c8d2fb5
-    name: autosetup
-    sources:
-    - https://github.com/eclipse-tractusx/autosetup-backend
-    type: application
-    urls:
-    - https://catenax-ng.github.io/tx-autosetup-backend/autosetup-1.2.0.tgz
-    version: 1.2.0
-  - apiVersion: v2
-    appVersion: 1.1.5
-    created: "2023-03-23T11:52:03.739837+05:30"
-    dependencies:
-    - condition: postgresql.enabled
-      name: postgresql
-      repository: https://charts.bitnami.com/bitnami
-      version: 11.x.x
-    description: A Helm chart for Kubernetes
-    digest: 04563b2e84ff94388d09e3645699f47be07fbc985fccc4dbc5997b6c754608bd
-    name: autosetup
-    sources:
-    - https://github.com/eclipse-tractusx/autosetup-backend
-    type: application
-    urls:
-    - https://catenax-ng.github.io/tx-autosetup-backend/autosetup-1.1.5.tgz
-    version: 1.1.5
-  - apiVersion: v2
-    appVersion: 1.1.4
-    created: "2023-03-23T11:52:03.736098+05:30"
-    dependencies:
-    - condition: postgresql.enabled
-      name: postgresql
-      repository: https://charts.bitnami.com/bitnami
-      version: 11.x.x
-    description: A Helm chart for Kubernetes
-    digest: 31f30dfcab47c6a905522d96508d0c810995504b9cebe76bdf428b735298c7b6
-    name: autosetup
-    type: application
-    urls:
-    - https://catenax-ng.github.io/tx-autosetup-backend/autosetup-1.1.4.tgz
-    version: 1.1.4
-  - apiVersion: v2
-    appVersion: 0.0.8
-    created: "2023-03-23T11:52:03.73211+05:30"
-    dependencies:
-    - condition: postgresql.enabled
-      name: postgresql
-      repository: https://charts.bitnami.com/bitnami
-      version: 11.x.x
-    description: A Helm chart for Kubernetes
-    digest: fc8fbb6b7f5ca9ba828c217ccf260e06ee4fa6ed3633568ce7d74cdf5f0c1051
-    name: autosetup
-    type: application
-    urls:
-    - https://catenax-ng.github.io/tx-autosetup-backend/autosetup-1.1.3.tgz
-    version: 1.1.3
-generated: "2023-03-23T11:52:03.726464+05:30"

From 3588837371f74f21b15b882b268e57b1b5c88bd9 Mon Sep 17 00:00:00 2001
From: Sachin Argade <sachin.argade@t-systems.com>
Date: Mon, 3 Apr 2023 09:37:30 +0530
Subject: [PATCH 11/15] add missing copyright header

---
 .../manager/TestConnectorServiceManager.java  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java b/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
index 32ff3272..379ebb09 100644
--- a/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
+++ b/src/main/java/org/eclipse/tractusx/autosetup/manager/TestConnectorServiceManager.java
@@ -1,3 +1,23 @@
+/********************************************************************************
+ * Copyright (c) 2022, 2023 T-Systems International GmbH
+ * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
 package org.eclipse.tractusx.autosetup.manager;
 
 import java.util.Map;

From e87719793c61812ba4326ee4669aa8c2e4716993 Mon Sep 17 00:00:00 2001
From: adkumar1 <aditya.kumar@t-systems.com>
Date: Mon, 3 Apr 2023 12:07:48 +0530
Subject: [PATCH 12/15] Update build.yaml

---
 .github/workflows/build.yaml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 079f09c3..2cca8069 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -25,7 +25,7 @@ name: build
 on:
   push:
     branches:
-      - support-test-connector-service
+      - main
     paths:
       - './**'
     tags:
@@ -65,7 +65,13 @@ jobs:
           images: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=semver,pattern={{version}},value=v1.2.2
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}
+          flavor: |
+              latest=true
 
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'

From b94ca76f949696a43c3a2a5f466943939b078ab1 Mon Sep 17 00:00:00 2001
From: adkumar1 <aditya.kumar@t-systems.com>
Date: Mon, 3 Apr 2023 12:11:56 +0530
Subject: [PATCH 13/15] Update ConnectorTestRequest.java

---
 .../proxy/ConnectorTestRequest.java           | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestRequest.java b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestRequest.java
index 6f8cd1a0..a8b18727 100644
--- a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestRequest.java
+++ b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestRequest.java
@@ -1,3 +1,23 @@
+/********************************************************************************
+ * Copyright (c) 2022, 2023 T-Systems International GmbH
+ * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
 package org.eclipse.tractusx.autosetup.testservice.proxy;
 
 import lombok.Builder;

From 0a1ae92f7a296319838f1650c09f3b0e0f2305f2 Mon Sep 17 00:00:00 2001
From: adkumar1 <aditya.kumar@t-systems.com>
Date: Mon, 3 Apr 2023 12:12:11 +0530
Subject: [PATCH 14/15] Update ConnectorTestServiceProxy.java

---
 .../proxy/ConnectorTestServiceProxy.java      | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java
index 2358c5ac..62fc44ea 100644
--- a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java
+++ b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceProxy.java
@@ -1,3 +1,23 @@
+/********************************************************************************
+ * Copyright (c) 2022, 2023 T-Systems International GmbH
+ * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
 package org.eclipse.tractusx.autosetup.testservice.proxy;
 
 import org.springframework.cloud.openfeign.FeignClient;

From 134b1c09fe2a148c545b9bd2ba8a532a63bc995c Mon Sep 17 00:00:00 2001
From: adkumar1 <aditya.kumar@t-systems.com>
Date: Mon, 3 Apr 2023 12:12:26 +0530
Subject: [PATCH 15/15] Update ConnectorTestServiceResponse.java

---
 .../proxy/ConnectorTestServiceResponse.java   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceResponse.java b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceResponse.java
index 8c00c7bf..fc6497e9 100644
--- a/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceResponse.java
+++ b/src/main/java/org/eclipse/tractusx/autosetup/testservice/proxy/ConnectorTestServiceResponse.java
@@ -1,3 +1,23 @@
+/********************************************************************************
+ * Copyright (c) 2022, 2023 T-Systems International GmbH
+ * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
 package org.eclipse.tractusx.autosetup.testservice.proxy;
 
 import lombok.Data;