Merge pull request #174 from catenax-ng/develop

upstream latest changes after version release
eclipse-tractusx · Mar 31, 2023 · f21c158 · f21c158
2 parents 8be6f9f + 9836746
commit f21c158
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 25 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -259,5 +259,5 @@ jobs:
         env:
           #REPO: ${{ github.repository }}
           REPO: "catenax-ng/product-edc"
-          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_PACKAGE_USERNAME: ${{ secrets.TEMP_GHPKG_USER }}
+          GITHUB_PACKAGE_PASSWORD: ${{ secrets.TEMP_GHPKG_PASSWORD }}
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
@@ -77,8 +77,8 @@ jobs:
         env:
           #REPO: ${{ github.repository }}
           REPO: "catenax-ng/product-edc"
-          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_PACKAGE_USERNAME: ${{ secrets.TEMP_GHPKG_USER }}
+          GITHUB_PACKAGE_PASSWORD: ${{ secrets.TEMP_GHPKG_PASSWORD }}
 
   # Release: Helm Charts
   helm-release:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.2] - 2023-03-30
+
+### Fixed
+
+- Fixed mutually-exclusive config values for Azure KeyVault
+
 ## [0.3.1] - 2023-03-27
 
 ### Added
@@ -72,6 +78,11 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 - Fix not working docu link in README.md
 - Fix typo in control-plane adapter README
 
+- bugfix: Fix slow AES encryption (#746)
+- Fix typo in tractusx-connector values.yaml comment
+- Fix not working docu link in README.md
+- Fix typo in control-plane adapter README
+
 ### Dependency updates
 
 - Bump EDC to 20220220 (#767)
@@ -239,7 +250,7 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 ### Fixed
 
 - [#1515](https://github.com/eclipse-edc/Connector/issues/1515) SQL: Connector sends out 50
-    contract offers max.
+      contract offers max.
 
 ### Removed
 
@@ -252,7 +263,9 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ## [0.0.1] - 2022-05-13
 
-[Unreleased]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.3.1...HEAD
+[Unreleased]: https://github.com/catenax-ng/tx-tractusx-edc/compare/0.3.2...HEAD
+
+[0.3.2]: https://github.com/catenax-ng/tx-tractusx-edc/compare/0.3.1...0.3.2
 
 [0.3.1]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.3.0...0.3.1
 

diff --git a/charts/edc-controlplane/Chart.yaml b/charts/edc-controlplane/Chart.yaml
@@ -27,8 +27,8 @@ description: >-
   EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane
 type: application
-appVersion: "0.3.1"
-version: 0.3.1
+appVersion: "0.3.2"
+version: 0.3.2
 deprecated: true
 maintainers: []
 sources:

diff --git a/charts/edc-controlplane/README.md b/charts/edc-controlplane/README.md
@@ -2,7 +2,7 @@
 
 > **:exclamation: This Helm Chart is deprecated!**
 
-![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
+![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)
 
 EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
 
@@ -12,7 +12,7 @@ EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with res
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/edc-controlplane --version 0.3.1
+helm install my-release tractusx-edc/edc-controlplane --version 0.3.2
 ```
 
 ## Source Code

diff --git a/charts/edc-dataplane/Chart.yaml b/charts/edc-dataplane/Chart.yaml
@@ -27,8 +27,8 @@ description: >-
   EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane
 type: application
-appVersion: "0.3.1"
-version: 0.3.1
+appVersion: "0.3.2"
+version: 0.3.2
 deprecated: true
 maintainers: []
 sources:

diff --git a/charts/edc-dataplane/README.md b/charts/edc-dataplane/README.md
@@ -2,7 +2,7 @@
 
 > **:exclamation: This Helm Chart is deprecated!**
 
-![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
+![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)
 
 EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
 
@@ -12,7 +12,7 @@ EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility o
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/edc-dataplane --version 0.3.1
+helm install my-release tractusx-edc/edc-dataplane --version 0.3.2
 ```
 
 ## Source Code

diff --git a/charts/tractusx-connector/Chart.yaml b/charts/tractusx-connector/Chart.yaml
@@ -36,13 +36,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.1
+version: 0.3.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.3.1"
-
+appVersion: "0.3.2"
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
 sources:
   - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
@@ -1,6 +1,6 @@
 # tractusx-connector
 
-![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
+![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)
 
 A Helm chart for Tractus-X Eclipse Data Space Connector
 
@@ -10,7 +10,7 @@ A Helm chart for Tractus-X Eclipse Data Space Connector
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector --version 0.3.1
+helm install my-release tractusx-edc/tractusx-connector --version 0.3.2
 ```
 
 ## Source Code
@@ -217,11 +217,11 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.1
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.imagePullSecrets | list | `[]` | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
 | serviceAccount.name | string | `""` |  |
-| vault.azure.certificate | string | `""` |  |
+| vault.azure.certificate | string | `nil` |  |
 | vault.azure.client | string | `""` |  |
 | vault.azure.enabled | bool | `false` |  |
 | vault.azure.name | string | `""` |  |
-| vault.azure.secret | string | `""` |  |
+| vault.azure.secret | string | `nil` |  |
 | vault.azure.tenant | string | `""` |  |
 | vault.hashicorp.enabled | bool | `false` |  |
 | vault.hashicorp.healthCheck.enabled | bool | `true` |  |

diff --git a/docs/migration/Version_0.3.1_0.3.2.md b/docs/migration/Version_0.3.1_0.3.2.md
@@ -0,0 +1,9 @@
+# Migration from 0.3.0 to 0.3.1
+
+## Configuration of Azure KeyVault
+
+When using Helm Charts that use the Azure KeyVault (`edc-controlplane-memory`, `edc-controlplane-postgres`)
+it is now possible to select _either_ authentication via Client Secret (`azure.vault.secret`) or via
+certificate (`azure.vault.certificate`).
+
+If neither of the two is configured, the runtime will fail to start issuing an error.
diff --git a/edc-tests/cucumber/build.gradle.kts b/edc-tests/cucumber/build.gradle.kts
@@ -34,3 +34,8 @@ tasks.withType(Test::class) {
         System.getProperty("cucumber") == "true"
     }
 }
+
+// do not publish
+edcBuild {
+    publish.set(false)
+}
diff --git a/edc-tests/e2e-tests/build.gradle.kts b/edc-tests/e2e-tests/build.gradle.kts
@@ -30,3 +30,8 @@ dependencies {
     testImplementation(edc.api.catalog)
     testImplementation(testFixtures(edc.junit))
 }
+
+// do not publish
+edcBuild {
+    publish.set(false)
+}
diff --git a/edc-tests/runtime/build.gradle.kts b/edc-tests/runtime/build.gradle.kts
@@ -21,11 +21,11 @@ plugins {
 
 dependencies {
 
-    runtimeOnly(project(":edc-controlplane:edc-controlplane-base")){
+    runtimeOnly(project(":edc-controlplane:edc-controlplane-base")) {
         exclude("org.eclipse.edc", "oauth2-core")
         exclude("org.eclipse.edc", "oauth2-daps")
-        exclude(module= "data-encryption")
-        exclude(module= "control-plane-adapter")
+        exclude(module = "data-encryption")
+        exclude(module = "control-plane-adapter")
     }
 }
 
@@ -37,3 +37,8 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
     mergeServiceFiles()
     archiveFileName.set("app.jar")
 }
+
+// do not publish
+edcBuild {
+    publish.set(false)
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 groupId=org.eclipse.tractusx.edc
-version=0.3.2-SNAPSHOT
+version=0.3.3-SNAPSHOT
 javaVersion=11
 
 # configure the build: