Merge pull request #733 from catenax-ng/introduce-data-plane-http-oauth2

Replace `provision-oauth2` with `data-plane-http-oauth2`
catenax-ng · Feb 9, 2023 · 836dc07 · 836dc07
2 parents 8b4aff3 + fbfb433
commit 836dc07
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 23 deletions.
diff --git a/docs/samples/README.md b/docs/samples/README.md
@@ -4,4 +4,4 @@ In this folder are listed some documents that will help you setting up a connect
 
 - [Local setup](./Local%20TXDC%20Setup.md)
 - [Transfer data](./Transfer%20Data.md)
-- [OAuth2 provisioning](./oauth2-provision.md)
+- [Data Plane HTTP OAuth2](./data-plane-http-oauth2.md)
diff --git a/docs/samples/data-plane-http-oauth2.md b/docs/samples/data-plane-http-oauth2.md
@@ -0,0 +1,7 @@
+# Data Plane HTTP OAuth2
+
+The Data Plane HTTP OAuth2 extension permits the data-plane to fetch the data requested from a consumer from an HTTP server
+with an OAuth2 authentication layer.
+
+For further documentation, please refer to the extension README:
+https://github.com/eclipse-edc/Connector/tree/main/extensions/data-plane/data-plane-http-oauth2-core
diff --git a/docs/samples/oauth2-provision.md b/docs/samples/oauth2-provision.md
diff --git a/edc-controlplane/edc-controlplane-base/pom.xml b/edc-controlplane/edc-controlplane-base/pom.xml
@@ -146,12 +146,6 @@
             <artifactId>jwt-spi</artifactId>
         </dependency>
 
-        <!-- Provision -->
-        <dependency>
-            <groupId>org.eclipse.edc</groupId>
-            <artifactId>provision-oauth2</artifactId>
-        </dependency>
-
         <!-- Data-Plane -->
         <dependency>
             <groupId>org.eclipse.edc</groupId>

diff --git a/edc-dataplane/edc-dataplane-base/pom.xml b/edc-dataplane/edc-dataplane-base/pom.xml
@@ -71,6 +71,10 @@
             <groupId>org.eclipse.edc</groupId>
             <artifactId>data-plane-http</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.edc</groupId>
+            <artifactId>data-plane-http-oauth2</artifactId>
+        </dependency>
 
         <!-- APIs -->
         <dependency>

diff --git a/edc-tests/src/main/resources/deployment/helm/omejdn/templates/configmap.yaml b/edc-tests/src/main/resources/deployment/helm/omejdn/templates/configmap.yaml
@@ -40,7 +40,7 @@ data:
 
   clients.yml: |-
       ---
-      - client_id: provision-oauth2
+      - client_id: data-plane-oauth2
         client_secret: supersecret
         name: provision oauth2
         grant_types:

diff --git a/.../src/test/resources/org/eclipse/tractusx/edc/tests/features/HttpProxyDataTransfer.feature b/.../src/test/resources/org/eclipse/tractusx/edc/tests/features/HttpProxyDataTransfer.feature
@@ -44,8 +44,8 @@ Feature: HttpProxy Data Transfer
 
   Scenario: Connector transfers data via HttpProxy, data on provider side requires oauth2 authentication
     Given 'Plato' has a http proxy assets
-      | id      | description               | baseUrl                          | oauth2 token url     | oauth2 client id | oauth2 client secret | oauth2 scope |
-      | asset-1 | http proxy transfer asset | http://localhost:8081/api/health | http://ids-daps:4567 | provision-oauth2 | supersecret          | openid       |
+      | id      | description               | baseUrl                          | oauth2 token url     | oauth2 client id  | oauth2 client secret | oauth2 scope |
+      | asset-1 | http proxy transfer asset | http://localhost:8081/api/health | http://ids-daps:4567 | data-plane-oauth2 | supersecret          | openid       |
     And 'Plato' has the following policies
       | id       | action |
       | policy-1 | USE    |

diff --git a/pom.xml b/pom.xml
@@ -72,7 +72,7 @@
         <org.eclipse.dash.license.tool.plugin.version>0.0.1-SNAPSHOT</org.eclipse.dash.license.tool.plugin.version>
 
         <!-- dependency version -->
-        <org.eclipse.edc.version>0.0.1-20230131-SNAPSHOT</org.eclipse.edc.version>
+        <org.eclipse.edc.version>0.0.1-20230209-SNAPSHOT</org.eclipse.edc.version>
         <com.azure.sdk.bom.version>1.2.9</com.azure.sdk.bom.version>
         <org.postgresql.version>42.5.3</org.postgresql.version>
         <org.flywaydb.version>9.14.1</org.flywaydb.version>
@@ -861,6 +861,11 @@
                 <artifactId>data-plane-http</artifactId>
                 <version>${org.eclipse.edc.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.edc</groupId>
+                <artifactId>data-plane-http-oauth2</artifactId>
+                <version>${org.eclipse.edc.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.edc</groupId>
                 <artifactId>data-plane-aws-s3</artifactId>
@@ -1252,11 +1257,6 @@
                 <artifactId>policy-definition-store-sql</artifactId>
                 <version>${org.eclipse.edc.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.eclipse.edc</groupId>
-                <artifactId>provision-oauth2</artifactId>
-                <version>${org.eclipse.edc.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.eclipse.edc</groupId>
                 <artifactId>registration-service</artifactId>