inputData) {
+ StringSubstitutor stringSubstitutor1 = new StringSubstitutor(inputData);
+ return stringSubstitutor1.replace(getRequestFile(requestTemplatePath));
+ }
+
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 8719d698..ebbc164c 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -129,4 +129,11 @@ 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
\ No newline at end of file
+managed.dt-registry=true
+managed.dt-registry.local=true
+
+#automatic storage Media for minio
+automatic.storage.media=true
+automatic.storage.media.minio.endpoint=${minio_endpoint}
+automatic.storage.media.minio.accessKey=${minio_accessKey}
+automatic.storage.media.minio.secretKey=${minio_secretKey}
\ No newline at end of file
diff --git a/src/main/resources/flyway/V9__update_app_version.sql b/src/main/resources/flyway/V9__update_app_version.sql
new file mode 100644
index 00000000..8b90c774
--- /dev/null
+++ b/src/main/resources/flyway/V9__update_app_version.sql
@@ -0,0 +1,316 @@
+/********************************************************************************
+ * 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 expected_input_data='{
+ "sdepostgresql":{
+ "enabled":true,
+ "primary":{
+ "persistence":{
+ "size":"1Gi"
+ }
+ },
+ "persistence":{
+ "size":"1Gi"
+ },
+ "auth":{
+ "postgresPassword":"$\{postgresPassword\}",
+ "password":"$\{postgresPassword\}",
+ "username":"$\{username\}",
+ "database":"$\{database\}"
+ }
+ },
+ "backend": {
+ "ingresses":[
+ {
+ "enabled":true,
+ "hostname":"$\{dnsName\}",
+ "annotations":{
+
+ },
+ "className":"nginx",
+ "endpoints":[
+ "default"
+ ],
+ "tls":{
+ "enabled":true,
+ "secretName":"sdebackend"
+ },
+ "certManager":{
+ "clusterIssuer":"letsencrypt-prod"
+ }
+ }
+ ],
+ "configuration":{
+ "properties": "server.port=8080
+
+ spring.main.allow-bean-definition-overriding=true
+
+ spring.servlet.multipart.enabled=true
+
+ spring.servlet.multipart.file-size-threshold=2KB
+
+ spring.servlet.multipart.max-file-size=200MB
+
+ spring.servlet.multipart.max-request-size=215MB
+
+ server.servlet.context-path=/backend/api
+
+ spring.flyway.baseline-on-migrate=true
+
+ spring.flyway.locations=classpath:/flyway
+
+ file.upload-dir=./temp/
+
+ logging.level.org.apache.http=info
+
+ logging.level.root=info
+
+ spring.datasource.driver-class-name=org.postgresql.Driver
+
+ spring.jpa.open-in-view=false
+
+ digital-twins.hostname=$\{dtregistryUrl\}
+
+ digital-twins.api=$\{dtregistryURI\}
+
+ digital-twins.authentication.url=$\{sde.digital-twins.authentication.url\}
+
+ digital-twins.authentication.clientId=$\{digital-twins.authentication.clientId\}
+
+ digital-twins.authentication.clientSecret=$\{digital-twins.authentication.clientSecret\}
+
+ digital-twins.authentication.grantType=client_credentials
+
+ dft.hostname=$\{sdeBackEndUrl\}
+
+ dft.apiKeyHeader=$\{sdeBackEndApiKeyHeader\}
+
+ dft.apiKey=$\{sdeBackEndApiKey\}
+
+ manufacturerId=$\{manufacturerId\}
+
+ edc.hostname=$\{controlPlaneEndpoint\}
+
+ edc.managementpath=/data
+
+ edc.managementpath.apiversion=/v2
+
+ edc.dsp.endpointpath=/api/v1/dsp
+
+ edc.dataplane.endpointpath=/api/public
+
+ edc.apiKeyHeader=$\{edcApiKey\}
+
+ edc.apiKey=$\{edcApiKeyValue\}
+
+ edc.consumer.hostname=$\{controlPlaneEndpoint\}
+
+ edc.consumer.apikeyheader=$\{edcApiKey\}
+
+ edc.consumer.apikey=$\{edcApiKeyValue\}
+
+ edc.consumer.managementpath=/data
+
+ edc.consumer.managementpath.apiversion=/v2
+
+ edc.consumer.protocol.path=/api/v1/dsp
+
+ keycloak.clientid=$\{sdebackendkeycloakclientid\}
+
+ spring.security.oauth2.resourceserver.jwt.issuer-uri=$\{sde.resourceServerIssuer\}
+
+ springdoc.api-docs.path=/api-docs
+
+ springdoc.swagger-ui.oauth.client-id=$\{sdebackendkeycloakclientid\}
+
+ partner.pool.hostname=$\{sde.partner.pool.hostname\}
+
+ partner.pool.authentication.url=$\{sde.partner.pool.authentication.url\}
+
+ partner.pool.clientId=$\{sde.partner.pool.clientId\}
+
+ partner.pool.clientSecret=$\{sde.partner.pool.clientSecret\}
+
+ partner.pool.grantType=client_credentials
+
+ portal.backend.hostname=$\{sde.portal.backend.hostname\}
+
+ portal.backend.authentication.url=$\{sde.portal.backend.authentication.url\}
+
+ portal.backend.clientId=$\{sde.portal.backend.clientId\}
+
+ portal.backend.clientSecret=$\{sde.portal.backend.clientSecret\}
+
+ portal.backend.grantType=client_credentials
+
+ bpndiscovery.hostname=$\{sde.bpndiscovery.hostname\}
+
+ discovery.authentication.url=$\{sde.discovery.authentication.url\}
+
+ discovery.clientId=$\{sde.discovery.clientId\}
+
+ discovery.clientSecret=$\{sde.discovery.clientSecret\}
+
+ discovery.grantType=client_credentials
+
+ mail.smtp.username=$\{emailUsername\}
+
+ mail.smtp.password=$\{emailPassword\}
+
+ mail.smtp.host=$\{emailHost\}
+
+ mail.smtp.port=$\{emailPort\}
+
+ mail.to.address=$\{emailTo\}
+
+ mail.cc.address=$\{emailCC\}
+
+ mail.from.address=$\{emailFrom\}
+
+ mail.replyto.address=$\{emailReply\}
+
+ mail.smtp.starttls.enable=true
+
+ mail.smtp.auth=true
+
+ sftp.host=$\{sftpHost\}
+
+ sftp.port=$\{sftpPort\}
+
+ sftp.username=$\{sftpUsername\}
+
+ sftp.password=$\{sftpPassword\}
+
+ sftp.accessKey=$\{sftpKey\}
+
+ sftp.location.tobeprocessed=/ToBeProcessed
+
+ sftp.location.inprogress=/InProgress
+
+ sftp.location.success=/Success
+
+ sftp.location.partialsucess=/PartialSuccess
+
+ sftp.location.failed=/Failed
+
+ retriever.name=minio
+
+ minio.endpoint=$\{storage.media.endpoint\}
+
+ minio.access-key=$\{storage.media.accessKey\}
+
+ minio.secret-key=$\{storage.media.secretKey\}
+
+ minio.bucket-name=$\{storage.media.bucket\}
+
+ minio.location.tobeprocessed=
+
+ minio.location.inprogress=/InProgress
+
+ minio.location.success=/Success
+
+ minio.location.partialsucess=/PartialSuccess
+
+ minio.location.failed=/Failed"
+ }
+ },
+ "frontend": {
+ "ingresses":[
+ {
+ "enabled":true,
+ "hostname":"$\{dnsName\}",
+ "annotations":{
+ "kubernetes.io/tls-acme": "true"
+ },
+ "className":"nginx",
+ "endpoints":[
+ "default"
+ ],
+ "tls":{
+ "enabled":true,
+ "secretName":"sdefrontend"
+ },
+ "certManager":{
+ "clusterIssuer":"letsencrypt-prod"
+ }
+ }
+ ],
+ "configuration":{
+ "properties":"REACT_APP_API_URL=$\{sdeBackEndUrl\}
+
+ REACT_APP_KEYCLOAK_URL=$\{sde.keycloak.auth\}
+
+ REACT_APP_KEYCLOAK_REALM=$\{sde.keycloak.realm\}
+
+ REACT_APP_CLIENT_ID=$\{sdefrontendkeycloakclientid\}
+
+ REACT_APP_DEFAULT_COMPANY_BPN=$\{bpnNumber\}
+
+ REACT_APP_FILESIZE=268435456"
+ }
+ }
+}', package_identifier='tx-sde-charts/sde' ,package_version='1.0.1' where app_name='SDE';
+
+
+update app_tbl set expected_input_data= '{
+ "enablePostgres": true,
+ "enableKeycloak": false,
+ "postgresql": {
+ "auth": {
+ "password":"$\{rgdbpass\}",
+ "postgresPassword":"$\{rgdbpass\}",
+ "username":"$\{rgusername\}",
+ "database":"$\{rgdatabase\}"
+ },
+ "primary":
+ {
+ "persistence":{
+ "size" :"1Gi"
+ }
+ },
+ "persistence": {
+ "size" :"1Gi"
+ }
+ },
+ "registry": {
+ "host": "$\{dnsName\}",
+ "idpClientId" : "$\{idpClientId\}",
+ "idpIssuerUri": "$\{idpIssuerUri\}",
+ "tenantId" : "$\{bpnNumber\}",
+ "authentication": $\{dtNeedExternalAccess\},
+ "ingress": {
+ "enabled": $\{dtNeedExternalAccess\},
+ "hostname": "$\{dnsName\}",
+ "annotations": {
+ "cert-manager.io/cluster-issuer": letsencrypt-prod,
+ "nginx.ingress.kubernetes.io/cors-allow-credentials": "true",
+ "nginx.ingress.kubernetes.io/enable-cors": "true",
+ "nginx.ingress.kubernetes.io/rewrite-target": /$2,
+ "nginx.ingress.kubernetes.io/use-regex": "true",
+ "nginx.ingress.kubernetes.io/x-forwarded-prefix": /$\{dtregistryUrlPrefix\}
+ },
+ "urlPrefix": /$\{dtregistryUrlPrefix\},
+ "className": "nginx",
+ "tls": $\{dtNeedExternalAccess\}
+ }
+ }
+}', 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,'\{','{'),'\}','}');
\ No newline at end of file
diff --git a/src/main/resources/edc-request-template/asset-request-filter.json b/src/main/resources/request-template/asset-request-filter.json
similarity index 100%
rename from src/main/resources/edc-request-template/asset-request-filter.json
rename to src/main/resources/request-template/asset-request-filter.json
diff --git a/src/main/resources/edc-request-template/asset.json b/src/main/resources/request-template/asset.json
similarity index 96%
rename from src/main/resources/edc-request-template/asset.json
rename to src/main/resources/request-template/asset.json
index 04b39933..10ac8a60 100644
--- a/src/main/resources/edc-request-template/asset.json
+++ b/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",
diff --git a/src/main/resources/edc-request-template/contract-defination.json b/src/main/resources/request-template/contract-defination.json
similarity index 100%
rename from src/main/resources/edc-request-template/contract-defination.json
rename to src/main/resources/request-template/contract-defination.json
diff --git a/src/main/resources/edc-request-template/policy.json b/src/main/resources/request-template/policy.json
similarity index 100%
rename from src/main/resources/edc-request-template/policy.json
rename to src/main/resources/request-template/policy.json
diff --git a/src/main/resources/request-template/s3-policy-template.json b/src/main/resources/request-template/s3-policy-template.json
new file mode 100644
index 00000000..b972fbfc
--- /dev/null
+++ b/src/main/resources/request-template/s3-policy-template.json
@@ -0,0 +1,31 @@
+{
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Effect": "Deny",
+ "Action": [
+ "s3:CreateBucket",
+ "s3:DeleteBucket",
+ "s3:ForceDeleteBucket"
+ ],
+ "Resource": [
+ "arn:aws:s3:::${bucket}/*",
+ "arn:aws:s3:::${bucket}*"
+ ]
+ },
+ {
+ "Effect": "Allow",
+ "Action": [
+ "s3:Put*",
+ "s3:DeleteObject",
+ "s3:DeleteObject*",
+ "s3:Get*",
+ "s3:List*"
+ ],
+ "Resource": [
+ "arn:aws:s3:::${bucket}*",
+ "arn:aws:s3:::${bucket}/*"
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/main/resources/templates/dt_success_template.html b/src/main/resources/templates/dt_success_template.html
index 1867ce9e..7aec4aed 100644
--- a/src/main/resources/templates/dt_success_template.html
+++ b/src/main/resources/templates/dt_success_template.html
@@ -36,8 +36,7 @@
The DT registry tool successfully activated for your use.
Please find your DT registry details below:
- DT registry URL : ${dtregistryUrl}
- App Id : ${idpClientId}
+ ${content}
Kind Regards
Catina-X
diff --git a/src/main/resources/templates/edc_success_activate.html b/src/main/resources/templates/edc_success_activate.html
index ac3c8404..0fef4055 100644
--- a/src/main/resources/templates/edc_success_activate.html
+++ b/src/main/resources/templates/edc_success_activate.html
@@ -34,15 +34,9 @@
diff --git a/src/main/resources/templates/success.html b/src/main/resources/templates/success.html
index 93eb24c1..ba2ccf92 100644
--- a/src/main/resources/templates/success.html
+++ b/src/main/resources/templates/success.html
@@ -31,9 +31,9 @@
Hello Team,
-
The Subcribe application deployed successfully for ${orgname}.
+
The subcribe application deployed successfully for ${orgname}.
please perform manually verification to activate application for customer use.
-
+ ${content}
Kind Regards
Catina-X