fix: review issues

eclipse-tractusx · Dec 11, 2024 · 98db761 · 98db761
1 parent f5d0d27
commit 98db761
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 6 deletions.
diff --git a/.github/workflows/trufflehog.yml b/.github/workflows/trufflehog.yml
@@ -53,7 +53,7 @@ jobs:
         with:
           path: ./  # Scan the entire repository
           base: "${{ github.event.repository.default_branch }}"  # Set base branch for comparison (pull requests)
-          extra_args: --filter-entropy=4 --results=verified,unknown --debug
+          extra_args: --filter-entropy=4 --results=verified,unknown --debug --exlude-paths=.thignore
 
       - name: Scan Results Status
         if: steps.trufflehog.outcome == 'failure'

diff --git a/.thignore b/.thignore
@@ -0,0 +1 @@
+local/.*
diff --git a/local/bdrs/application.properties b/local/bdrs/application.properties
@@ -6,3 +6,7 @@ web.http.directory.path=/api/directory
 # looking up DIDs should not use https
 edc.iam.did.web.use.https=false
 _level=DEBUG
+
+# The following property was moved to the docker-compose.yaml file's "environment" due to some technical docker compose issues:
+# https://github.com/docker/compose/issues/12123#issuecomment-2529442716
+#edc.iam.trusted-issuer.portal.id: did:web:mock-util-service/trusted-issuer
diff --git a/local/docker-compose.yaml b/local/docker-compose.yaml
@@ -152,10 +152,6 @@ services:
     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:
@@ -252,7 +248,6 @@ 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}

diff --git a/local/tractus-x-edc/config/customer/control-plane.properties b/local/tractus-x-edc/config/customer/control-plane.properties
@@ -61,3 +61,7 @@ edc.datasource.default.password=${PG_PW}
 # Data Encryption edc-extensions/data-encryption
 edc.data.encryption.keys.alias=${CUSTOMER_ENCRYPTION_KEYS_ALIAS}
 
+# The following property was moved to the docker-compose.yaml file's "environment" due to some technical docker compose issues:
+# https://github.com/docker/compose/issues/12123#issuecomment-2529442716
+#edc.iam.trusted-issuer.portal.id=did:web:mock-util-service/trusted-issuer
+
diff --git a/local/tractus-x-edc/config/customer/data-plane.properties b/local/tractus-x-edc/config/customer/data-plane.properties
@@ -49,3 +49,7 @@ edc.iam.did.web.use.https=false
 edc.dpf.selector.url=http://customer-control-plane:8183/api/controlplane/control/v1/dataplanes
 tx.edc.dpf.consumer.proxy.auth.apikey=${EDC_API_PW}
 edc.data.encryption.keys.alias=${CUSTOMER_ENCRYPTION_KEYS_ALIAS}
+
+# The following property was moved to the docker-compose.yaml file's "environment" due to some technical docker compose issues:
+# https://github.com/docker/compose/issues/12123#issuecomment-2529442716
+#edc.iam.trusted-issuer.portal.id=did:web:mock-util-service/trusted-issuer
diff --git a/local/tractus-x-edc/config/customer/puris-backend.properties b/local/tractus-x-edc/config/customer/puris-backend.properties
@@ -37,3 +37,10 @@ own.bpna=BPNA4444444444AA
 own.streetandnumber=13th Street 47
 own.zipcodeandcity=10011 New York
 own.country=USA
+
+# The following property was moved to the docker-compose.yaml file's "environment" due to some technical docker compose issues:
+# https://github.com/docker/compose/issues/12123#issuecomment-2529442716
+#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}
diff --git a/local/tractus-x-edc/config/supplier/control-plane.properties b/local/tractus-x-edc/config/supplier/control-plane.properties
@@ -62,3 +62,7 @@ edc.datasource.default.password=${PG_PW}
 # Data Encryption
 edc.data.encryption.keys.alias=${SUPPLIER_ENCRYPTION_KEYS_ALIAS}
 
+# The following property was moved to the docker-compose.yaml file's "environment" due to some technical docker compose issues:
+# https://github.com/docker/compose/issues/12123#issuecomment-2529442716
+#edc.iam.trusted-issuer.portal.id=did:web:mock-util-service/trusted-issuer
+
diff --git a/local/tractus-x-edc/config/supplier/data-plane.properties b/local/tractus-x-edc/config/supplier/data-plane.properties
@@ -49,3 +49,7 @@ edc.iam.did.web.use.https=false
 edc.dpf.selector.url=http://supplier-control-plane:9183/api/controlplane/control/v1/dataplanes
 tx.edc.dpf.consumer.proxy.auth.apikey=${EDC_API_PW}
 edc.data.encryption.keys.alias=${SUPPLIER_ENCRYPTION_KEYS_ALIAS}
+
+# The following property was moved to the docker-compose.yaml file's "environment" due to some technical docker compose issues:
+# https://github.com/docker/compose/issues/12123#issuecomment-2529442716
+#edc.iam.trusted-issuer.portal.id=did:web:mock-util-service/trusted-issuer
diff --git a/local/tractus-x-edc/config/supplier/puris-backend.properties b/local/tractus-x-edc/config/supplier/puris-backend.properties
@@ -38,4 +38,11 @@ own.streetandnumber=Wall Street 101
 own.zipcodeandcity=10001 New York
 own.country=USA
 
+# The following property was moved to the docker-compose.yaml file's "environment" due to some technical docker compose issues:
+# https://github.com/docker/compose/issues/12123#issuecomment-2529442716
+#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}
+