From 582d6d6fb661d60819c6bdccf55dab017742f941 Mon Sep 17 00:00:00 2001 From: Daniel Kurtz Date: Tue, 16 Jul 2024 15:26:11 +0200 Subject: [PATCH] Adjusted configuration of connectors for cloud deployment --- .github/workflows/bank.yml | 4 ++++ .github/workflows/company.yml | 4 ++++ .github/workflows/tax_advisor.yml | 4 ++++ src/edc-connector/bank_connector.Dockerfile | 7 +++++++ src/edc-connector/company_connector.Dockerfile | 7 +++++++ .../resources/configuration/bank-configuration.properties | 4 ---- .../configuration/company-configuration.properties | 4 ---- .../configuration/tax_advisor-configuration.properties | 4 ---- src/edc-connector/tax_advisor_connector.Dockerfile | 7 +++++++ 9 files changed, 33 insertions(+), 12 deletions(-) diff --git a/.github/workflows/bank.yml b/.github/workflows/bank.yml index 99ca800..2b55724 100644 --- a/.github/workflows/bank.yml +++ b/.github/workflows/bank.yml @@ -59,6 +59,10 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64 + build-args: | + EDC_DSP_CALLBACK_ADDRESS=https://bank.amos.cloudness.dev:443/protocol + EDC_DATAPLANE_API_PUBLIC_BASEURL=https://bank.amos.cloudness.dev:443/public + EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT=https://bank.amos.cloudness.dev:443/control/token # This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see "[AUTOTITLE](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds)." - name: Generate artifact attestation uses: actions/attest-build-provenance@v1 diff --git a/.github/workflows/company.yml b/.github/workflows/company.yml index 35ad489..1a80cf8 100644 --- a/.github/workflows/company.yml +++ b/.github/workflows/company.yml @@ -59,6 +59,10 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64 + build-args: | + EDC_DSP_CALLBACK_ADDRESS=https://company.amos.cloudness.dev:443/protocol + EDC_DATAPLANE_API_PUBLIC_BASEURL=https://company.amos.cloudness.dev:443/public + EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT=https://company.amos.cloudness.dev:443/control/token # This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see "[AUTOTITLE](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds)." - name: Generate artifact attestation uses: actions/attest-build-provenance@v1 diff --git a/.github/workflows/tax_advisor.yml b/.github/workflows/tax_advisor.yml index 695b8bf..afa15b4 100644 --- a/.github/workflows/tax_advisor.yml +++ b/.github/workflows/tax_advisor.yml @@ -59,6 +59,10 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64 + build-args: | + EDC_DSP_CALLBACK_ADDRESS=https://taxadvisor.amos.cloudness.dev:443/protocol + EDC_DATAPLANE_API_PUBLIC_BASEURL=https://taxadvisor.amos.cloudness.dev:443/public + EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT=https://taxadvisor.amos.cloudness.dev:443/control/token # This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see "[AUTOTITLE](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds)." - name: Generate artifact attestation uses: actions/attest-build-provenance@v1 diff --git a/src/edc-connector/bank_connector.Dockerfile b/src/edc-connector/bank_connector.Dockerfile index 55f4ced..9e2f5c1 100644 --- a/src/edc-connector/bank_connector.Dockerfile +++ b/src/edc-connector/bank_connector.Dockerfile @@ -12,5 +12,12 @@ RUN gradle connector:build ENV EDC_FS_CONFIG=resources/configuration/bank-configuration.properties +ARG EDC_DSP_CALLBACK_ADDRESS=http://bank:19194/protocol +ARG EDC_DATAPLANE_API_PUBLIC_BASEURL=http://bank:19291/public +ARG EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT=http://bank:19192/control/token +ENV EDC_DSP_CALLBACK_ADDRESS=${EDC_DSP_CALLBACK_ADDRESS} +ENV EDC_DATAPLANE_API_PUBLIC_BASEURL=${EDC_DATAPLANE_API_PUBLIC_BASEURL} +ENV EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT=${EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT} + CMD ["java", "-jar", "connector/build/libs/connector.jar"] diff --git a/src/edc-connector/company_connector.Dockerfile b/src/edc-connector/company_connector.Dockerfile index 59d3c7c..db58922 100644 --- a/src/edc-connector/company_connector.Dockerfile +++ b/src/edc-connector/company_connector.Dockerfile @@ -12,5 +12,12 @@ RUN gradle connector:build ENV EDC_FS_CONFIG=resources/configuration/company-configuration.properties +ARG EDC_DSP_CALLBACK_ADDRESS=http://company:19194/protocol +ARG EDC_DATAPLANE_API_PUBLIC_BASEURL=http://company:19291/public +ARG EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT=http://company:19192/control/token +ENV EDC_DSP_CALLBACK_ADDRESS=${EDC_DSP_CALLBACK_ADDRESS} +ENV EDC_DATAPLANE_API_PUBLIC_BASEURL=${EDC_DATAPLANE_API_PUBLIC_BASEURL} +ENV EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT=${EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT} + CMD ["java", "-jar", "connector/build/libs/connector.jar"] diff --git a/src/edc-connector/resources/configuration/bank-configuration.properties b/src/edc-connector/resources/configuration/bank-configuration.properties index 90a6f8d..2d83229 100644 --- a/src/edc-connector/resources/configuration/bank-configuration.properties +++ b/src/edc-connector/resources/configuration/bank-configuration.properties @@ -3,10 +3,6 @@ edc.participant.id=bank edc.api.auth.key=bank-pass -edc.dsp.callback.address=http://bank:19194/protocol -edc.dataplane.api.public.baseurl=http://bank:19291/public -edc.dataplane.token.validation.endpoint=http://bank:19192/control/token - edc.keystore=resources/certs/cert.pfx edc.keystore.password=123456 diff --git a/src/edc-connector/resources/configuration/company-configuration.properties b/src/edc-connector/resources/configuration/company-configuration.properties index 4eb1d41..f00d1f1 100644 --- a/src/edc-connector/resources/configuration/company-configuration.properties +++ b/src/edc-connector/resources/configuration/company-configuration.properties @@ -3,10 +3,6 @@ edc.participant.id=company edc.api.auth.key=company-pass -edc.dsp.callback.address=http://company:19194/protocol -edc.dataplane.api.public.baseurl=http://company:19291/public -edc.dataplane.token.validation.endpoint=http://company:19192/control/token - edc.keystore=resources/certs/cert.pfx edc.keystore.password=123456 diff --git a/src/edc-connector/resources/configuration/tax_advisor-configuration.properties b/src/edc-connector/resources/configuration/tax_advisor-configuration.properties index 1a69f07..3575530 100644 --- a/src/edc-connector/resources/configuration/tax_advisor-configuration.properties +++ b/src/edc-connector/resources/configuration/tax_advisor-configuration.properties @@ -3,10 +3,6 @@ edc.participant.id=taxadvisor edc.api.auth.key=taxadvisor-pass -edc.dsp.callback.address=http://taxadvisor:19194/protocol -edc.dataplane.api.public.baseurl=http://taxadvisor:19291/public -edc.dataplane.token.validation.endpoint=http://taxadvisor:19192/control/token - edc.keystore=resources/certs/cert.pfx edc.keystore.password=123456 diff --git a/src/edc-connector/tax_advisor_connector.Dockerfile b/src/edc-connector/tax_advisor_connector.Dockerfile index 8065f7e..f526879 100644 --- a/src/edc-connector/tax_advisor_connector.Dockerfile +++ b/src/edc-connector/tax_advisor_connector.Dockerfile @@ -12,5 +12,12 @@ RUN gradle connector:build ENV EDC_FS_CONFIG=resources/configuration/tax_advisor-configuration.properties +ARG EDC_DSP_CALLBACK_ADDRESS=http://taxadvisor:19194/protocol +ARG EDC_DATAPLANE_API_PUBLIC_BASEURL=http://taxadvisor:19291/public +ARG EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT=http://taxadvisor:19192/control/token +ENV EDC_DSP_CALLBACK_ADDRESS=${EDC_DSP_CALLBACK_ADDRESS} +ENV EDC_DATAPLANE_API_PUBLIC_BASEURL=${EDC_DATAPLANE_API_PUBLIC_BASEURL} +ENV EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT=${EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT} + CMD ["java", "-jar", "connector/build/libs/connector.jar"]