Merge pull request #66 from catenax-ng/R1.2.3

Release 1.2.3

CHANGELOG.md

@@ -10,7 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [1.2.3] - 2023-04-07
 
 ### Fixed
- - Fix email sent issue for failure usecase of connector test
+ - Fixed email sent issue for failure use case of connector test
+ - Rename tractus-X connector app name because of ingress access issue
 
 ## [1.2.2] - 2023-03-30
 

index.yaml

@@ -3,15 +3,15 @@ entries:
   autosetup:
   - apiVersion: v2
     appVersion: 1.2.3
-    created: "2023-04-06T17:17:17.984689+05:30"
+    created: "2023-04-07T13:32:21.782177+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: b439fc3c7956666e21fa875444c560fc4c1c69df5ab39083b863137d91889cd9
+    digest: e9c421b9f3f4c1a9a4df37ac615fceca31c152fa13ae561e10c6cc99d0e247dc
     name: autosetup
     sources:
     - https://github.com/eclipse-tractusx/autosetup-backend
@@ -21,7 +21,7 @@ entries:
     version: 1.2.3
   - apiVersion: v2
     appVersion: 1.2.2
-    created: "2023-04-06T17:17:17.979259+05:30"
+    created: "2023-04-07T13:32:21.777224+05:30"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -39,7 +39,7 @@ entries:
     version: 1.2.2
   - apiVersion: v2
     appVersion: 1.2.1
-    created: "2023-04-06T17:17:17.973534+05:30"
+    created: "2023-04-07T13:32:21.768085+05:30"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -57,7 +57,7 @@ entries:
     version: 1.2.1
   - apiVersion: v2
     appVersion: 1.2.0
-    created: "2023-04-06T17:17:17.967028+05:30"
+    created: "2023-04-07T13:32:21.758319+05:30"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -75,7 +75,7 @@ entries:
     version: 1.2.0
   - apiVersion: v2
     appVersion: 1.1.5
-    created: "2023-04-06T17:17:17.954635+05:30"
+    created: "2023-04-07T13:32:21.748221+05:30"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -92,7 +92,7 @@ entries:
     version: 1.1.5
   - apiVersion: v2
     appVersion: 1.1.4
-    created: "2023-04-06T17:17:17.942228+05:30"
+    created: "2023-04-07T13:32:21.739225+05:30"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -107,7 +107,7 @@ entries:
     version: 1.1.4
   - apiVersion: v2
     appVersion: 0.0.8
-    created: "2023-04-06T17:17:17.936254+05:30"
+    created: "2023-04-07T13:32:21.728094+05:30"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -120,4 +120,4 @@ entries:
     urls:
     - https://catenax-ng.github.io/tx-autosetup-backend/autosetup-1.1.3.tgz
     version: 1.1.3
-generated: "2023-04-06T17:17:17.924166+05:30"
+generated: "2023-04-07T13:32:21.707683+05:30"

src/main/java/org/eclipse/tractusx/autosetup/constant/AppNameConstant.java

@@ -29,7 +29,7 @@ public enum AppNameConstant {
 
 	EDC_DATAPLANE,
 
-	TRACTUS_CONNECTOR,
+	EDC_CONNECTOR,
 
 	POSTGRES_DB,
 

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

@@ -20,7 +20,7 @@
 
 package org.eclipse.tractusx.autosetup.manager;
 
-import static org.eclipse.tractusx.autosetup.constant.AppNameConstant.TRACTUS_CONNECTOR;
+import static org.eclipse.tractusx.autosetup.constant.AppNameConstant.EDC_CONNECTOR;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -57,16 +57,16 @@ public Map<String, String> managePackage(Customer customerDetails, AppActions ac
 
 		Map<String, String> outputData = new HashMap<>();
 		AutoSetupTriggerDetails autoSetupTriggerDetails = AutoSetupTriggerDetails.builder()
-				.id(UUID.randomUUID().toString()).step(TRACTUS_CONNECTOR.name()).build();
+				.id(UUID.randomUUID().toString()).step(EDC_CONNECTOR.name()).build();
 		try {
 			String packageName = tool.getLabel();
 
 			outputData = connectorCommonUtilityManager.prepareConnectorInput(packageName, inputData);
 
 			if (AppActions.CREATE.equals(action))
-				appManagement.createPackage(TRACTUS_CONNECTOR, packageName, inputData);
+				appManagement.createPackage(EDC_CONNECTOR, packageName, inputData);
 			else
-				appManagement.updatePackage(TRACTUS_CONNECTOR, packageName, inputData);
+				appManagement.updatePackage(EDC_CONNECTOR, packageName, inputData);
 
 			autoSetupTriggerDetails.setStatus(TriggerStatusEnum.SUCCESS.name());
 

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

@@ -23,7 +23,7 @@
 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.POSTGRES_DB;
-import static org.eclipse.tractusx.autosetup.constant.AppNameConstant.TRACTUS_CONNECTOR;
+import static org.eclipse.tractusx.autosetup.constant.AppNameConstant.EDC_CONNECTOR;
 
 import java.util.Map;
 
@@ -89,7 +89,7 @@ public void deletePackageWorkFlow(SelectedTools tool, Map<String, String> inputC
 			AutoSetupTriggerEntry triger) {
 
 		appDeleteManager.deletePackage(POSTGRES_DB, tool, inputConfiguration, triger);
-		appDeleteManager.deletePackage(TRACTUS_CONNECTOR, tool, inputConfiguration, triger);
+		appDeleteManager.deletePackage(EDC_CONNECTOR, tool, inputConfiguration, triger);
 	}
 
 	public Map<String, String> getWorkFlowSeparateCPandDP(Customer customerDetails, SelectedTools tool,

src/main/resources/flyway/V4__rename-tractus-connector.sql

@@ -0,0 +1,21 @@
+/********************************************************************************
+ * Copyright (c) 2023 T-Systems International GmbH
+ * Copyright (c) 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
+ ********************************************************************************/
+
+UPDATE app_tbl set app_name='EDC_CONNECTOR' where app_name='TRACTUS_CONNECTOR';