PR remarks

eclipse-tractusx · Jul 8, 2024 · 8ad4cce · 8ad4cce
1 parent bfe29c6
commit 8ad4cce
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 40 deletions.
diff --git a/.github/workflows/publish-swaggerhub.yaml b/.github/workflows/publish-swaggerhub.yaml
@@ -69,11 +69,14 @@ jobs:
         run: |
           ./gradlew resolve
 
-      - name: Download upstream API specs
+      - name: Download upstream API specs for control-plane and data-plane
         run: |
           ./gradlew :edc-controlplane:edc-controlplane-base:downloadOpenapi
           cp edc-controlplane/edc-controlplane-base/build/docs/openapi/* resources/openapi/yaml/
 
+          ./gradlew :edc-dataplane:edc-dataplane-base:downloadOpenapi
+          cp edc-dataplane/edc-dataplane-base/build/docs/openapi/* resources/openapi/yaml/
+
       - name: Merge API specs
         run: |
           ./gradlew -PapiTitle="Tractus-X EDC REST API" -PapiDescription="Tractus-X EDC API Documentation" :mergeApiSpec --input=./resources/openapi/yaml --output=./resources/openapi/yaml/tractusx-edc-api.yaml

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -216,3 +216,43 @@ nexusPublishing {
 tasks.check {
     dependsOn(tasks.named<JacocoReport>("testCodeCoverageReport"))
 }
+
+tasks.register("downloadOpenapi") {
+    outputs.dir(project.layout.buildDirectory.dir("docs/openapi"))
+    doLast {
+        val destinationDirectory = layout.buildDirectory.asFile.get().toPath()
+            .resolve("docs").resolve("openapi")
+
+        configurations.asMap.values
+            .asSequence()
+            .filter { it.isCanBeResolved }
+            .map { it.resolvedConfiguration.firstLevelModuleDependencies }.flatten()
+            .map { childrenDependencies(it) }.flatten()
+            .distinct()
+            .forEach { dep ->
+                downloadYamlArtifact(dep, "management-api", destinationDirectory);
+                downloadYamlArtifact(dep, "observability-api", destinationDirectory);
+                downloadYamlArtifact(dep, "public-api", destinationDirectory);
+            }
+    }
+}
+
+fun childrenDependencies(dependency: ResolvedDependency): List<ResolvedDependency> {
+    return listOf(dependency) + dependency.children.map { child -> childrenDependencies(child) }.flatten()
+}
+
+fun downloadYamlArtifact(dep: ResolvedDependency, classifier: String, destinationDirectory: java.nio.file.Path) {
+    try {
+        val managementApi = dependencies.create(dep.moduleGroup, dep.moduleName, dep.moduleVersion, classifier = classifier, ext = "yaml")
+        configurations
+            .detachedConfiguration(managementApi)
+            .resolve()
+            .forEach { file ->
+                destinationDirectory
+                    .resolve("${dep.moduleName}.yaml")
+                    .toFile()
+                    .let(file::copyTo)
+            }
+    } catch (_: Exception) {
+    }
+}
diff --git a/edc-controlplane/edc-controlplane-base/build.gradle.kts b/edc-controlplane/edc-controlplane-base/build.gradle.kts
@@ -77,42 +77,3 @@ dependencies {
     runtimeOnly(libs.edc.controlplane.callback.dispatcher.http)
 
 }
-
-tasks.register("downloadOpenapi") {
-    outputs.dir(project.layout.buildDirectory.dir("docs/openapi"))
-    doLast {
-        val destinationDirectory = layout.buildDirectory.asFile.get().toPath()
-            .resolve("docs").resolve("openapi")
-
-        configurations.asMap.values
-            .asSequence()
-            .filter { it.isCanBeResolved }
-            .map { it.resolvedConfiguration.firstLevelModuleDependencies }.flatten()
-            .map { childrenDependencies(it) }.flatten()
-            .distinct()
-            .forEach { dep ->
-                downloadYamlArtifact(dep, "management-api", destinationDirectory);
-                downloadYamlArtifact(dep, "observability-api", destinationDirectory);
-            }
-    }
-}
-
-fun childrenDependencies(dependency: ResolvedDependency): List<ResolvedDependency> {
-    return listOf(dependency) + dependency.children.map { child -> childrenDependencies(child) }.flatten()
-}
-
-fun downloadYamlArtifact(dep: ResolvedDependency, classifier: String, destinationDirectory: java.nio.file.Path) {
-    try {
-        val managementApi = dependencies.create(dep.moduleGroup, dep.moduleName, dep.moduleVersion, classifier = classifier, ext = "yaml")
-        configurations
-            .detachedConfiguration(managementApi)
-            .resolve()
-            .forEach { file ->
-                destinationDirectory
-                    .resolve("${dep.moduleName}.yaml")
-                    .toFile()
-                    .let(file::copyTo)
-            }
-    } catch (_: Exception) {
-    }
-}