chore: initial

eclipse-tractusx · Dec 5, 2024 · f5d0d27 · f5d0d27
1 parent d6452f2
commit f5d0d27
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 20 deletions.
diff --git a/local/bdrs/application.properties b/local/bdrs/application.properties
@@ -5,5 +5,4 @@ web.http.directory.port=8582
 web.http.directory.path=/api/directory
 # looking up DIDs should not use https
 edc.iam.did.web.use.https=false
-edc.iam.trusted-issuer.issuer.id=did:web:mock-util-service/trusted-issuer
 _level=DEBUG
diff --git a/local/docker-compose-infrastructure.yaml b/local/docker-compose-infrastructure.yaml
@@ -17,7 +17,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-version: "3"
 
 services:
   # Outcommented as not updated for R24.05 but scheduled for R24.08
@@ -104,6 +103,7 @@ services:
     environment:
       WEB_HTTP_PORT: 8580
       WEB_HTTP_PATH: /api
+      edc.iam.trusted-issuer.issuer.id: did:web:mock-util-service/trusted-issuer
     ports:
       - "127.0.0.1:8580:8580"
       - "127.0.0.1:8581:8581"

diff --git a/local/docker-compose.yaml b/local/docker-compose.yaml
@@ -18,7 +18,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-version: "3"
+
 services:
 
   puris-frontend-customer:
@@ -73,6 +73,11 @@ services:
       SPRING_DATASOURCE_URL: jdbc:postgresql://postgres-all:5432/puris_customer
       SPRING_DATASOURCE_USERNAME: ${PG_USER}
       SPRING_DATASOURCE_PASSWORD: ${PG_PW}
+      puris.dtr.idp.edc-client.id: ${KC_MANAGE_CLIENT_ID}
+      puris.dtr.idp.edc-client.secret.alias: ${CUSTOMER_KC_DTR_PURIS_CLIENT_ALIAS}
+      puris.dtr.idp.puris-client.id: ${KC_MANAGE_CLIENT_ID}
+      puris.dtr.idp.puris-client.secret: ${CUSTOMER_KC_DTR_PURIS_CLIENT_SECRET}
+
     networks:
       - miw-net
     extra_hosts:
@@ -146,6 +151,13 @@ services:
     container_name: customer-control-plane
     env_file:
       - ./tractus-x-edc/config/customer/control-plane.properties
+    environment:
+#      edc.datasource.policy-monitor.name: policy-monitor
+#      edc.datasource.policy-monitor.url: jdbc:postgresql://postgres-all:5432/edc_customer
+#      edc.datasource.policy-monitor.user: ${PG_USER}
+#      edc.datasource.policy-monitor.password: ${PG_PW}
+      edc.iam.trusted-issuer.portal.id: did:web:mock-util-service/trusted-issuer
+
     ports:
       - "127.0.0.1:8180:8180"
       - "127.0.0.1:8181:8181"
@@ -181,6 +193,8 @@ services:
       - "127.0.0.1:8299:8299"
     env_file:
       - ./tractus-x-edc/config/customer/data-plane.properties
+    environment:
+      edc.iam.trusted-issuer.portal.id: did:web:mock-util-service/trusted-issuer
     networks:
       - miw-net
     extra_hosts:
@@ -238,6 +252,11 @@ services:
       SPRING_DATASOURCE_URL: jdbc:postgresql://postgres-all:5432/puris_supplier
       SPRING_DATASOURCE_USERNAME: ${PG_USER}
       SPRING_DATASOURCE_PASSWORD: ${PG_PW}
+      server.error.include-message: always
+      puris.dtr.idp.edc-client.id: ${KC_MANAGE_CLIENT_ID}
+      puris.dtr.idp.edc-client.secret.alias: ${SUPPLIER_KC_DTR_PURIS_CLIENT_ALIAS}
+      puris.dtr.idp.puris-client.id: ${KC_MANAGE_CLIENT_ID}
+      puris.dtr.idp.puris-client.secret: ${SUPPLIER_KC_DTR_PURIS_CLIENT_SECRET}
     networks:
       - miw-net
     extra_hosts:
@@ -297,6 +316,8 @@ services:
       retries: 20
     env_file:
       - ./tractus-x-edc/config/supplier/control-plane.properties
+    environment:
+      edc.iam.trusted-issuer.portal.id: did:web:mock-util-service/trusted-issuer
     networks:
       - miw-net
     extra_hosts:
@@ -321,6 +342,8 @@ services:
       - "127.0.0.1:9299:9299"
     env_file:
       - ./tractus-x-edc/config/supplier/data-plane.properties
+    environment:
+      edc.iam.trusted-issuer.portal.id: did:web:mock-util-service/trusted-issuer
     networks:
       - miw-net
     extra_hosts:

diff --git a/local/tractus-x-edc/config/customer/control-plane.properties b/local/tractus-x-edc/config/customer/control-plane.properties
@@ -31,7 +31,6 @@ edc.iam.sts.oauth.token.url=http://keycloak:8080/realms/miw_test/protocol/openid
 edc.iam.sts.oauth.client.id=${CUSTOMER_OAUTH_CLIENT_ID}
 edc.iam.sts.oauth.client.secret.alias=${CUSTOMER_OAUTH_SECRET_ALIAS}
 tx.edc.iam.sts.dim.url=http://mock-util-service:80/sts
-edc.iam.trusted-issuer.portal.id=did:web:mock-util-service/trusted-issuer
 # configure one Credential service for all (else pulled from did, nevertheless done)
 tx.iam.iatp.credentialservice.url=http://mock-util-service:80
 # don't use https during did resolving

diff --git a/local/tractus-x-edc/config/customer/data-plane.properties b/local/tractus-x-edc/config/customer/data-plane.properties
@@ -41,7 +41,6 @@ edc.iam.sts.oauth.token.url=http://keycloak:8080/realms/miw_test/protocol/openid
 edc.iam.sts.oauth.client.id=${CUSTOMER_OAUTH_CLIENT_ID}
 edc.iam.sts.oauth.client.secret.alias=${CUSTOMER_OAUTH_SECRET_ALIAS}
 edc.iam.sts.dim.url=http://mock-util-service:80/sts
-edc.iam.trusted-issuer.portal.id=did:web:mock-util-service/trusted-issuer
 # configure one Credential service for all (else pulled from did): https://github.com/eclipse-tractusx/tractusx-edc/blob/d7d3586ffc4ef03c858e38fde6bfa8687efa50c9/edc-extensions/bdrs-client/src/main/java/org/eclipse/tractusx/edc/identity/mapper/BdrsClientExtension.java#L50
 tx.iam.credentialservice.url=http://mock-util-service:80
 # don't use https during did resolving in catalog request

diff --git a/local/tractus-x-edc/config/customer/puris-backend.properties b/local/tractus-x-edc/config/customer/puris-backend.properties
@@ -1,5 +1,4 @@
 server.port=8081
-server.error.include-message=always
 puris.demonstrator.role=customer
 puris.baseurl=http://customer-backend:8081/
 puris.itemstocksubmodel.apiassetid=itemstocksubmodel-api-asset
@@ -19,10 +18,6 @@ puris.generatematerialcatenaxid=true
 puris.dtr.idp.enabled=true
 puris.dtr.idp.tokenurl=http://keycloak:8080/realms/Customer/protocol/openid-connect/token
 # Note: Currently DTR only allows one client, thus manage client must be used for all.
-puris.dtr.idp.edc-client.id=${KC_MANAGE_CLIENT_ID}
-puris.dtr.idp.edc-client.secret.alias=${CUSTOMER_KC_DTR_PURIS_CLIENT_ALIAS}
-puris.dtr.idp.puris-client.id=${KC_MANAGE_CLIENT_ID}
-puris.dtr.idp.puris-client.secret=${CUSTOMER_KC_DTR_PURIS_CLIENT_SECRET}
 
 puris.erpadapter.enabled=false
 puris.erpadapter.url=http://host.docker.internal:5555/

diff --git a/local/tractus-x-edc/config/supplier/control-plane.properties b/local/tractus-x-edc/config/supplier/control-plane.properties
@@ -32,7 +32,6 @@ edc.iam.sts.oauth.token.url=http://keycloak:8080/realms/miw_test/protocol/openid
 edc.iam.sts.oauth.client.id=${SUPPLIER_OAUTH_CLIENT_ID}
 edc.iam.sts.oauth.client.secret.alias=${SUPPLIER_OAUTH_SECRET_ALIAS}
 tx.edc.iam.sts.dim.url=http://mock-util-service:80/sts
-edc.iam.trusted-issuer.portal.id=did:web:mock-util-service/trusted-issuer
 # configure one Credential service for all (else pulled from did, nevertheless done)
 tx.iam.iatp.credentialservice.url=http://mock-util-service:80
 # don't use https during did resolving

diff --git a/local/tractus-x-edc/config/supplier/data-plane.properties b/local/tractus-x-edc/config/supplier/data-plane.properties
@@ -41,7 +41,6 @@ edc.iam.sts.oauth.token.url=http://keycloak:8080/realms/miw_test/protocol/openid
 edc.iam.sts.oauth.client.id=${SUPPLIER_OAUTH_CLIENT_ID}
 edc.iam.sts.oauth.client.secret.alias=${SUPPLIER_OAUTH_SECRET_ALIAS}
 edc.iam.sts.dim.url=http://mock-util-service:80/sts
-edc.iam.trusted-issuer.portal.id=did:web:mock-util-service/trusted-issuer
 # configure one Credential service for all (else pulled from did): https://github.com/eclipse-tractusx/tractusx-edc/blob/d7d3586ffc4ef03c858e38fde6bfa8687efa50c9/edc-extensions/bdrs-client/src/main/java/org/eclipse/tractusx/edc/identity/mapper/BdrsClientExtension.java#L50
 tx.iam.credentialservice.url=http://mock-util-service:80
 # don't use https during did resolving in catalog request

diff --git a/local/tractus-x-edc/config/supplier/puris-backend.properties b/local/tractus-x-edc/config/supplier/puris-backend.properties
@@ -1,5 +1,4 @@
 server.port=8082
-server.error.include-message=always
 puris.demonstrator.role=supplier
 puris.baseurl=http://supplier-backend:8082/
 puris.itemstocksubmodel.apiassetid=itemstocksubmodel-api-asset
@@ -19,10 +18,6 @@ puris.generatematerialcatenaxid=true
 puris.dtr.idp.enabled=true
 puris.dtr.idp.tokenurl=http://keycloak:8080/realms/Supplier/protocol/openid-connect/token
 # Note: Currently DTR only allows one client, thus manage client must be used for all.
-puris.dtr.idp.edc-client.id=${KC_MANAGE_CLIENT_ID}
-puris.dtr.idp.edc-client.secret.alias=${SUPPLIER_KC_DTR_PURIS_CLIENT_ALIAS}
-puris.dtr.idp.puris-client.id=${KC_MANAGE_CLIENT_ID}
-puris.dtr.idp.puris-client.secret=${SUPPLIER_KC_DTR_PURIS_CLIENT_SECRET}
 
 puris.erpadapter.enabled=false
 puris.erpadapter.url=http://host.docker.internal:5555/

diff --git a/local/tractus-x-edc/docker-compose.yaml b/local/tractus-x-edc/docker-compose.yaml
@@ -18,16 +18,16 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-version: "3"
+
 services:
   control-plane:
-    image: tractusx/edc-controlplane-postgresql-hashicorp-vault:0.8.0-rc3
+    image: tractusx/edc-controlplane-postgresql-hashicorp-vault:0.8.0
     volumes:
       - ./config/default/opentelemetry.properties:/app/opentelemetry.properties
       - ./config/default/logging.properties:/app/logging.properties
 
   data-plane:
-    image: tractusx/edc-dataplane-hashicorp-vault:0.8.0-rc3
+    image: tractusx/edc-dataplane-hashicorp-vault:0.8.0
     volumes:
       - ./config/default/opentelemetry.properties:/app/opentelemetry.properties
       - ./config/default/logging.properties:/app/logging.properties