big squash

.github/actions/build-connector-image/action.yml

@@ -0,0 +1,75 @@
+name: "Build EDC Connector Image"
+description: "Builds and deploys the React frontend to AWS S3"
+inputs:
+  registry-url:
+    required: true
+    description: "Docker Registry"
+  registry-user:
+    required: true
+    description: "Docker Registry Login Username"
+  registry-password:
+    required: true
+    description: "Docker Registry Login Password"
+  image-base-name:
+    required: true
+    description: "Docker Image Base Name (Company)"
+  image-name:
+    required: true
+    description: "Docker Image Name (Artifact Name)"
+  connector-name:
+    required: true
+    description: "EDC Connector Name in launchers/connectors/{connector-name}"
+  title:
+    required: true
+    description: "Docker Image Title"
+  description:
+    required: true
+    description: "Docker Image Description"
+runs:
+  using: "composite"
+  steps:
+    - name: "Docker: Log in to the Container registry"
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ inputs.registry-url }}
+        username: ${{ inputs.registry-user }}
+        password: ${{ inputs.registry-password }}
+    - name: "Docker: Store last commit info and build date"
+      id: last-commit-information
+      shell: bash
+      run: |
+        echo "LAST_COMMIT_INFO<<EOF" >> $GITHUB_ENV
+        export LAST_COMMIT_INFO=$(git log -1)
+        echo "$LAST_COMMIT_INFO" >> $GITHUB_ENV
+        echo "EOF" >> $GITHUB_ENV
+        echo "BUILD_DATE=$(date --utc +%FT%TZ)" >> $GITHUB_ENV
+    - name: "Docker: Extract metadata (tags, labels)"
+      id: meta
+      uses: docker/metadata-action@v4
+      with:
+        images: ${{ inputs.registry-url }}/${{ inputs.image-base-name }}/${{ inputs.image-name }}
+        labels: |
+          org.opencontainers.image.title=${{ inputs.title }}
+          org.opencontainers.image.description=${{ inputs.description }}
+        tags: |
+          type=schedule
+          type=semver,pattern={{version}}
+          type=semver,pattern={{major}}.{{minor}}
+          type=semver,pattern={{major}}
+          type=ref,event=branch
+          type=ref,event=pr
+          type=sha
+          type=raw,value=latest,enable={{is_default_branch}}
+          type=raw,value=release,enable=${{ startsWith(github.ref, 'refs/tags/') }}
+    - name: "Docker: Build and Push"
+      uses: docker/build-push-action@v5
+      with:
+        file: authority-portal-backend/catalog-crawler/Dockerfile
+        context: .
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+        build-args: |
+          CONNECTOR_NAME=${{ inputs.connector-name }}
+          "EDC_LAST_COMMIT_INFO_ARG=${{ env.LAST_COMMIT_INFO }}"
+          EDC_BUILD_DATE_ARG=${{ env.BUILD_DATE }}

.github/workflows/ci.yml

@@ -92,7 +92,7 @@ jobs:
             type=sha
             type=raw,value=latest,enable={{is_default_branch}}
             type=raw,value=release,enable=${{ startsWith(github.ref, 'refs/tags/') }}
-      - name: "Docker: Build and Push Image"
+      - name: "Docker: Build and Push Image (authority-portal-backend)"
         uses: docker/build-push-action@v4
         with:
           file: authority-portal-backend/authority-portal-quarkus/src/main/docker/Dockerfile.jvm
@@ -101,7 +101,17 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           network: host
-
+      - name: "Docker: Build and Push Image (authority-portal-crawler)"
+        uses: ./.github/actions/build-connector-image
+        with:
+          registry-url: ${{ env.REGISTRY }}
+          registry-user: ${{ github.actor }}
+          registry-password: ${{ secrets.GITHUB_TOKEN }}
+          image-base-name: ${{ env.IMAGE_NAME_BASE }}
+          image-name: "authority-portal-crawler"
+          connector-name: "catalog-crawler-ce"
+          title: "Catalog Crawler (Community Edition, DAPS)"
+          description: "sovity CE Catalog crawler for the sovity CE Authority Portal. Requires DAPS dataspace credentials to join an existing dataspace."
 
   frontend:
     name: Frontend

CHANGELOG.md

@@ -255,7 +255,7 @@ MDS 2.2 intermediate release
 
 - All brokers can be undeployed including their databases.
 - Keycloak
-  - Keycloak IAM must be updated to version `24.0.4`. Follow the [Keycloak upgrade guide](https://www.keycloak.org/docs/24.0.0/upgrading/) for more information.
+  - Keycloak IAM must be updated to version `24.0.4`. Follow the [Keycloak upgrade guide](https://www.keycloak.org/docs) for more information.
 - Portal Backend
 
   - Following environment variables have been added and **must be configured** for each environment

authority-portal-backend/authority-portal-api/src/main/java/de/sovity/authorityportal/api/UiResource.kt

@@ -17,11 +17,11 @@ import de.sovity.authorityportal.api.model.CentralComponentCreateRequest
 import de.sovity.authorityportal.api.model.CentralComponentDto
 import de.sovity.authorityportal.api.model.ComponentStatusOverview
 import de.sovity.authorityportal.api.model.ConfigureProvidedConnectorWithCertificateRequest
+import de.sovity.authorityportal.api.model.ConfigureProvidedConnectorWithJwksRequest
 import de.sovity.authorityportal.api.model.ConnectorDetailsDto
 import de.sovity.authorityportal.api.model.ConnectorOverviewResult
 import de.sovity.authorityportal.api.model.CreateCaasRequest
 import de.sovity.authorityportal.api.model.CreateConnectorRequest
-import de.sovity.authorityportal.api.model.ConfigureProvidedConnectorWithJwksRequest
 import de.sovity.authorityportal.api.model.CreateConnectorResponse
 import de.sovity.authorityportal.api.model.DeploymentEnvironmentDto
 import de.sovity.authorityportal.api.model.IdResponse

authority-portal-backend/authority-portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/thirdparty/daps/DapsClient.kt

@@ -16,6 +16,7 @@ package de.sovity.authorityportal.web.thirdparty.daps
 import de.sovity.authorityportal.web.environment.DeploymentEnvironmentConfiguration.DeploymentEnvironment.DapsConfig
 import de.sovity.authorityportal.web.thirdparty.daps.ext.CustomKeycloakResource
 import de.sovity.authorityportal.web.thirdparty.daps.ext.instantiateResource
+import io.quarkus.logging.Log
 import org.keycloak.admin.client.KeycloakBuilder
 import org.keycloak.representations.idm.ClientRepresentation
 import org.keycloak.representations.idm.ProtocolMapperRepresentation
@@ -43,7 +44,9 @@ class DapsClient(dapsConfig: DapsConfig): AutoCloseable {
     }
 
     fun createClient(clientId: String) {
+        Log.info("Creating client $clientId in realm $realmName")
         keycloak.realm(realmName).clients().create(buildClientRepresentation(clientId))
+        Log.info("Client $clientId created in realm $realmName")
     }
 
     fun deleteClient(clientId: String) {
@@ -66,6 +69,7 @@ class DapsClient(dapsConfig: DapsConfig): AutoCloseable {
     }
 
     fun addJwksUrl(clientId: String, jwksUrl: String) {
+        Log.info("Getting client $clientId in realm $realmName")
         val client = getClientById(clientId) ?: error("Client not found")
 
         client.attributes["jwks.url"] = jwksUrl

authority-portal-backend/authority-portal-quarkus/src/main/resources/application.properties

@@ -78,6 +78,8 @@ quarkus.arc.exclude-types=io.swagger.v3.jaxrs2.**
 %test.quarkus.log.console.json=false
 %test.quarkus.otel.traces.exporter=none
 
+quarkus.otel.sdk.disabled=true
+
 # Rest Client
 quarkus.rest-client.http2=true
 

authority-portal-backend/build.gradle.kts

@@ -23,6 +23,10 @@ subprojects {
                 password = project.findProperty("gpr.key") as String? ?: System.getenv("GPR_KEY")
             }
         }
+        maven {
+            url = uri("https://pkgs.dev.azure.com/sovity/41799556-91c8-4df6-8ddb-4471d6f15953/_packaging/core-edc/maven/v1")
+            name = "AzureRepo"
+        }
     }
 
     configurations.all {

authority-portal-backend/catalog-crawler/Dockerfile

@@ -9,29 +9,24 @@ RUN adduser -D -H -s /sbin/nologin edc
 USER edc:edc
 
 # Which app.jar to include
-ARG CONNECTOR_NAME="sovity-ce"
-ARG CONNECTOR_TYPE="connector"
+ARG CONNECTOR_NAME="catalog-crawler-ce"
 
 # For last-commit-info extension
 ARG EDC_LAST_COMMIT_INFO_ARG="The docker container was built outside of github actions and you didn't provide the build arg EDC_LAST_COMMIT_INFO_ARG, so there's no last commit info."
 ARG EDC_BUILD_DATE_ARG="The docker container was built outside of github actions and you didn't provide the build arg EDC_BUILD_DATE_ARG, so there's no build date."
 
 WORKDIR /app
-COPY ./launchers/connectors/$CONNECTOR_NAME/build/libs/app.jar /app
-COPY ./launchers/logging.properties /app
-COPY ./launchers/logging.dev.properties /app
-COPY ./launchers/.env.$CONNECTOR_TYPE /app/.env
+COPY ./authority-portal-backend/catalog-crawler/${CONNECTOR_NAME}-launcher/build/libs/app.jar /app
+COPY ./authority-portal-backend/catalog-crawler/logging.properties /app
+COPY ./authority-portal-backend/catalog-crawler/logging.dev.properties /app
 
 RUN touch /app/empty-properties-file.properties
 
-# Replaces var statements so when they are sourced as bash they don't overwrite existing env vars
-RUN sed -ri 's/^\s*(\S+)=(.*)$/\1=${\1:-"\2"}/' .env
-
 ENV EDC_LAST_COMMIT_INFO=$EDC_LAST_COMMIT_INFO_ARG
 ENV EDC_BUILD_DATE=$EDC_BUILD_DATE_ARG
 ENV JVM_ARGS=""
 
-COPY ./launchers/docker-entrypoint.sh /app/entrypoint.sh
+COPY ./authority-portal-backend/catalog-crawler/docker-entrypoint.sh /app/entrypoint.sh
 ENTRYPOINT ["/app/entrypoint.sh"]
 CMD ["start"]
 

authority-portal-backend/catalog-crawler/README.md

@@ -1,39 +1,36 @@
 <!-- PROJECT LOGO -->
 <br />
 <div align="center">
-  <a href="https://github.com/sovity/edc-ce">
+  <a href="https://github.com/sovity/authority-portal">
     <img src="https://raw.githubusercontent.com/sovity/edc-ui/main/src/assets/images/sovity_logo.svg" alt="Logo" width="300">
   </a>
 
 <h3 align="center">EDC-Connector Extension:<br />Catalog Crawler</h3>
 
   <p align="center">
-    <a href="https://github.com/sovity/edc-ce/issues/new?template=bug_report.md">Report Bug</a>
+    <a href="https://github.com/sovity/authority-portal/issues/new?assignees=&labels=kind%2Fbug&projects=&template=bug_report.yaml">Report Bug</a>
     ·
     <a href="https://github.com/sovity/edc-ce/issues/new?template=feature_request.md">Request Feature</a>
   </p>
 </div>
 
 ## About this Extension
 
-The catalog crawler is a deployment unit depending on an existing Authority Portal's database:
+The Catalog Crawler is an additional deployment unit needed to determine the online status of registered connectors and populate the Data Catalog:
 
-- It is a modified EDC connector with the task to crawl the other connector's public data offers.
+- It is a modified EDC connector with the task to crawl the other connectors' public data offers.
 - It periodically checks the Authority Portal's connector list for its environment.
 - It crawls the given connectors in regular intervals.
-- It writes the data offers and connector statuses back into the Authority Portal DB.
-- Each Environment configured in the Authority Portal requires its own Catalog Crawler with credentials for that environment's DAPS.
+- It writes the data offers and connector statuses into the Authority Portal DB.
+- Each environment configured in the Authority Portal requires its own Catalog Crawler with credentials for that environment's DAPS.
 
 ## Why does this component exist?
 
-The Authority Portal uses a non-EDC stack, and the EDC stack cannot handle multiple sources of authority at once.
-
-With the `DB -> UI` part of the broker having been moved to the Authority Portal, only the `Catalog -> DB` part remains as the Catalog Crawler,
-as it requires Connector-to-Connector IAM within the given Dataspace.
+The Authority Portal uses a non-EDC stack and thus it cannot read the catalogs of participating connectors directly.
 
 ## Deployment
 
-Please see the [Catalog Crawler Productive Deployment Guide](../../docs/deployment-guide/goals/catalog-crawler-production/README.md) for more information.
+Please see the [Productive Deployment Guide](../../docs/deployment-guide/goals/production/README.md) for more information.
 
 ## License
 

authority-portal-backend/catalog-crawler/catalog-crawler-dev/build.gradle.kts → authority-portal-backend/catalog-crawler/catalog-crawler-ce-launcher/build.gradle.kts

@@ -5,19 +5,22 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":extensions:catalog-crawler:catalog-crawler-launcher-base"))
+    implementation(project(":catalog-crawler:catalog-crawler-launcher-base"))
 
     api(libs.edc.monitorJdkLogger)
     api(libs.edc.apiObservability)
 
-    implementation(project(":launchers:common:auth-mock"))
+    implementation(libs.edc.oauth2Core)
+    implementation(libs.edc.vaultFilesystem)
 }
 
 application {
-    mainClass.set("org.eclipse.edc.boot.system.runtime.BaseRuntime")
+    mainClass.set("de.sovity.edc.ext.catalog.crawler.Main")
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
     mergeServiceFiles()
     archiveFileName.set("app.jar")
 }
+
+group = libs.versions.sovityEdcGroup.get()

authority-portal-backend/catalog-crawler/catalog-crawler-launcher-base/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
     api(libs.edc.jsonLd)
 
     // Data Catalog Crawler
-    api(project(":extensions:catalog-crawler:catalog-crawler"))
+    api(project(":catalog-crawler:catalog-crawler"))
 }
 
 group = libs.versions.sovityEdcGroup.get()

authority-portal-backend/catalog-crawler/catalog-crawler/build.gradle.kts

@@ -10,18 +10,19 @@ dependencies {
     implementation(libs.edc.managementApiConfiguration)
 
     implementation(libs.quartz.quartz)
-    implementation(libs.apache.commonsLang)
-    implementation(project(":utils:versions"))
+    implementation(libs.commons.lang3)
+    implementation(libs.quarkus.jooq)
 
-    api(project(":utils:catalog-parser"))
-    api(project(":utils:json-and-jsonld-utils"))
-    api(project(":extensions:wrapper:wrapper-common-mappers"))
-    api(project(":extensions:catalog-crawler:catalog-crawler-db"))
-    api(project(":extensions:postgres-flyway-core"))
+    api(libs.sovity.edc.catalogParser)
+    api(libs.sovity.edc.jsonAndJsonLdUtils)
+    api(libs.sovity.edc.wrapperCommonMappers)
+    api(libs.sovity.edc.ext.postgresFlywayCore)
+    api(libs.sovity.edc.config)
+    api(project(":authority-portal-db"))
 
     testAnnotationProcessor(libs.lombok)
     testCompileOnly(libs.lombok)
-    testImplementation(project(":utils:test-utils"))
+    testImplementation(libs.sovity.edc.ext.testUtils)
     testImplementation(libs.assertj.core)
     testImplementation(libs.mockito.core)
     testImplementation(libs.restAssured.restAssured)
@@ -38,11 +39,3 @@ tasks.getByName<Test>("test") {
     useJUnitPlatform()
     maxParallelForks = 1
 }
-
-publishing {
-    publications {
-        create<MavenPublication>(project.name) {
-            from(components["java"])
-        }
-    }
-}