chore: merge main

eclipse-tractusx · Aug 20, 2024 · 2a2df17 · 2a2df17
2 parents 3bbb5f5 + c7191fd
commit 2a2df17
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 18 deletions.
diff --git a/.github/workflows/build-image-backend.yml b/.github/workflows/build-image-backend.yml
@@ -49,7 +49,7 @@ jobs:
 
         steps:
             -   name: Checkout
-                uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+                uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
             # Copy legal information from root dir to backend dir for publishing
 
@@ -63,7 +63,7 @@ jobs:
 
             # Needed to create multi-platfrom image
             -   name: Set up Docker Buildx
-                uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
+                uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
 
             # Needed to create multi-platfrom image
             -   name: Set up QEMU
@@ -105,7 +105,7 @@ jobs:
             # https://github.com/peter-evans/dockerhub-description
             -   name: Update Docker Hub description
                 if: github.event_name != 'pull_request'
-                uses: peter-evans/dockerhub-description@dc67fad7001ef9e8e3c124cb7a64e16d0a63d864 # v3.4.2
+                uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4.0.0
                 with:
                     username: ${{ secrets.DOCKER_HUB_USER }}
                     password: ${{ secrets.DOCKER_HUB_TOKEN }}

diff --git a/.github/workflows/build-image-frontend.yml b/.github/workflows/build-image-frontend.yml
@@ -53,10 +53,10 @@ jobs:
 
         steps:
             -   name: Checkout
-                uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+                uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
             -   name: Setup Node
-                uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+                uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
                 with:
                     node-version: 20
                     registry-url: https://registry.npmjs.org/
@@ -95,7 +95,7 @@ jobs:
 
             # Needed to create multi-platfrom image
             -   name: Set up Docker Buildx
-                uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
+                uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
 
             # Create SemVer or ref tags dependent of trigger event
             -   name: Docker meta
@@ -133,7 +133,7 @@ jobs:
             # https://github.com/peter-evans/dockerhub-description
             -   name: Update Docker Hub description
                 if: github.event_name != 'pull_request'
-                uses: peter-evans/dockerhub-description@dc67fad7001ef9e8e3c124cb7a64e16d0a63d864 # v3.4.2
+                uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4.0.0
                 with:
                     username: ${{ secrets.DOCKER_HUB_USER }}
                     password: ${{ secrets.DOCKER_HUB_TOKEN }}

diff --git a/.github/workflows/chart-release.yaml b/.github/workflows/chart-release.yaml
@@ -32,7 +32,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Checkout
-              uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+              uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
               with:
                   fetch-depth: 0
 

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -65,7 +65,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/dash-dependency-check.yml b/.github/workflows/dash-dependency-check.yml
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Run dash
         id: run-dash
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Set up JDK 17
         uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2

diff --git a/.github/workflows/helm-test.yml b/.github/workflows/helm-test.yml
@@ -53,7 +53,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             -   name: Checkout
-                uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+                uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
                 with:
                     fetch-depth: 0
 

diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
@@ -47,7 +47,7 @@ jobs:
       security-events: write
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: KICS scan
         uses: checkmarx/kics-github-action@aacf8e81cd48e227259c937c215b352e02ad447a # v2.1.0

diff --git a/.github/workflows/render-puml-to-svg.yml b/.github/workflows/render-puml-to-svg.yml
@@ -42,7 +42,7 @@ jobs:
     needs: render-images
     steps:
       - name: checkout source repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: download generated svg file from job before
         uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v3
         id: download

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Run Trivy vulnerability scanner in repo mode
         uses: aquasecurity/trivy-action@595be6a0f6560a0a8fc419ddf630567fc623531d # v0.22.0

diff --git a/.github/workflows/trufflehog.yml b/.github/workflows/trufflehog.yml
@@ -42,10 +42,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           fetch-depth: 0  # Ensure full clone for pull request workflows
-          ref: ${{ github.head_ref }}  # Fetch specific branch/commit for pull requests
 
       - name: TruffleHog OSS
         id: trufflehog

diff --git a/...n/java/org/eclipse/tractusx/puris/backend/common/edc/logic/service/EdcAdapterService.java b/...n/java/org/eclipse/tractusx/puris/backend/common/edc/logic/service/EdcAdapterService.java
@@ -263,6 +263,10 @@ private boolean createContractPolicy() {
         var body = edcRequestBodyBuilder.buildFrameworkPolicy();
         try (var response = sendPostRequest(body, List.of("v3", "policydefinitions"))) {
             if (!response.isSuccessful()) {
+                if (response.code() == 409) {
+                    log.info("Framework agreement policy definition already existed");
+                    return true;
+                }
                 log.warn("Framework Policy Registration failed");
                 if (response.body() != null) {
                     log.warn("Response: \n" + response.body().string());
@@ -300,6 +304,10 @@ private boolean registerNotificationAsset(String assetId, String endpoint) {
     private boolean sendAssetRegistrationRequest(JsonNode body, String assetId) {
         try (var response = sendPostRequest(body, List.of("v3", "assets"))) {
             if (!response.isSuccessful()) {
+                if (response.code() == 409) {
+                    log.info("Asset {} already existed", assetId);
+                    return true;
+                }
                 log.warn("Asset registration failed for {}", assetId);
                 if (response.body() != null) {
                     log.warn("Response: \n" + response.body().string());

diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
@@ -240,7 +240,7 @@ act --list
 >> 0      lint-test                    lint-test                    Lint and Test Charts                            helm-test.yml              pull_request,workflow_dispatch     
 
 # run action with job-id lint-test for event as defined in pr-event.json
-act --job lint-test -e .act/pr-event.json
+act --job lint-test -e .act/pr_event.json
 ```
 
 # Notes on the release