🚚 Rename the OpenAPI connector extension

fundacionctic · Apr 5, 2024 · 4dddaf9 · 4dddaf9
1 parent 27c67af
commit 4dddaf9
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -54,4 +54,4 @@ CMD ${PATH_CONNECTOR}/keystore-to-vault.sh && \
     -Dedc.vault=${PATH_CONNECTOR}/vault.properties \
     -Dedc.keystore=${KEYSTORE_PATH} \
     -Dedc.keystore.password=${KEYSTORE_PASSWORD} \
-    -jar ${PATH_CONNECTOR}/core-connector/build/libs/core-connector.jar
+    -jar ${PATH_CONNECTOR}/openapi-connector/build/libs/openapi-connector.jar
diff --git a/...g.eclipse.edc.spi.system.ServiceExtension → ...g.eclipse.edc.spi.system.ServiceExtension b/...g.eclipse.edc.spi.system.ServiceExtension → ...g.eclipse.edc.spi.system.ServiceExtension
diff --git a/connector/core-connector/build.gradle.kts → connector/openapi-connector/build.gradle.kts b/connector/core-connector/build.gradle.kts → connector/openapi-connector/build.gradle.kts
@@ -52,6 +52,6 @@ var distZip = tasks.getByName("distZip")
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
     exclude("**/pom.properties", "**/pom.xm")
     mergeServiceFiles()
-    archiveFileName.set("core-connector.jar")
+    archiveFileName.set("openapi-connector.jar")
     dependsOn(distTar, distZip)
 }
diff --git a/...nnector/CredentialConstraintFunction.java → ...nnector/CredentialConstraintFunction.java b/...nnector/CredentialConstraintFunction.java → ...nnector/CredentialConstraintFunction.java
diff --git a/...ellar/connector/OpenAPICoreExtension.java → ...ellar/connector/OpenAPICoreExtension.java b/...ellar/connector/OpenAPICoreExtension.java → ...ellar/connector/OpenAPICoreExtension.java
@@ -269,17 +269,21 @@ public void initialize(ServiceExtensionContext context) {
 
         paramsProvider.registerSourceDecorator((request, address, builder) -> {
             if (pkgVersion != null) {
-                builder.header("X-Core-Connector-Source-Version", pkgVersion);
+                builder.header("X-OpenAPI-Connector-Source-Version", pkgVersion);
             }
 
+            builder.header("X-OpenAPI-Connector", "source");
+
             return builder;
         });
 
         paramsProvider.registerSinkDecorator((request, address, builder) -> {
             if (pkgVersion != null) {
-                builder.header("X-Core-Connector-Sink-Version", pkgVersion);
+                builder.header("X-OpenAPI-Connector-Sink-Version", pkgVersion);
             }
 
+            builder.header("X-OpenAPI-Connector", "sink");
+
             return builder;
         });
 

diff --git a/...g.eclipse.edc.spi.system.ServiceExtension → ...g.eclipse.edc.spi.system.ServiceExtension b/...g.eclipse.edc.spi.system.ServiceExtension → ...g.eclipse.edc.spi.system.ServiceExtension
diff --git a/connector/settings.gradle.kts b/connector/settings.gradle.kts
@@ -14,5 +14,5 @@ dependencyResolutionManagement {
     }
 }
 
-include("core-connector")
+include("openapi-connector")
 include("iam")
diff --git a/dev-config/box-provider.properties b/dev-config/box-provider.properties
@@ -33,7 +33,7 @@ edc.receiver.http.endpoint=http://provider.local:8000/pull
 # https://github.com/eclipse-edc/Connector/tree/main/extensions/data-plane/data-plane-api
 edc.dataplane.token.validation.endpoint=http://localhost:9192/control/token
 
-# This is a property for the "core-connector" extension found in this repository.
+# This is a property for the "openapi-connector" extension found in this repository.
 # It should point to the OpenAPI definition of the API that needs to be exposed by the connector.
 eu.datacellar.openapi.url=http://provider.local:9090/openapi.json
 

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -15,7 +15,7 @@ services:
         -Dedc.keystore.password=datacellar,
         -Dedc.vault=/opt/src/dev-config/certs-consumer/vault.properties,
         -jar,
-        /opt/src/connector/core-connector/build/libs/core-connector.jar,
+        /opt/src/connector/openapi-connector/build/libs/openapi-connector.jar,
       ]
     ports:
       - 29191:29191
@@ -76,7 +76,7 @@ services:
         -Dedc.keystore=/opt/src/dev-config/certs-provider/cert.pfx,
         -Dedc.keystore.password=datacellar,
         -jar,
-        /opt/src/connector/core-connector/build/libs/core-connector.jar,
+        /opt/src/connector/openapi-connector/build/libs/openapi-connector.jar,
       ]
     ports:
       - 19191:19191