Feat/provision policy sample

.github/workflows/discord-webhook.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: New Discussion
-        uses: tsickert/discord-webhook@v5.4.0
+        uses: tsickert/discord-webhook@v6.0.0
         if: ${{ (github.event_name == 'discussion') }}
         with:
           webhook-url: ${{ secrets.DISCORD_WEBHOOK_GITHUB }}
@@ -25,7 +25,7 @@ jobs:
           embed-description: A **discussion** has been created in ${{ github.repository }}.
 
       - name: New Issue
-        uses: tsickert/discord-webhook@v5.4.0
+        uses: tsickert/discord-webhook@v6.0.0
         if: ${{ (github.event_name == 'issues') }}
         with:
           webhook-url: ${{ secrets.DISCORD_WEBHOOK_GITHUB }}
@@ -38,7 +38,7 @@ jobs:
           embed-description: An **issue** has been opened in ${{ github.repository }}.
 
       - name: New Pull Request
-        uses: tsickert/discord-webhook@v5.4.0
+        uses: tsickert/discord-webhook@v6.0.0
         if: ${{ (github.event_name == 'pull_request_target') }}
         with:
           webhook-url: ${{ secrets.DISCORD_WEBHOOK_GITHUB }}

.github/workflows/scan-pull-request.yml

@@ -28,7 +28,7 @@ jobs:
     continue-on-error: false
     steps:
       - uses: actions/checkout@v4
-      - uses: agilepathway/label-checker@v1.6.13
+      - uses: agilepathway/label-checker@v1.6.44
         with:
           any_of: api,bug,build,dependencies,documentation,enhancement,refactoring
           repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/triage-issue.yml

@@ -0,0 +1,20 @@
+name: triage opened issue
+
+on:
+  issues:
+    types:
+      - reopened
+      - opened
+
+jobs:
+  label-issue:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - run: gh issue edit "$NUMBER" --add-label "$LABELS"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
+          LABELS: triage

.github/workflows/verify.yaml

@@ -2,6 +2,7 @@ name: Test Code (Style, Tests)
 
 on:
   push:
+    branches: [ main ]
   pull_request:
     branches: [ main ]
     paths-ignore:

README.md

@@ -13,8 +13,8 @@ strongly advise reading the [documentation](https://eclipse-edc.github.io/docs/#
 
 Also, a working knowledge of **Git**, **Gradle**, **Java** and **HTTP** is presumed.
 
-We'll assume that you've just checked out the samples code base and have **Java 11+** installed on your development
-machine. If not, please download and install JDK 11+ for your OS.
+We'll assume that you've just checked out the samples code base and have **Java 17+** installed on your development
+machine. If not, please download and install JDK 17+ for your OS.
 
 Command examples in this document will use the `bash` syntax and use Unix-style paths, but any other shell should be
 fine as well. If you're using Windows you either need to adapt the paths or use WSL2.
@@ -49,6 +49,14 @@ Click the link above to learn about the transfer samples in more detail.
 
 All transfer samples are located in the `advanced` directory.
 
+### [Policy](./policy/README.md)
+
+These samples deal with the topic of policies and their evaluation and enforcement. They will teach you what
+configurations you need to make to enable the evaluation of specific policy rules and constraint and how to provide
+custom code for their enforcement.
+
+All policy samples are located in the `policy` directory.
+
 ## Contributing
 
 See [how to contribute](https://github.com/eclipse-edc/docs/blob/main/CONTRIBUTING.md).

advanced/advanced-01-open-telemetry/README.md

@@ -25,29 +25,17 @@ is configured to expose a Prometheus metrics endpoint.
 
 To run the consumer, the provider, and Jaeger execute the following commands in the project root folder:
 
+Build the connector
 ```bash
-docker compose -f advanced/advanced-01-open-telemetry/docker-compose.yaml up --abort-on-container-exit
+./gradlew :advanced:advanced-01-open-telemetry:open-telemetry-runtime:build
 ```
 
-Open a new terminal.
-
-Register data planes for provider and consumer:
-
+Start the docker compose
 ```bash
-curl -H 'Content-Type: application/json' \
-  -H "X-Api-Key: password" \
-  -d @transfer/transfer-00-prerequisites/resources/dataplane/register-data-plane-provider.json \
-  -X POST "http://localhost:19193/management/v2/dataplanes" \
-  -s | jq
+docker compose -f advanced/advanced-01-open-telemetry/docker-compose.yaml up --abort-on-container-exit
 ```
 
-```bash
-curl -H 'Content-Type: application/json' \
-  -H "X-Api-Key: password" \
-  -d @transfer/transfer-00-prerequisites/resources/dataplane/register-data-plane-consumer.json \
-  -X POST "http://localhost:29193/management/v2/dataplanes" \
-  -s | jq
-```
+Open a new terminal.
 
 Create an asset:
 
@@ -63,7 +51,7 @@ Create a Policy on the provider connector:
 ```bash
 curl -H "X-Api-Key: password" \
   -d @transfer/transfer-01-negotiation/resources/create-policy.json \
-  -H 'content-type: application/json' http://localhost:19193/management/v2/policydefinitions \
+  -H 'content-type: application/json' http://localhost:19193/management/v3/policydefinitions \
   -s | jq
 ```
 
@@ -72,7 +60,7 @@ Follow up with the creation of a contract definition:
 ```bash
 curl -H "X-Api-Key: password" \
   -d @transfer/transfer-01-negotiation/resources/create-contract-definition.json \
-  -H 'content-type: application/json' http://localhost:19193/management/v2/contractdefinitions \
+  -H 'content-type: application/json' http://localhost:19193/management/v3/contractdefinitions \
   -s | jq
 ```
 
@@ -84,7 +72,7 @@ directly with this call:
 curl -H "X-Api-Key: password" \
   -H "Content-Type: application/json" \
   -d @advanced/advanced-01-open-telemetry/resources/get-dataset.json \
-  -X POST "http://localhost:29193/management/v2/catalog/dataset/request" \
+  -X POST "http://localhost:29193/management/v3/catalog/dataset/request" \
   -s | jq
 ```
 
@@ -95,40 +83,55 @@ The output will be something like:
   "@id": "assetId",
   "@type": "dcat:Dataset",
   "odrl:hasPolicy": {
-    "@id": "MQ==:YXNzZXRJZA==:YjI5ZDVkZDUtZWU0Mi00NWRiLWE2OTktYjNmMjlmMWNjODk3",
-    "@type": "odrl:Set",
+    "@id": "MQ==:YXNzZXRJZA==:NjdlNDFhM2EtYThjMS00YTBmLWFkNmYtMjk5NzkzNTE2OTE3",
+    "@type": "odrl:Offer",
     "odrl:permission": [],
     "odrl:prohibition": [],
-    "odrl:obligation": [],
-    "odrl:target": "assetId"
+    "odrl:obligation": []
   },
   "dcat:distribution": [
     {
       "@type": "dcat:Distribution",
       "dct:format": {
-        "@id": "HttpProxy"
+        "@id": "HttpData-PULL"
       },
-      "dcat:accessService": "06348bca-6bf0-47fe-8bb5-6741cff7a955"
+      "dcat:accessService": {
+        "@id": "cb701b36-48ee-4132-8436-dba7b83c606c",
+        "@type": "dcat:DataService",
+        "dcat:endpointDescription": "dspace:connector",
+        "dcat:endpointUrl": "http://provider:19194/protocol",
+        "dct:terms": "dspace:connector",
+        "dct:endpointUrl": "http://provider:19194/protocol"
+      }
     },
     {
       "@type": "dcat:Distribution",
       "dct:format": {
-        "@id": "HttpData"
+        "@id": "HttpData-PUSH"
       },
-      "dcat:accessService": "06348bca-6bf0-47fe-8bb5-6741cff7a955"
+      "dcat:accessService": {
+        "@id": "cb701b36-48ee-4132-8436-dba7b83c606c",
+        "@type": "dcat:DataService",
+        "dcat:endpointDescription": "dspace:connector",
+        "dcat:endpointUrl": "http://provider:19194/protocol",
+        "dct:terms": "dspace:connector",
+        "dct:endpointUrl": "http://provider:19194/protocol"
+      }
     }
   ],
-  "edc:name": "product description",
-  "edc:id": "assetId",
-  "edc:contenttype": "application/json",
+  "name": "product description",
+  "id": "assetId",
+  "contenttype": "application/json",
   "@context": {
-    "dct": "https://purl.org/dc/terms/",
+    "@vocab": "https://w3id.org/edc/v0.0.1/ns/",
     "edc": "https://w3id.org/edc/v0.0.1/ns/",
-    "dcat": "https://www.w3.org/ns/dcat/",
+    "dcat": "http://www.w3.org/ns/dcat#",
+    "dct": "http://purl.org/dc/terms/",
     "odrl": "http://www.w3.org/ns/odrl/2/",
     "dspace": "https://w3id.org/dspace/v0.8/"
   }
 }
+
 ```
 
 With the `odrl:hasPolicy/@id` we can now replace it in the [negotiate-contract.json](resources/negotiate-contract.json) file
@@ -138,7 +141,7 @@ and request the contract negotiation:
 curl -H "X-Api-Key: password" \
   -H "Content-Type: application/json" \
   -d @advanced/advanced-01-open-telemetry/resources/negotiate-contract.json \
-  -X POST "http://localhost:29193/management/v2/contractnegotiations" \
+  -X POST "http://localhost:29193/management/v3/contractnegotiations" \
   -s | jq
 ```
 
@@ -147,7 +150,7 @@ state with this call, replacing `{{contract-negotiation-id}}` with the id return
 
 ```shell
 curl -H 'X-Api-Key: password' \
-  -X GET "http://localhost:29193/management/v2/contractnegotiations/{{contract-negotiation-id}}" \
+  -X GET "http://localhost:29193/management/v3/contractnegotiations/{{contract-negotiation-id}}" \
   -s | jq
 ```
 
@@ -157,7 +160,7 @@ Finally, update the contract agreement id in the [start-transfer.json](resources
 curl -H "X-Api-Key: password" \
   -H "Content-Type: application/json" \
   -d @advanced/advanced-01-open-telemetry/resources/start-transfer.json \
-  -X POST "http://localhost:29193/management/v2/transferprocesses" \
+  -X POST "http://localhost:29193/management/v3/transferprocesses" \
   -s | jq
 ```
 
@@ -232,11 +235,11 @@ In order to provide your own OpenTelemetry implementation, you have to "deploy a
 - Add a file in the resource directory META-INF/services. The file should be called `io.opentelemetry.api.OpenTelemetry`.
 - Add to the file the fully qualified name of your custom OpenTelemetry implementation class.
 
-EDC uses a [ServiceLoader](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/ServiceLoader.html)
+EDC uses a [ServiceLoader](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ServiceLoader.html)
 to load an implementation of OpenTelemetry. If it finds an OpenTelemetry service provider on the class path it will use
 it, otherwise it will use the registered global OpenTelemetry. You can look at the section
 `Deploying service providers on the class path` of the
-[ServiceLoader documentation](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/ServiceLoader.html)
+[ServiceLoader documentation](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ServiceLoader.html)
 to have more information about service providers.
 
----
+---

advanced/advanced-01-open-telemetry/docker-compose.yaml

@@ -4,8 +4,7 @@ services:
 
   consumer:
     build:
-      context: ../..
-      dockerfile: advanced/advanced-01-open-telemetry/open-telemetry-consumer/Dockerfile
+      context: open-telemetry-runtime
     volumes:
       - ./:/open-telemetry
       - ../../transfer/transfer-00-prerequisites/:/prerequisites
@@ -15,8 +14,9 @@ services:
     environment:
       EDC_HOSTNAME: consumer
       OTEL_SERVICE_NAME: consumer
-      OTEL_TRACES_EXPORTER: jaeger
-      OTEL_EXPORTER_JAEGER_ENDPOINT: http://jaeger:14250
+      OTEL_LOGS_EXPORTER: none
+      OTEL_JAVAAGENT_EXTENSIONS: /app/opentelemetry-exporter-otlp.jar
+      OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318
       OTEL_METRICS_EXPORTER: prometheus
       WEB_HTTP_PORT: 29191
       WEB_HTTP_PATH: /api
@@ -34,7 +34,6 @@ services:
       EDC_API_AUTH_KEY: password
       EDC_KEYSTORE: /prerequisites/resources/certs/cert.pfx
       EDC_KEYSTORE_PASSWORD: 123456
-      EDC_VAULT: /prerequisites/resources/configuration/provider-vault.properties
       EDC_FS_CONFIG: /prerequisites/resources/configuration/provider-configuration.properties
     entrypoint: java
       -javaagent:/app/opentelemetry-javaagent.jar
@@ -43,8 +42,7 @@ services:
 
   provider:
     build:
-      context: ../..
-      dockerfile: advanced/advanced-01-open-telemetry/open-telemetry-provider/Dockerfile
+      context: open-telemetry-runtime
     volumes:
       - ./:/open-telemetry
       - ../../transfer/transfer-00-prerequisites/:/prerequisites
@@ -54,8 +52,9 @@ services:
     environment:
       EDC_HOSTNAME: provider
       OTEL_SERVICE_NAME: provider
-      OTEL_TRACES_EXPORTER: jaeger
-      OTEL_EXPORTER_JAEGER_ENDPOINT: http://jaeger:14250
+      OTEL_LOGS_EXPORTER: none
+      OTEL_JAVAAGENT_EXTENSIONS: /app/opentelemetry-exporter-otlp.jar
+      OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318
       WEB_HTTP_PORT: 19191
       WEB_HTTP_PATH: /api
       WEB_HTTP_PUBLIC_PORT: 19291
@@ -72,7 +71,6 @@ services:
       EDC_API_AUTH_KEY: password
       EDC_KEYSTORE: /prerequisites/resources/certs/cert.pfx
       EDC_KEYSTORE_PASSWORD: 123456
-      EDC_VAULT: /prerequisites/resources/configuration/consumer-vault.properties
       EDC_FS_CONFIG: /prerequisites/resources/configuration/consumer-configuration.properties
       EDC_SAMPLES_TRANSFER_01_ASSET_PATH: /open-telemetry/README.md
     entrypoint: java
@@ -82,7 +80,10 @@ services:
 
   jaeger:
     image: jaegertracing/all-in-one
+    environment:
+      - COLLECTOR_OTLP_ENABLED=true
     ports:
+      - "4317:4317"
       - "16686:16686"
 
   prometheus:

advanced/advanced-01-open-telemetry/open-telemetry-runtime/Dockerfile

@@ -0,0 +1,6 @@
+FROM openjdk:17-slim
+
+WORKDIR /app
+COPY build/libs/opentelemetry-javaagent-2.5.0.jar /app/opentelemetry-javaagent.jar
+COPY build/libs/opentelemetry-exporter-otlp-1.39.0.jar /app/opentelemetry-exporter-otlp.jar
+COPY build/libs/connector.jar /app/connector.jar