From d97199eb633aebf193dfd959127c365716496f7b Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Mon, 16 Sep 2024 16:01:15 +0200 Subject: [PATCH] chore: clean JSON-LD context output wip --- deployment/assets/env/consumer_connector.env | 1 + deployment/assets/env/provider_catalogserver.env | 1 + deployment/assets/env/provider_connector_manufacturing.env | 1 + deployment/assets/env/provider_connector_qna.env | 1 + .../org/eclipse/edc/demo/dcp/core/DcpPatchExtension.java | 3 ++- gradle/libs.versions.toml | 5 ++--- launchers/catalog-server/build.gradle.kts | 1 - 7 files changed, 8 insertions(+), 5 deletions(-) diff --git a/deployment/assets/env/consumer_connector.env b/deployment/assets/env/consumer_connector.env index a94c3095..cd5dad1c 100644 --- a/deployment/assets/env/consumer_connector.env +++ b/deployment/assets/env/consumer_connector.env @@ -21,6 +21,7 @@ EDC_PARTICIPANT_ID="did:web:localhost%3A7083" EDC_CATALOG_CACHE_EXECUTION_DELAY_SECONDS=5 EDC_CATALOG_CACHE_EXECUTION_PERIOD_SECONDS=10 EDC_MVD_PARTICIPANTS_LIST_FILE="deployment/assets/participants/participants.local.json" +EDC_MANAGEMENT_CONTEXT_ENABLED=true # dataplane specific config EDC_RUNTIME_ID="consumer-embedded-runtime" diff --git a/deployment/assets/env/provider_catalogserver.env b/deployment/assets/env/provider_catalogserver.env index 3c9be156..ec4c5d5f 100644 --- a/deployment/assets/env/provider_catalogserver.env +++ b/deployment/assets/env/provider_catalogserver.env @@ -13,3 +13,4 @@ EDC_IAM_STS_PRIVATEKEY_ALIAS="did:web:localhost%3A7093-alias" EDC_IAM_STS_PUBLICKEY_ID="did:web:localhost%3A7093#key-1" EDC_DSP_CALLBACK_ADDRESS="http://localhost:8092/api/dsp" EDC_PARTICIPANT_ID="did:web:localhost%3A7093" +EDC_MANAGEMENT_CONTEXT_ENABLED=true \ No newline at end of file diff --git a/deployment/assets/env/provider_connector_manufacturing.env b/deployment/assets/env/provider_connector_manufacturing.env index b75b5d48..52b89473 100644 --- a/deployment/assets/env/provider_connector_manufacturing.env +++ b/deployment/assets/env/provider_connector_manufacturing.env @@ -21,6 +21,7 @@ EDC_PARTICIPANT_ID="did:web:localhost%3A7093" EDC_CATALOG_CACHE_EXECUTION_DELAY_SECONDS=5 EDC_CATALOG_CACHE_EXECUTION_PERIOD_SECONDS=10 EDC_MVD_PARTICIPANTS_LIST_FILE="deployment/assets/participants/participants.local.json" +EDC_MANAGEMENT_CONTEXT_ENABLED=true # dataplane specific config EDC_RUNTIME_ID="provider-manufacturing-embedded-runtime" diff --git a/deployment/assets/env/provider_connector_qna.env b/deployment/assets/env/provider_connector_qna.env index d6f74b43..8d10fdc6 100644 --- a/deployment/assets/env/provider_connector_qna.env +++ b/deployment/assets/env/provider_connector_qna.env @@ -21,6 +21,7 @@ EDC_PARTICIPANT_ID="did:web:localhost%3A7093" EDC_CATALOG_CACHE_EXECUTION_DELAY_SECONDS=5 EDC_CATALOG_CACHE_EXECUTION_PERIOD_SECONDS=10 EDC_MVD_PARTICIPANTS_LIST_FILE="deployment/assets/participants/participants.local.json" +EDC_MANAGEMENT_CONTEXT_ENABLED=true # dataplane specific config EDC_RUNTIME_ID="provider-qna-embedded-runtime" diff --git a/extensions/dcp-impl/src/main/java/org/eclipse/edc/demo/dcp/core/DcpPatchExtension.java b/extensions/dcp-impl/src/main/java/org/eclipse/edc/demo/dcp/core/DcpPatchExtension.java index d33e9094..47e0af81 100644 --- a/extensions/dcp-impl/src/main/java/org/eclipse/edc/demo/dcp/core/DcpPatchExtension.java +++ b/extensions/dcp-impl/src/main/java/org/eclipse/edc/demo/dcp/core/DcpPatchExtension.java @@ -32,6 +32,7 @@ import java.util.Map; import java.util.Set; +import static org.eclipse.edc.iam.verifiablecredentials.spi.validation.TrustedIssuerRegistry.WILDCARD; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; public class DcpPatchExtension implements ServiceExtension { @@ -60,7 +61,7 @@ public void initialize(ServiceExtensionContext context) { signatureSuiteRegistry.register(VcConstants.JWS_2020_SIGNATURE_SUITE, suite); // register dataspace issuer - trustedIssuerRegistry.addIssuer(new Issuer("did:example:dataspace-issuer", Map.of())); + trustedIssuerRegistry.register(new Issuer("did:example:dataspace-issuer", Map.of()), WILDCARD); // register a default scope provider var contextMappingFunction = new DefaultScopeMappingFunction(Set.of( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4d1c7a2e..949c4699 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -39,7 +39,6 @@ edc-config-filesystem = { module = "org.eclipse.edc:configuration-filesystem", v edc-auth-tokenbased = { module = "org.eclipse.edc:auth-tokenbased", version.ref = "edc" } edc-auth-configuration = { module = "org.eclipse.edc:auth-configuration", version.ref = "edc" } edc-api-management-config = { module = "org.eclipse.edc:management-api-configuration", version.ref = "edc" } -edc-api-management-jsonld-context = { module = "org.eclipse.edc:management-api-json-ld-context", version.ref = "edc" } edc-api-version = { module = "org.eclipse.edc:version-api", version.ref = "edc" } edc-api-management = { module = "org.eclipse.edc:management-api", version.ref = "edc" } edc-api-management-asset = { module = "org.eclipse.edc:asset-api", version.ref = "edc" } @@ -166,8 +165,8 @@ dpf = ["edc-dpf-selector-core", "edc-spi-dataplane-selector", "edc-dpf-selector- connector = ["edc-boot", "edc-core-connector", "edc-ext-http", "edc-ext-observability", "edc-ext-jsonld"] -controlplane = ["edc-controlplane-core", "edc-config-filesystem", "edc-auth-tokenbased", "edc-auth-configuration", "edc-api-management", "edc-api-management-config", - "edc-api-management-jsonld-context","edc-api-management-edr","edc-api-management-dataplaneselector", +controlplane = ["edc-controlplane-core", "edc-config-filesystem", "edc-auth-tokenbased", "edc-auth-configuration", "edc-api-management", + "edc-api-management-config", "edc-api-management-edr","edc-api-management-dataplaneselector", "edc-api-observability", "edc-dsp", "edc-spi-jwt", "edc-ext-http", "edc-controlplane-callback-dispatcher-event", "edc-controlplane-callback-dispatcher-http", "edc-identity-core-did", "edc-dcp-core", "edc-identity-trust-transform", "edc-api-control-configuration", "edc-lib-transform", "edc-identity-vc-ldp", "edc-did-web", "edc-lib-jws2020", "edc-core-edrstore", "edc-edr-storereceiver"] diff --git a/launchers/catalog-server/build.gradle.kts b/launchers/catalog-server/build.gradle.kts index 2051a15a..fefbc97d 100644 --- a/launchers/catalog-server/build.gradle.kts +++ b/launchers/catalog-server/build.gradle.kts @@ -25,7 +25,6 @@ dependencies { runtimeOnly(libs.bundles.connector) // base runtime runtimeOnly(libs.edc.api.management) runtimeOnly(libs.edc.api.management.config) - runtimeOnly(libs.edc.api.management.jsonld.context) runtimeOnly(libs.edc.controlplane.core) //default store impls, etc. runtimeOnly(libs.edc.controlplane.services) // aggregate services runtimeOnly(libs.edc.dsp) // protocol webhook