From cb9de911fb46510be0cae4ef00774af27214db40 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Fri, 21 Jul 2023 10:18:06 +0200 Subject: [PATCH 1/2] chore: TRACEFOSS-XXX Updated to decentral flow --- tx-backend/src/main/resources/application-dev.yml | 3 +++ tx-backend/src/main/resources/application-e2e-a.yml | 3 +++ tx-backend/src/main/resources/application.yml | 1 - 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tx-backend/src/main/resources/application-dev.yml b/tx-backend/src/main/resources/application-dev.yml index 7a2a8616b7..0092831426 100644 --- a/tx-backend/src/main/resources/application-dev.yml +++ b/tx-backend/src/main/resources/application-dev.yml @@ -32,6 +32,9 @@ edc: irs-edc-client: callback-url: "https://traceability.dev.demo.catena-x.net/api/internal/endpoint-data-reference" + controlplane: + endpoint: + data: "https://tracex-consumer-controlplane.dev.demo.catena-x.net/management" digitalTwinRegistryClient: type: "decentral" diff --git a/tx-backend/src/main/resources/application-e2e-a.yml b/tx-backend/src/main/resources/application-e2e-a.yml index 3543f22bf6..73170b72d2 100644 --- a/tx-backend/src/main/resources/application-e2e-a.yml +++ b/tx-backend/src/main/resources/application-e2e-a.yml @@ -29,6 +29,9 @@ edc: irs-edc-client: callback-url: "https://traceability-e2e-a.dev.demo.catena-x.net/api/internal/endpoint-data-reference" + controlplane: + endpoint: + data: "https://tracex-consumer-controlplane.dev.demo.catena-x.net/management" digitalTwinRegistryClient: type: "decentral" diff --git a/tx-backend/src/main/resources/application.yml b/tx-backend/src/main/resources/application.yml index 1d63884db9..4eb093d6d6 100644 --- a/tx-backend/src/main/resources/application.yml +++ b/tx-backend/src/main/resources/application.yml @@ -43,7 +43,6 @@ edc: provider-edc-url: ${EDC_PROVIDER_URL} irs-edc-client: - callback-url: "https://traceability.dev.demo.catena-x.net/api/internal/endpoint-data-reference" # The URL where the EDR token callback will be sent to. controlplane: request-ttl: PT10M # How long to wait for an async EDC negotiation request to finish, ISO 8601 Duration endpoint: From ff0d9e8da0ae003f93d4d665bc1a6ea42b217674 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Fri, 21 Jul 2023 11:01:25 +0200 Subject: [PATCH 2/2] chore: TRACEFOSS-XXX Updated to decentral flow --- tx-backend/src/main/resources/application-e2e-a.yml | 2 +- tx-backend/src/main/resources/application-e2e-b.yml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tx-backend/src/main/resources/application-e2e-a.yml b/tx-backend/src/main/resources/application-e2e-a.yml index 73170b72d2..722d378b47 100644 --- a/tx-backend/src/main/resources/application-e2e-a.yml +++ b/tx-backend/src/main/resources/application-e2e-a.yml @@ -31,7 +31,7 @@ irs-edc-client: callback-url: "https://traceability-e2e-a.dev.demo.catena-x.net/api/internal/endpoint-data-reference" controlplane: endpoint: - data: "https://tracex-consumer-controlplane.dev.demo.catena-x.net/management" + data: "https://tx-edc-consumer-e2e-a-controlplane.dev.demo.catena-x.net/management" digitalTwinRegistryClient: type: "decentral" diff --git a/tx-backend/src/main/resources/application-e2e-b.yml b/tx-backend/src/main/resources/application-e2e-b.yml index e7cd42616a..402ab43fd8 100644 --- a/tx-backend/src/main/resources/application-e2e-b.yml +++ b/tx-backend/src/main/resources/application-e2e-b.yml @@ -29,8 +29,10 @@ edc: callback-urls: http://tx-irs-e2e-b:8181/internal/endpoint-data-reference irs-edc-client: - callback-url: "https://traceability-e2e-a.dev.demo.catena-x.net/api/internal/endpoint-data-reference" - + callback-url: "https://traceability-e2e-b.dev.demo.catena-x.net/api/internal/endpoint-data-reference" + controlplane: + endpoint: + data: "https://tx-edc-consumer-e2e-b-controlplane.dev.demo.catena-x.net/management" digitalTwinRegistryClient: type: "decentral" discoveryFinderUrl: "https://tracex-discovery-mock-e2e-b.dev.demo.catena-x.net/api/administration/connectors/discovery/search" # required if type is "decentral"