feat: VSDSPUB-1315: Cleanup EDC (#10)

* feat: remove the federated-authority-connector module and all references to it

* feat: revert back to use mock-iam for http-pull

* feat: rename http-pull-connector module to http-plane-headers-extension

* feat: adapt build script to publish artifact to Nexus

* feat: fix gradle build script to publish to Nexus

* feat: specify edc group name on root level and informatievlaanderen groupId in the publish task + adapt Dockerfile

.github/workflows/http-pull-connector-docker.yml → .github/workflows/http-plane-headers-extension-docker.yml

@@ -1,4 +1,4 @@
-name: Docker Image CI
+name: 1.b Build & Test Project
 
 on:
   workflow_dispatch:
@@ -39,6 +39,6 @@ jobs:
         with:
           context: .
           push: true
-          file: ./http-pull-connector/Dockerfile
+          file: ./http-plane-headers-extension/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
           platforms: linux/amd64,linux/arm64

.github/workflows/http-plane-headers-extension-nexus.yml

@@ -0,0 +1,35 @@
+name: 1.a Build & Test Project
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "main" ]
+
+env:
+  REGISTRY: ghcr.io
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Maven Central Repository
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'zulu'
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+          gpg-private-key: ${{ secrets.OSSRH_PGP_PRIVATE_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v3
+      - name: Build & Publish Package
+        run: ./gradlew clean build publish --stacktrace
+        env:
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          OSSRH_PGP_PRIVATE_KEY: ${{ secrets.OSSRH_PGP_PRIVATE_KEY }}
+          OSSRH_PGP_SECRET_KEY_PASSPHRASE: ${{ secrets.OSSRH_PGP_SECRET_KEY_PASSPHRASE }}

NOTICE.md

@@ -3,12 +3,12 @@
 Part of this project uses a modified version of the public api extension and http extension of the edc-connector from: https://github.com/eclipse-edc/Connector
 
 The following files were modified from their original source:
-- http-pull-connector/src/main/java/org/eclipse/org/eclipse/edc/connector/dataplane/api/controller/ContainerRequestContextApiImpl.java
-- http-pull-connector/src/main/java/org/eclipse/org/eclipse/edc/connector/dataplane/api/controller/DataFlowRequestSupplier.java
-- http-pull-connector/src/main/java/org/eclipse/edc/connector/dataplane/api/controller/ExtendedDataPlanePublicApiController.java
-- http-pull-connector/src/main/java/org/eclipse/edc/connector/dataplane/api/pipeline/ApiDataSink.java
-- http-pull-connector/src/main/java/org/eclipse/edc/connector/dataplane/api/pipeline/ApiDataSinkFactory.java
-- http-pull-connector/src/main/java/org/eclipse/edc/connector/dataplane/api/DataPlanePublicApiExtension.java
-- http-pull-connector/src/main/java/org/eclipse/edc/connector/dataplane/http/pipeline/datasink/HttpDataSink.java
-- http-pull-connector/src/main/java/org/eclipse/edc/connector/dataplane/http/pipeline/datasource/HttpDataSource.java
-- http-pull-connector/src/main/java/org/eclipse/edc/connector/dataplane/http/DataPlaneHttpExtension.java
+- http-plane-headers-extension/src/main/java/org/eclipse/org/eclipse/edc/connector/dataplane/api/controller/ContainerRequestContextApiImpl.java
+- http-plane-headers-extension/src/main/java/org/eclipse/org/eclipse/edc/connector/dataplane/api/controller/DataFlowRequestSupplier.java
+- http-plane-headers-extension/src/main/java/org/eclipse/edc/connector/dataplane/api/controller/ExtendedDataPlanePublicApiController.java
+- http-plane-headers-extension/src/main/java/org/eclipse/edc/connector/dataplane/api/pipeline/ApiDataSink.java
+- http-plane-headers-extension/src/main/java/org/eclipse/edc/connector/dataplane/api/pipeline/ApiDataSinkFactory.java
+- http-plane-headers-extension/src/main/java/org/eclipse/edc/connector/dataplane/api/DataPlanePublicApiExtension.java
+- http-plane-headers-extension/src/main/java/org/eclipse/edc/connector/dataplane/http/pipeline/datasink/HttpDataSink.java
+- http-plane-headers-extension/src/main/java/org/eclipse/edc/connector/dataplane/http/pipeline/datasource/HttpDataSource.java
+- http-plane-headers-extension/src/main/java/org/eclipse/edc/connector/dataplane/http/DataPlaneHttpExtension.java

README.MD

@@ -1,20 +1,15 @@
 # VSDS Dataspace connector
 
-This repository provides connector builds that can be used to create a dataspace with an LDES Server.
+This repository provides a connector build that can be used to create a dataspace with an LDES Server.
 
-To create the images run the following docker commands from the root directory:
+To create the image, run the following docker command from the root directory:
 
 1. Image for consumer and provider connectors
     ```bash
-    docker build -t vsds-dataspace-connector:local . -f ./http-pull-connector/Dockerfile
+    docker build -t vsds-dataspace-connector:local . -f ./http-plane-headers-extension/Dockerfile
     ```
-
-2. Image for the federated authority connector
-    ```bash
-    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.
+
+   > **Note**: This connector is not production ready and should only be used for development purposes.
 
 3. E2E testing
    - [Basic flow](https://github.com/Informatievlaanderen/VSDS-LDES-E2E-testing/tree/main/tests/034.dataspace-connector-consumer-and-provider)

gradle/libs.versions.toml

@@ -23,9 +23,6 @@ edc-api-observability = { module = "org.eclipse.edc:api-observability", version.
 edc-auth-tokenbased = { module = "org.eclipse.edc:auth-tokenbased", version.ref = "edc" }
 edc-boot = { module = "org.eclipse.edc:boot", version.ref = "edc" }
 edc-build-plugin = { module = "org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin", version.ref = "edc" }
-edc-catalog-core = { module = "org.eclipse.edc:federated-catalog-core", version.ref = "edc" }
-edc-catalog-api = { module = "org.eclipse.edc:federated-catalog-api", version.ref = "edc" }
-edc-catalog-spi = { module = "org.eclipse.edc:federated-catalog-spi", version.ref = "edc" }
 edc-configuration-filesystem = { module = "org.eclipse.edc:configuration-filesystem", version.ref = "edc" }
 edc-connector-core = { module = "org.eclipse.edc:connector-core", version.ref = "edc" }
 edc-control-plane-core = { module = "org.eclipse.edc:control-plane-core", version.ref = "edc" }
@@ -44,9 +41,6 @@ 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" }
@@ -69,10 +63,6 @@ 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-fix" }
-ih-ext-api = { module = "org.eclipse.edc:identity-hub-api", version.ref = "edc-ih-fix" }
-ih-ext-credentials-jwt = { module = "org.eclipse.edc:identity-hub-credentials-jwt", version.ref = "edc-ih-fix" }
-ih-ext-verifier-jwt = { module = "org.eclipse.edc:identity-hub-verifier-jwt", version.ref = "edc-ih-fix" }
 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" }
@@ -82,13 +72,9 @@ 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" }