Skip to content

Commit

Permalink
Align the preview_0_4_x branch (#268)
Browse files Browse the repository at this point in the history
* chore(deps): bump org.flywaydb:flyway-core from 9.15.2 to 9.16.3 (#242)

* chore(deps): bump com.google.code.gson:gson from 2.10 to 2.10.1 (#243)

Bumps [com.google.code.gson:gson](https://github.com/google/gson) from 2.10 to 2.10.1.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](google/gson@gson-parent-2.10...gson-parent-2.10.1)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* refactor: update GitHub output command to current version (#233)

* refactor GitHub output command to current version

* Remove curly braces from output statement

* fix: only run trivy when docker images were actually built (#240)

* fix: run trivy only if image exists

* update checks

* refactor: Extract the setup-java action into a re-usable action (#246)

* Extract the checkout and setup-java action into a re-usable action

* Commit actions.

* fix action

* remove checkout extraction

* feat(BusinessPartnerValidation): adds logging if it's enabled on contract agreement validation (#245)

* feat(BusinessPartnerValidation): adds logging if it's enabled on contract agreement validation

* feat(BusinessPartnerValidation): adds logging on tests

* feat(BusinessPartnerValidation): enabled by default on charts config

* pr remarks

* release-fix: use correct value

* Release version 0.3.3 (#249)

* Generate OpenApi Spec

* feat(baseImage): replace alpine with temurin as base image for running java application

* Lint and refactor mostly all *.md files

* Lint new changes from develop branch

* Replace appearance of product-edc with tractusx-edc

* Fix README.md and Transfer Data.md

* Fix Transfer Data.md

* Regenerate helm chart README.md files

* Remove left over html tags from root REAMDE.md

* Add empty line at EOF

* Update CODE_OF_CONDUCT.md

* Retrigger ci

* Release: fix version handling

* Prepare release 0.3.1

* Cherry-picked upstream commits (QGate stuff) in preparation for the 0.3.1 release

* fix: use snapshot version after publish workflow

* docs: add additional info for running business tests locally

* feat(CI): add Markdown linter

* md lint fix

* pr remarks

* Apply suggestions from code review

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]>

* Update .github/workflows/verify.yaml

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]>

* chore(md-linting): Fix markdown lint

* fix: make AZKV clientsecret or certificate mutually exclusive

* revert pointless blanks

* fix: use correct paths for GH Packages docker reg.

* fix: only dockerize if a dockerfile exists

* chore: use old repo URL for Maven publication

* fix: use PAT to publish to CXNG product-edc repo

* PR Remarks

* fix: remove duplicated code fragment in CHANGELOG

* feat: removed backend service, replaced with JVM runner test

moved consumer EDR controller to runtime module

* docs: create decision record about renaming git branches

* removed obsolete HTTP test

* feat(charts): removes edc-controlplane and edc-dataplane charts

* Update docs/development/decision-records/2023-04-03_renaming_branches/README.md

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]>

* Update docs/development/decision-records/2023-04-03_renaming_branches/README.md

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]>

* feat(dataEncryption): removes lombok from data-encryption module

* Update edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]>

* Fix issue with sql pool

* fix: add newline to file

* chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(deps): bump actions/setup-java from 3.10.0 to 3.11.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.10.0 to 3.11.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v3.10.0...v3.11.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* docs: create decision-record about refactoring helm charts

* chore(deps): bump crazy-max/ghaction-import-gpg from 1 to 5

Bumps [crazy-max/ghaction-import-gpg](https://github.com/crazy-max/ghaction-import-gpg) from 1 to 5.
- [Release notes](https://github.com/crazy-max/ghaction-import-gpg/releases)
- [Changelog](https://github.com/crazy-max/ghaction-import-gpg/blob/v5/CHANGELOG.md)
- [Commits](crazy-max/ghaction-import-gpg@v1...v5)

---
updated-dependencies:
- dependency-name: crazy-max/ghaction-import-gpg
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(deps): bump helm/chart-testing-action from 2.3.1 to 2.4.0

Bumps [helm/chart-testing-action](https://github.com/helm/chart-testing-action) from 2.3.1 to 2.4.0.
- [Release notes](https://github.com/helm/chart-testing-action/releases)
- [Commits](helm/chart-testing-action@v2.3.1...v2.4.0)

---
updated-dependencies:
- dependency-name: helm/chart-testing-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(deps): bump mikefarah/yq from 4.31.2 to 4.33.3

Bumps [mikefarah/yq](https://github.com/mikefarah/yq) from 4.31.2 to 4.33.3.
- [Release notes](https://github.com/mikefarah/yq/releases)
- [Changelog](https://github.com/mikefarah/yq/blob/master/release_notes.txt)
- [Commits](mikefarah/yq@v4.31.2...v4.33.3)

---
updated-dependencies:
- dependency-name: mikefarah/yq
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* feature: publish docker images to DockerHub

* add manual docker-publish workflow

* avoid input params, add concurrency

* add checkout action

* creds as action inputs

* add jar build step

* make namespace overridable

* updated notices

* incorporate new docker publish flow

* update chart deployment specs

* fix formatting

* markdown lint

* fix workflow

* remove image namespace

* prevent all interaction with dockerhub on pull requests

* docs: add technical committer to pr_etiquette.md (#182)

* chore: update to temurin 17 (#212)

* chore: update dockerfiles and GH Actions to temurin 17

* pin specific version

* feat(tests): removes lombok from edc-tests module (#159)

* chore: add a template for pull request descriptions (#213)

* fix: Adapt Helm Chart for version 0.3.x (#211)

* Adapt Charts for version 0.3.x

* fix business-tests

* add edc.receiver.http.dynamic.endpoint

* fix business-tests

* code-review findings

* refactor: rename git branches (#218)

* refactor: update branch names and references in our documentation

* publish packages to tractus-x

* chore(deps): bump io.cucumber:cucumber-junit-platform-engine from 7.11.1 to 7.11.2 (#221)

* refactor: rename git branches (#218)

* refactor: update branch names and references in our documentation

* publish packages to tractus-x

* chore(deps): bump io.cucumber:cucumber-junit-platform-engine

Bumps [io.cucumber:cucumber-junit-platform-engine](https://github.com/cucumber/cucumber-jvm) from 7.11.1 to 7.11.2.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md)
- [Commits](cucumber/cucumber-jvm@v7.11.1...v7.11.2)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit-platform-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Paul Latzelsperger <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump io.cucumber:cucumber-java from 7.11.1 to 7.11.2 (#225)

Bumps [io.cucumber:cucumber-java](https://github.com/cucumber/cucumber-jvm) from 7.11.1 to 7.11.2.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md)
- [Commits](cucumber/cucumber-jvm@v7.11.1...v7.11.2)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump org.testcontainers:junit-jupiter from 1.17.6 to 1.18.0 (#224)

Bumps [org.testcontainers:junit-jupiter](https://github.com/testcontainers/testcontainers-java) from 1.17.6 to 1.18.0.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.17.6...1.18.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump com.bmuschko.docker-remote-api from 9.2.1 to 9.3.1 (#222)

Bumps com.bmuschko.docker-remote-api from 9.2.1 to 9.3.1.

---
updated-dependencies:
- dependency-name: com.bmuschko.docker-remote-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump org.testcontainers:vault from 1.17.6 to 1.18.0 (#223)

Bumps [org.testcontainers:vault](https://github.com/testcontainers/testcontainers-java) from 1.17.6 to 1.18.0.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.17.6...1.18.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:vault
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Latzelsperger <[email protected]>

* docs(control-plane-adapter): improve documentation on how to use the control-plane adapter extension (#210)

* feature: create in-mem helm chart (#219)

* feature: create the tractusx-connector-memory chart

* pr remarks

* pr remarks

* increase waiting for negotiation, sometimes takes longer then 2 seconds

* Apply suggestions from code review

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]>

* pr remarks

* Update charts/tractusx-connector-memory/templates/deployment-runtime.yaml

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]>

---------

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]>

* chore(deps): bump org.slf4j:slf4j-api from 2.0.3 to 2.0.7 (#234)

Bumps [org.slf4j:slf4j-api](https://github.com/qos-ch/slf4j) from 2.0.3 to 2.0.7.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](qos-ch/slf4j@v_2.0.3...v_2.0.7)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump com.azure:azure-security-keyvault-secrets (#235)

Bumps [com.azure:azure-security-keyvault-secrets](https://github.com/Azure/azure-sdk-for-java) from 4.5.4 to 4.6.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](Azure/azure-sdk-for-java@azure-security-keyvault-keys_4.5.4...azure-cosmos_4.6.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-security-keyvault-secrets
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump com.diffplug.spotless from 6.15.0 to 6.18.0 (#236)

Bumps com.diffplug.spotless from 6.15.0 to 6.18.0.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump com.github.johnrengelman.shadow from 8.0.0 to 8.1.1 (#237)

* chore(deps): bump io.freefair.lombok from 6.6.2 to 8.0.1 (#238)

* chore(deps): bump org.flywaydb:flyway-core from 9.15.2 to 9.16.3 (#242)

* chore(deps): bump com.google.code.gson:gson from 2.10 to 2.10.1 (#243)

Bumps [com.google.code.gson:gson](https://github.com/google/gson) from 2.10 to 2.10.1.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](google/gson@gson-parent-2.10...gson-parent-2.10.1)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* refactor: update GitHub output command to current version (#233)

* refactor GitHub output command to current version

* Remove curly braces from output statement

* fix: only run trivy when docker images were actually built (#240)

* fix: run trivy only if image exists

* update checks

* refactor: Extract the setup-java action into a re-usable action (#246)

* Extract the checkout and setup-java action into a re-usable action

* Commit actions.

* fix action

* remove checkout extraction

* feat(BusinessPartnerValidation): adds logging if it's enabled on contract agreement validation (#245)

* feat(BusinessPartnerValidation): adds logging if it's enabled on contract agreement validation

* feat(BusinessPartnerValidation): adds logging on tests

* feat(BusinessPartnerValidation): enabled by default on charts config

* pr remarks

* release-fix: use correct value

* Prepare release 0.3.3

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Tuncay Tunc <[email protected]>
Co-authored-by: Enrico Risa <[email protected]>
Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]>
Co-authored-by: Sebastian Bezold <[email protected]>
Co-authored-by: Paul Latzelsperger <[email protected]>
Co-authored-by: GitHub actions <[email protected]>
Co-authored-by: Stephan Bauer <[email protected]>
Co-authored-by: Paul Latzelsperger <[email protected]>
Co-authored-by: Sigi <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tuncay Tunc (ZF Friedrichshafen AG) <[email protected]>
Co-authored-by: Sascha Isele (ZF Friedrichshafen AG) <[email protected]>
Co-authored-by: Garrett Smith <[email protected]>

* release-fix: allow manual entry of Docker tag

* chore: Add 0.3.3 to, and fix markdown in CHANGELOG.md (#252)

* docs: add decision record about conventional commits (#255)

* chore: Add 0.3.3 to, and fix markdown in CHANGELOG.md (#252)

* docs: add decision record about conventional commits

* fix: README.md points to wrong helm chart (#261)

* Fix wrong helm install command

* Update README.md

* feature: add explicit docker image creation during release process (#251)

* chore: Add 0.3.3 to, and fix markdown in CHANGELOG.md (#252)

* feat(release): add explicit docker build job to release

* simplify matrix

* build(deps): add constraints to avoid vulnerable transitive dependencies (#259)

* chore: Rename Veracode appname in CI job (#265)

Co-authored-by: Paul Latzelsperger <[email protected]>

* fix: Typo in veracode action (#267)

* Adapt Postman collection for 0.3.x (#232)

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Garrett Smith <[email protected]>
Co-authored-by: Paul Latzelsperger <[email protected]>
Co-authored-by: Tuncay Tunc (ZF Friedrichshafen AG) <[email protected]>
Co-authored-by: Paul Latzelsperger <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Tuncay Tunc <[email protected]>
Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]>
Co-authored-by: Sebastian Bezold <[email protected]>
Co-authored-by: GitHub actions <[email protected]>
Co-authored-by: Stephan Bauer <[email protected]>
Co-authored-by: Sigi <[email protected]>
Co-authored-by: Sascha Isele (ZF Friedrichshafen AG) <[email protected]>
Co-authored-by: ndr_brt <[email protected]>
  • Loading branch information
15 people authored Apr 21, 2023
1 parent c0aa1d4 commit 3e42904
Show file tree
Hide file tree
Showing 45 changed files with 974 additions and 955 deletions.
17 changes: 6 additions & 11 deletions .github/actions/publish-docker-image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,13 @@ inputs:
docker_token:
required: false
description: "DockerHub Token. No push is done if omitted"
docker_tag:
required: false
description: 'additional docker tags'
runs:
using: "composite"
steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions/[email protected]

#####################
# Login to DockerHub
Expand All @@ -56,12 +58,7 @@ runs:
#####################
# Build JAR file
#####################
- name: Set up JDK 11
uses: actions/[email protected]
with:
java-version: '17'
distribution: 'temurin'
cache: 'gradle'
- uses: ./.github/actions/setup-java
- name: Build Controlplane
shell: bash
run: |-
Expand All @@ -78,9 +75,7 @@ runs:
images: |
${{ inputs.namespace }}/${{ inputs.imagename }}
tags: |
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{version}},value=${{ inputs.docker_tag }}
type=semver,pattern={{major}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{raw}}
Expand Down
10 changes: 2 additions & 8 deletions .github/actions/run-deployment-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,15 @@ inputs:
runs:
using: "composite"
steps:
- name: Checkout
uses: actions/[email protected]
- uses: actions/[email protected]

- name: Cache ContainerD Image Layers
uses: actions/cache@v3
with:
path: /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs
key: ${{ runner.os }}-io.containerd.snapshotter.v1.overlayfs

- name: Set up JDK 11
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'temurin'
cache: 'gradle'
- uses: ./.github/actions/setup-java

- name: Build docker images
shell: bash
Expand Down
32 changes: 32 additions & 0 deletions .github/actions/setup-java/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#
# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
# Copyright (c) 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

---
name: "Setup JDK 17"
description: "Setup JDK 17"
runs:
using: "composite"
steps:
- name: Setup JDK 17
uses: actions/[email protected]
with:
java-version: '17'
distribution: 'temurin'
cache: 'gradle'
77 changes: 21 additions & 56 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,19 @@ jobs:
- name: Check whether secrets exist
id: secret-presence
run: |
[ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "::set-output name=SONAR_TOKEN::true"
[ ! -z "${{ secrets.GPG_PRIVATE_KEY }}" ] && echo "::set-output name=GPG_PRIVATE_KEY::true"
[ ! -z "${{ secrets.GPG_PASSPHRASE }}" ] && echo "::set-output name=GPG_PASSPHRASE::true"
[ ! -z "${{ secrets.DOCKER_HUB_TOKEN }}" ] && echo "::set-output name=DOCKER_HUB_TOKEN::true"
[ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "SONAR_TOKEN=true" >> $GITHUB_OUTPUT
[ ! -z "${{ secrets.GPG_PRIVATE_KEY }}" ] && echo "GPG_PRIVATE_KEY=true" >> $GITHUB_OUTPUT
[ ! -z "${{ secrets.GPG_PASSPHRASE }}" ] && echo "GPG_PASSPHRASE=true" >> $GITHUB_OUTPUT
[ ! -z "${{ secrets.DOCKER_HUB_TOKEN }}" ] && echo "DOCKER_HUB_TOKEN=true" >> $GITHUB_OUTPUT
exit 0
build-extensions:
runs-on: ubuntu-latest
needs: [ secret-presence ]
steps:
# Set-Up
- name: Checkout
uses: actions/[email protected]
- name: Set up JDK 11
uses: actions/[email protected]
with:
java-version: '17'
distribution: 'temurin'
cache: 'gradle'
- uses: actions/[email protected]
- uses: ./.github/actions/setup-java
# Build
- name: Build Extensions
run: |-
Expand All @@ -87,53 +81,31 @@ jobs:
GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

build-controlplane:
name: "Create Docker Images for the ControlPlane"
runs-on: ubuntu-latest
needs: [ secret-presence ]
if: |
needs.secret-presence.outputs.DOCKER_HUB_TOKEN
strategy:
fail-fast: false
matrix:
name:
- edc-runtime-memory
- edc-controlplane-memory-hashicorp-vault
- edc-controlplane-postgresql
- edc-controlplane-postgresql-hashicorp-vault
permissions:
contents: write
steps:
- name: Checkout
uses: actions/checkout@v3
- uses: ./.github/actions/publish-docker-image
with:
rootDir: edc-controlplane/${{ matrix.name }}
imagename: ${{ matrix.name }}
docker_user: ${{ secrets.DOCKER_HUB_USER }}
docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}

build-dataplane:
name: "Create Docker Images for the DataPlane"
build-docker-images:
name: "Create Docker Images"
runs-on: ubuntu-latest
needs: [ secret-presence ]
if: |
needs.secret-presence.outputs.DOCKER_HUB_TOKEN
strategy:
fail-fast: false
matrix:
name:
- edc-dataplane-azure-vault
- edc-dataplane-hashicorp-vault
variant: [ { dir: edc-controlplane, img: edc-runtime-memory },
{ dir: edc-controlplane, img: edc-controlplane-memory-hashicorp-vault },
{ dir: edc-controlplane, img: edc-controlplane-postgresql-hashicorp-vault },
{ dir: edc-controlplane, img: edc-controlplane-postgresql },
{ dir: edc-dataplane, img: edc-dataplane-azure-vault },
{ dir: edc-dataplane, img: edc-dataplane-hashicorp-vault } ]
permissions:
contents: write
steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions/[email protected]
- uses: ./.github/actions/publish-docker-image
name: Publish ${{ matrix.variant.img }}
with:
rootDir: edc-dataplane/${{ matrix.name }}
imagename: ${{ matrix.name }}
docker_tag: ${{ needs.release-version.outputs.RELEASE_VERSION }}
rootDir: ${{ matrix.variant.dir }}/${{ matrix.variant.img }}
imagename: ${{ matrix.variant.img }}
docker_user: ${{ secrets.DOCKER_HUB_USER }}
docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}

Expand All @@ -149,15 +121,9 @@ jobs:
needs.secret-presence.outputs.GPG_PASSPHRASE && needs.secret-presence.outputs.GPG_PRIVATE_KEY && github.event_name != 'pull_request' && github.ref != 'refs/heads/releases'
steps:
# Set-Up
- name: Checkout
uses: actions/[email protected]
- uses: actions/[email protected]

- name: Set up JDK 11
uses: actions/[email protected]
with:
java-version: '17'
distribution: 'temurin'
cache: 'gradle'
- uses: ./.github/actions/setup-java
- name: Import GPG Key
uses: crazy-max/ghaction-import-gpg@v5
with:
Expand All @@ -173,4 +139,3 @@ jobs:
REPO: ${{ github.repository }}
GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

10 changes: 3 additions & 7 deletions .github/workflows/business-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,9 @@ jobs:
### Set-Up ###
##############
-
name: Checkout
uses: actions/[email protected]
-
name: Set-Up JDK 11
uses: actions/[email protected]
with:
java-version: '17'
distribution: 'temurin'
cache: 'gradle'
uses: ./.github/actions/setup-java
-
name: Cache ContainerD Image Layers
uses: actions/cache@v3
Expand Down Expand Up @@ -185,6 +179,7 @@ jobs:
--set dataplane.image.repository=docker.io/library/edc-dataplane-hashicorp-vault \
--set controlplane.debug.enabled=true \
--set controlplane.suspendOnStart=false \
--set controlplane.businesspartnervalidation.log.agreement.validation=true \
--set postgresql.enabled=true \
--set postgresql.username=user \
--set postgresql.password=password \
Expand Down Expand Up @@ -218,6 +213,7 @@ jobs:
--set dataplane.image.repository=docker.io/library/edc-dataplane-hashicorp-vault \
--set controlplane.debug.enabled=true \
--set controlplane.suspendOnStart=false \
--set controlplane.businesspartnervalidation.log.agreement.validation=true \
--set postgresql.enabled=true \
--set postgresql.username=user \
--set postgresql.password=password \
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/deployment-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ jobs:
deployment-test-memory:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/[email protected]
- uses: actions/[email protected]
- uses: ./.github/actions/run-deployment-test
name: "Run deployment test using KinD and Helm"
with:
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/draft-new-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,7 @@ jobs:
git config user.name "GitHub actions"
git config user.email [email protected]
-
name: Set up JDK 11
uses: actions/[email protected]
with:
java-version: '17'
distribution: 'temurin'
cache: 'gradle'
uses: ./.github/actions/setup-java
-
name: Bump version in gradle.properties
run: |-
Expand Down Expand Up @@ -68,7 +63,7 @@ jobs:
git add CHANGELOG.md gradle.properties $(find charts -name Chart.yaml) $(find charts -name README.md)
git commit --message "Prepare release ${{ github.event.inputs.version }}"
echo "::set-output name=commit::$(git rev-parse HEAD)"
echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-
name: Push new branch
run: git push origin release/${{ github.event.inputs.version }}
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/helm-chart-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ jobs:

steps:
# fetch-depth: 0 is required to determine differences in chart(s)
- name: Checkout
uses: actions/checkout@v3
- uses: actions/[email protected]
with:
fetch-depth: 0

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/helm-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
### Set-Up ###
##############
-
name: Checkout
uses: actions/[email protected]
with:
fetch-depth: 0
Expand All @@ -52,7 +51,7 @@ jobs:
run: |
changed=$(ct list-changed --config ct.yaml --target-branch main)
if [[ -n "$changed" ]]; then
echo "::set-output name=changed::true"
echo "changed=true" >> $GITHUB_OUTPUT
fi
-
name: chart-testing (lint)
Expand Down
49 changes: 15 additions & 34 deletions .github/workflows/publish-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,58 +28,39 @@ on:
description: 'The namespace (=repo) in DockerHub'
required: false
default: "tractusx"
docker_tag:
description: 'Explicitly specify the Docker tag. Note that SHA and latest are added automatically.'
required: false

concurrency:
# cancel only running jobs on pull requests
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
create-docker-image-controlplane:
create-docker-image:
name: "Create Docker Images for the ControlPlane"
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
name:
- edc-runtime-memory
- edc-controlplane-memory-hashicorp-vault
- edc-controlplane-postgresql
- edc-controlplane-postgresql-hashicorp-vault
variant: [ { dir: edc-controlplane, img: edc-runtime-memory },
{ dir: edc-controlplane, img: edc-controlplane-memory-hashicorp-vault },
{ dir: edc-controlplane, img: edc-controlplane-postgresql-hashicorp-vault },
{ dir: edc-controlplane, img: edc-controlplane-postgresql },
{ dir: edc-dataplane, img: edc-dataplane-azure-vault },
{ dir: edc-dataplane, img: edc-dataplane-hashicorp-vault } ]
permissions:
contents: write
packages: write
steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions/[email protected]
- uses: ./.github/actions/publish-docker-image
name: Publish ${{ matrix.variant.img }}
with:
rootDir: edc-controlplane/${{ matrix.name }}
imagename: ${{ matrix.name }}
docker_tag: ${{ needs.release-version.outputs.RELEASE_VERSION }}
rootDir: ${{ matrix.variant.dir }}/${{ matrix.variant.img }}
imagename: ${{ matrix.variant.img }}
namespace: ${{ inputs.namespace }}
docker_user: ${{ secrets.DOCKER_HUB_USER }}
docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}


create-docker-image-dataplane:
name: "Create Docker Images for the DataPlane"
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
name:
- edc-dataplane-azure-vault
- edc-dataplane-hashicorp-vault
permissions:
contents: write
packages: write
steps:
- name: Checkout
uses: actions/checkout@v3
- uses: ./.github/actions/publish-docker-image
with:
rootDir: edc-dataplane/${{ matrix.name }}
imagename: ${{ matrix.name }}
namespace: ${{ inputs.namespace }}
docker_user: ${{ secrets.DOCKER_HUB_USER }}
docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
Loading

0 comments on commit 3e42904

Please sign in to comment.