Skip to content

Commit

Permalink
Merge pull request #99 from amosproj/edc-version-bump
Browse files Browse the repository at this point in the history
Bump EDC version and seed initial data
  • Loading branch information
daku-de authored Jul 10, 2024
2 parents 72a882c + 157380c commit c3a677e
Show file tree
Hide file tree
Showing 6 changed files with 125 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/edc-connector/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ allprojects {
}

// EdcRuntimeExtension uses this to determine the runtime classpath of the module to run.
tasks.register("printClasspath") {
tasks.register("printGradleClasspath") {
doLast {
println(sourceSets["main"].runtimeClasspath.asPath)
}
Expand Down
10 changes: 8 additions & 2 deletions src/edc-connector/connector/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,21 @@ dependencies {
implementation(libs.edc.control.plane.core)
implementation(libs.edc.dsp)
implementation(libs.edc.configuration.filesystem)
implementation(libs.edc.vault.filesystem)
implementation(libs.edc.iam.mock)
implementation(libs.edc.management.api)
implementation(libs.edc.transfer.data.plane)
implementation(libs.edc.transfer.data.plane.signaling)
implementation(libs.edc.transfer.pull.http.receiver)
implementation(libs.edc.validator.data.address.http.data)

implementation(libs.edc.edr.cache.api)
implementation(libs.edc.edr.store.core)
implementation(libs.edc.edr.store.receiver)

implementation(libs.edc.data.plane.selector.api)
implementation(libs.edc.data.plane.selector.core)

implementation(libs.edc.data.plane.self.registration)

implementation(libs.edc.data.plane.control.api)
implementation(libs.edc.data.plane.public.api)
implementation(libs.edc.data.plane.core)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
/*
* Copyright (c) 2021 Microsoft Corporation
*
* This program and the accompanying materials are made available under the
* terms of the Apache License, Version 2.0 which is available at
* https://www.apache.org/licenses/LICENSE-2.0
*
* SPDX-License-Identifier: Apache-2.0
*
* Contributors:
* Microsoft Corporation - Initial implementation
*
*/

package org.eclipse.edc.extension.bootstrap;

import org.eclipse.edc.connector.controlplane.asset.spi.domain.Asset;
import org.eclipse.edc.connector.controlplane.asset.spi.index.AssetIndex;
import org.eclipse.edc.connector.controlplane.contract.spi.offer.store.ContractDefinitionStore;
import org.eclipse.edc.connector.controlplane.contract.spi.types.offer.ContractDefinition;
import org.eclipse.edc.connector.controlplane.policy.spi.PolicyDefinition;
import org.eclipse.edc.connector.controlplane.policy.spi.store.PolicyDefinitionStore;
import org.eclipse.edc.policy.model.Policy;
import org.eclipse.edc.runtime.metamodel.annotation.Inject;
import org.eclipse.edc.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.edc.spi.types.domain.DataAddress;

import java.util.HashMap;
import java.util.Map;

import static org.eclipse.edc.spi.query.Criterion.criterion;

public class BootstrapLoaderExtension implements ServiceExtension {
@Inject
private AssetIndex assetIndex;
@Inject
private PolicyDefinitionStore policyDefinitionStore;
@Inject
private ContractDefinitionStore contractDefinitionStore;

@Override
public String name() {
return "Bootstrap Loader";
}

@Override
public void initialize(ServiceExtensionContext context) {
var policy = createPolicy();
policyDefinitionStore.create(policy);

//registerDataEntries();
//registerContractDefinition(policy.getId());
}

public void registerDataEntries() {
Map<String, Object> dataAddressProperties = new HashMap<>();
dataAddressProperties.put("baseUrl", "URL");
dataAddressProperties.put("method", "GET");
var dataAddress = DataAddress.Builder.newInstance()
.type("HttpData")
.property("name", "test.txt")
.property("proxyPath", "true")
.properties(dataAddressProperties)
.build();
Map<String, Object> assetProperties = new HashMap<>();
assetProperties.put("name", "test.txt");
assetProperties.put("description", "A default asset");
assetProperties.put("contenttype", "text/plain");
assetProperties.put("date", "2024-01-01");
assetProperties.put("size", "200 Bytes");
assetProperties.put("author", "Daniel Kurtz");

var asset = Asset.Builder.newInstance()
.id("default-asset")
.dataAddress(dataAddress)
.properties(assetProperties)
.build();
assetIndex.create(asset);
}

public void registerContractDefinition(String policyId) {
var contractDefinition = ContractDefinition.Builder.newInstance()
.id("1")
.accessPolicyId(policyId)
.contractPolicyId(policyId)
.assetsSelectorCriterion(criterion(Asset.PROPERTY_ID, "=", "default-asset"))
.build();

contractDefinitionStore.save(contractDefinition);
}

private PolicyDefinition createPolicy() {
Policy policy = Policy.Builder.newInstance()
.build();

PolicyDefinition definition = PolicyDefinition.Builder.newInstance()
.policy(policy)
.privateProperty("name", "Default policy")
.privateProperty("description", "This policy allows every access.")
.build();

return definition;
}
}
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
org.eclipse.edc.extension.status.StatusEndpointExtension
org.eclipse.edc.extension.status.StatusEndpointExtension
org.eclipse.edc.extension.bootstrap.BootstrapLoaderExtension
11 changes: 8 additions & 3 deletions src/edc-connector/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ format.version = "1.1"
[versions]
assertj = "3.25.3"
awaitility = "4.2.1"
edc = "0.6.0"
edc = "0.7.0"
jakarta-json = "2.0.1"
junit-pioneer = "2.2.0"
jupiter = "5.10.2"
Expand Down Expand Up @@ -38,9 +38,13 @@ edc-data-plane-http = { module = "org.eclipse.edc:data-plane-http", version.ref
edc-data-plane-kafka = { module = "org.eclipse.edc:data-plane-kafka", version.ref = "edc" }
edc-data-plane-selector-api = { module = "org.eclipse.edc:data-plane-selector-api", version.ref = "edc" }
edc-data-plane-selector-core = { module = "org.eclipse.edc:data-plane-selector-core", version.ref = "edc" }
edc-data-plane-self-registration = { module = "org.eclipse.edc:data-plane-self-registration", version.ref = "edc" }
edc-data-plane-spi = { module = "org.eclipse.edc:data-plane-spi", version.ref = "edc" }
edc-data-plane-util = { module = "org.eclipse.edc:data-plane-util", version.ref = "edc" }
edc-dsp = { module = "org.eclipse.edc:dsp", version.ref = "edc" }
edc-edr-cache-api = { module = "org.eclipse.edc:edr-cache-api", version.ref = "edc" }
edc-edr-store-core = { module = "org.eclipse.edc:edr-store-core", version.ref = "edc" }
edc-edr-store-receiver = { module = "org.eclipse.edc:edr-store-receiver", version.ref = "edc" }
edc-http = { module = "org.eclipse.edc:http", version.ref = "edc" }
edc-iam-mock = { module = "org.eclipse.edc:iam-mock", version.ref = "edc" }
edc-jersey-micrometer = { module = "org.eclipse.edc:jersey-micrometer", version.ref = "edc" }
Expand All @@ -54,12 +58,13 @@ edc-monitor-jdk-logger = { module = "org.eclipse.edc:monitor-jdk-logger", versio
edc-provision-aws-s3 = { module = "org.eclipse.edc:provision-aws-s3", version.ref = "edc" }
edc-runtime-metamodel = { module = "org.eclipse.edc:runtime-metamodel", version.ref = "edc" }
edc-transfer-data-plane = { module = "org.eclipse.edc:transfer-data-plane", version.ref = "edc" }
edc-transfer-data-plane-signaling = { module = "org.eclipse.edc:transfer-data-plane-signaling", version.ref = "edc" }
edc-transfer-process-api = { module = "org.eclipse.edc:transfer-process-api", version.ref = "edc" }
edc-transfer-pull-http-receiver = { module = "org.eclipse.edc:transfer-pull-http-receiver", version.ref = "edc" }
edc-transfer-pull-http-receiver = { module = "org.eclipse.edc:transfer-pull-http-dynamic-receiver", version.ref = "edc" }
edc-transfer-pull-http-dynamic-receiver = { module = "org.eclipse.edc:transfer-pull-http-dynamic-receiver", version.ref = "edc" }
edc-util = { module = "org.eclipse.edc:util", version.ref = "edc" }
edc-vault-azure = { module = "org.eclipse.edc:vault-azure", version.ref = "edc" }
edc-vault-filesystem = { module = "org.eclipse.edc:vault-filesystem", version.ref = "edc" }
edc-validator-data-address-http-data = { module = "org.eclipse.edc:validator-data-address-http-data", version.ref = "edc" }
jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsApi" }
jakartaJson = { module = "org.glassfish:jakarta.json", version.ref = "jakarta-json" }
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" }
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/app/api/connector-functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ function generateNegotiateContract(contractOfferId: string, assetId: string, cou
"@context": "http://www.w3.org/ns/odrl.jsonld",
"@id": contractOfferId,
"@type": "Offer",
"assigner": "provider",
"assigner": counterPartyName,
"target": assetId
}
};
Expand Down

0 comments on commit c3a677e

Please sign in to comment.