Skip to content

Commit

Permalink
feat: add logging-house-client (#732)
Browse files Browse the repository at this point in the history
* Add logging-house-client

* Add description of PR changes to CHANGELOG.md

* chore(changelog): update deployment migration notes with new env

* chore(logging-house-extension): adjusting surrounding comments

* fix(ci): add USERNAME and TOKEN to build job for github maven repo

* fix(ci): disable docker images and add_pullrequest_to_project for fork prs

* chore(logging-house-client): bump version

* chore: remove offline maven repo

* chore(lh-extension): bump version

* update lh client version and CHANGELOG

---------

Co-authored-by: D.Hommen <75446820+dhommen@users.noreply.github.com>
Co-authored-by: dhommen <dh@orbiter.de>
  • Loading branch information
3 people authored Apr 5, 2024
1 parent 0d3e5bf commit 73c2e78
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 7 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ jobs:
uses: gradle/gradle-build-action@v2.10.0
with:
arguments: build ${{ env.GRADLE_ARGS }}
env:
USERNAME: ${{ github.actor }}
TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: "Gradle: Publish (Main & Release Only)"
uses: gradle/gradle-build-action@v2.10.0
if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }}
Expand All @@ -53,6 +56,7 @@ jobs:
USERNAME: ${{ github.actor }}
TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: "Docker Image: edc-dev"
if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
uses: ./.github/actions/build-connector-image
with:
registry-url: ${{ env.REGISTRY_URL }}
Expand All @@ -64,6 +68,7 @@ jobs:
title: "sovity Dev EDC Connector"
description: "Extended EDC Connector built by sovity. This dev version contains no dataspace auth and can be used to quickly start a locally running EDC + EDC UI."
- name: "Docker Image: edc-ce"
if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
uses: ./.github/actions/build-connector-image
with:
registry-url: ${{ env.REGISTRY_URL }}
Expand All @@ -75,6 +80,7 @@ jobs:
title: "sovity Community Edition EDC Connector"
description: "EDC Connector built by sovity. Contains sovity's Community Edition EDC extensions and requires dataspace credentials to join an existing dataspace."
- name: "Docker Image: edc-ce-mds"
if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
uses: ./.github/actions/build-connector-image
with:
registry-url: ${{ env.REGISTRY_URL }}
Expand All @@ -86,6 +92,7 @@ jobs:
title: "MDS Community Edition EDC Connector"
description: "EDC Connector built by sovity and configured for compatibility with the Mobility Data Space (MDS). This EDC requires dataspace credentials, and additional MDS Services such as a Clearing House."
- name: "Docker Image: test-backend"
if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
uses: ./.github/actions/build-connector-image
with:
registry-url: ${{ env.REGISTRY_URL }}
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
#### Major Changes

#### Minor Changes
- Logginghouse-Client: Add logging-house-client extension 0.2.10
- Add new MDS fields and migrate existing MDS asset keys to mobilityDCAT-AP

#### Patch Changes

### Deployment Migration Notes
- new logging-house-client env for mds:
- ```EDC_LOGGINGHOUSE_EXTENSION_ENABLED:``` "true"
- ```EDC_LOGGINGHOUSE_EXTENSION_URL:``` https://example.com

#### Compatible Versions

Expand Down
15 changes: 13 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,21 @@ allprojects {
mavenCentral()
mavenLocal()
maven {
url = uri("https://maven.iais.fraunhofer.de/artifactory/eis-ids-public/")
url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
}
maven {
url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
url = uri("https://maven.pkg.github.com/truzzt/mds-ap3")
credentials {
username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
}
}
maven {
url = uri("https://maven.pkg.github.com/ids-basecamp/ids-infomodel-java")
credentials {
username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
}
}
}
}
Expand Down
6 changes: 1 addition & 5 deletions launchers/common/base-mds/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ plugins {
}

dependencies {
// MDS Related EDC Extensions
// [...]

// Currently there are no mds-specific EDC extensions
// The MDS broker and MDS clearing house extensions are in the process of being migrated to the DSP protocol
implementation("logging-house:logging-house-client:0.2.10")
}

val sovityEdcGroup: String by project
Expand Down

0 comments on commit 73c2e78

Please sign in to comment.