Skip to content

Commit

Permalink
feat: decentralised authority
Browse files Browse the repository at this point in the history
feat: decentralised authority
  • Loading branch information
Yalz authored Jan 29, 2024
2 parents 390d110 + b3f0356 commit a2c5cb2
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
id: meta
uses: docker/metadata-action@v4
with:
images: ${{ env.REGISTRY }}/Informatievlaanderen/vsds-dataspace-connector/federated-catalog
images: ${{ env.REGISTRY }}/Informatievlaanderen/vsds-dataspace-connector/federated-authority
tags: |
type=raw,value={{date 'YYYYMMDDHHmmss'}}
type=raw,value=latest
Expand All @@ -39,6 +39,6 @@ jobs:
with:
context: .
push: true
file: ./federated-catalog-connector/Dockerfile
file: ./federated-authority-connector/Dockerfile
tags: ${{ steps.meta.outputs.tags }}
platforms: linux/amd64,linux/arm64
4 changes: 2 additions & 2 deletions README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ To create the images run the following docker commands from the root directory:
docker build -t vsds-dataspace-connector:local . -f ./http-pull-connector/Dockerfile
```

2. Image for the federated catalog connector
2. Image for the federated authority connector
```bash
docker build -t vsds-federated-catalog-connector:local . -f ./federated-catalog-connector/Dockerfile
docker build -t vsds-federated-authority-connector:local . -f ./federated-authority-connector/Dockerfile
```

> **Note**: These connectors are not production ready and should only be used for development purposes.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN ./gradlew clean build
# Run the jar file
FROM openjdk:18-ea-bullseye
WORKDIR /app
COPY --from=build /app/federated-catalog-connector/build/libs/federated-catalog-connector.jar .
COPY --from=build /app/federated-authority-connector/build/libs/federated-authority-connector.jar .

# Specify the command to run your application
CMD java -Dedc.fs.config=$EDC_FS_CONFIG -Dfcc.directory.file=$FCC_DIRECTORY_FILE -jar /app/federated-catalog-connector.jar
CMD java -Dedc.fs.config=$EDC_FS_CONFIG -Dfcc.directory.file=$FCC_DIRECTORY_FILE -jar /app/federated-authority-connector.jar
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ dependencies {
runtimeOnly(libs.edc.catalog.core)
runtimeOnly(libs.edc.catalog.api)
implementation(libs.edc.catalog.spi)

// Filesystem config
implementation(libs.edc.configuration.filesystem)
implementation(libs.edc.vault.filesystem)

implementation(libs.edc.util)
runtimeOnly(libs.edc.spi.jsonld)
Expand All @@ -33,7 +36,18 @@ dependencies {

// IDS stuff
runtimeOnly(libs.edc.dsp)
runtimeOnly(libs.edc.iam.mock)

// Identity Hub
runtimeOnly(libs.bundles.identity)
runtimeOnly(libs.ih.core.verifier)
runtimeOnly(libs.ih.ext.api)
runtimeOnly(libs.ih.ext.credentials.jwt)
runtimeOnly(libs.ih.ext.verifier.jwt)

// Registration service
runtimeOnly(libs.rs.core)
runtimeOnly(libs.rs.core.credential.service)
runtimeOnly(libs.rs.ext.api)
}

application {
Expand All @@ -45,6 +59,6 @@ var distZip = tasks.getByName("distZip")

tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
mergeServiceFiles()
archiveFileName.set("federated-catalog-connector.jar")
archiveFileName.set("federated-authority-connector.jar")
dependsOn(distTar, distZip)
}
11 changes: 11 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ edc-data-plane-selector-core = { module = "org.eclipse.edc:data-plane-selector-c
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-ext-identity-did-core = { module = "org.eclipse.edc:identity-did-core", version.ref = "edc" }
edc-ext-identity-did-service = { module = "org.eclipse.edc:identity-did-service", version.ref = "edc" }
edc-ext-identity-did-web = { module = "org.eclipse.edc:identity-did-web", 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-core = { module = "org.eclipse.edc:jersey-core", version.ref = "edc" }
Expand All @@ -65,6 +68,10 @@ edc-transfer-spi = { module = "org.eclipse.edc:transfer-spi", 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" }
ih-core-verifier = { module = "org.eclipse.edc:identity-hub-credentials-verifier", version.ref = "edc" }
ih-ext-api = { module = "org.eclipse.edc:identity-hub-api", version.ref = "edc" }
ih-ext-credentials-jwt = { module = "org.eclipse.edc:identity-hub-credentials-jwt", version.ref = "edc" }
ih-ext-verifier-jwt = { module = "org.eclipse.edc:identity-hub-verifier-jwt", 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 All @@ -74,9 +81,13 @@ junit-pioneer = { module = "org.junit-pioneer:junit-pioneer", version.ref = "jun
okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp-mockwebserver" }
opentelemetry-annotations = { module = "io.opentelemetry:opentelemetry-extension-annotations", version.ref = "openTelemetry" }
restAssured = { module = "io.rest-assured:rest-assured", version.ref = "restAssured" }
rs-core = { module = "org.eclipse.edc:registration-service", version.ref = "edc" }
rs-core-credential-service = { module = "org.eclipse.edc:registration-service-credential-service", version.ref = "edc" }
rs-ext-api = { module = "org.eclipse.edc:registration-service-api", version.ref = "edc" }

[bundles]
edc-connector = ["edc-boot", "edc-connector-core", "edc-jersey-core", "edc-api-observability"]
identity = ["edc-ext-identity-did-core", "edc-ext-identity-did-service", "edc-ext-identity-did-web"]

[plugins]
shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
15 changes: 13 additions & 2 deletions http-pull-connector/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,23 @@ dependencies {

implementation(libs.edc.control.plane.core)
implementation(libs.edc.dsp)

// Filesystem config
implementation(libs.edc.configuration.filesystem)
implementation(libs.edc.vault.filesystem)
implementation(libs.edc.iam.mock)

// DID Web
runtimeOnly(libs.bundles.identity)

// Identity Hub
runtimeOnly(libs.ih.core.verifier)
runtimeOnly(libs.ih.ext.api)
runtimeOnly(libs.ih.ext.credentials.jwt)
runtimeOnly(libs.ih.ext.verifier.jwt)


implementation(libs.edc.management.api)
implementation(libs.edc.transfer.data.plane)
// implementation(libs.edc.transfer.pull.http.receiver)
implementation(libs.edc.transfer.pull.http.dynamic.receiver)

implementation(libs.edc.control.plane.api.client)
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ dependencyResolutionManagement {
}

include("http-pull-connector")
include("federated-catalog-connector")
include("federated-authority-connector")

0 comments on commit a2c5cb2

Please sign in to comment.