From 111e36a82a5e277ad5040efede691c524426d15f Mon Sep 17 00:00:00 2001
From: Evelyn Gurschler <evelyn.gurschler@bmw.de>
Date: Thu, 20 Jun 2024 21:48:14 +0200
Subject: [PATCH] chore(dev-flow): maintain latest changes in main branch get
 rid of the dev branch https://github.com/eclipse-tractusx/portal/issues/243

---
 .github/dependabot.yml                        |  3 ---
 .github/workflows/administration-service.yml  |  6 ++---
 .github/workflows/codeql.yml                  |  2 +-
 .github/workflows/dependencies.yaml           |  2 +-
 .github/workflows/iam-seeding.yml             |  4 ++--
 .github/workflows/kics.yml                    |  4 ++--
 .github/workflows/maintenance-service.yml     |  6 ++---
 .github/workflows/marketplace-app-service.yml |  6 ++---
 .github/workflows/notification-service.yml    |  6 ++---
 .github/workflows/portal-migrations.yml       |  6 ++---
 .github/workflows/pre-checks.yml              |  2 +-
 .github/workflows/processes-worker.yml        |  6 ++---
 .github/workflows/provisioning-migrations.yml |  6 ++---
 .github/workflows/registration-service.yml    |  6 ++---
 .github/workflows/release.yml                 |  2 +-
 .github/workflows/services-service.yml        |  6 ++---
 .github/workflows/sonarcloud.yml              |  2 +-
 .../{trivy-dev.yml => trivy-main.yml}         | 24 +++++++++----------
 18 files changed, 48 insertions(+), 51 deletions(-)
 rename .github/workflows/{trivy-dev.yml => trivy-main.yml} (97%)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index f1c70b0639..b9434152d0 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -23,7 +23,6 @@ updates:
   # NuGet
   -
     package-ecosystem: "nuget"
-    target-branch: dev
     directory: /
     labels:
       - "dependabot"
@@ -42,7 +41,6 @@ updates:
   # Github Actions
   -
     package-ecosystem: "github-actions"
-    target-branch: dev
     directory: /
     labels:
       - "dependabot"
@@ -56,7 +54,6 @@ updates:
   # Docker
   -
     package-ecosystem: "docker"
-    target-branch: dev
     directory: ./docker/
     labels:
       - "dependabot"
diff --git a/.github/workflows/administration-service.yml b/.github/workflows/administration-service.yml
index 134a636c7a..073d10279c 100644
--- a/.github/workflows/administration-service.yml
+++ b/.github/workflows/administration-service.yml
@@ -38,7 +38,7 @@ on:
       - 'docker/Dockerfile-administration-service'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -74,7 +74,7 @@ jobs:
         with:
           images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=dev
+            type=raw,value=main
             type=raw,value=${{ github.sha }}
 
       - name: Build and push Docker image
@@ -120,5 +120,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/administration-service-image-update.yml/dispatches \
             --header "authorization: Bearer $TOKEN" \
             --header "Accept: application/vnd.github.v3+json" \
-            --data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \
+            --data '{"ref":"main", "inputs": { "new-image":"${{ github.sha }}" }}' \
             --fail
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index b31785e744..04f45a7bf1 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -33,7 +33,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
     paths:
       - 'src/**'
   pull_request:
diff --git a/.github/workflows/dependencies.yaml b/.github/workflows/dependencies.yaml
index 9c905f1c56..67aacfbe80 100644
--- a/.github/workflows/dependencies.yaml
+++ b/.github/workflows/dependencies.yaml
@@ -21,7 +21,7 @@ name: Check Dependencies
 
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
   pull_request:
     types: [opened, synchronize, reopened]
   workflow_dispatch:
diff --git a/.github/workflows/iam-seeding.yml b/.github/workflows/iam-seeding.yml
index a64edc5330..d3c4762bed 100644
--- a/.github/workflows/iam-seeding.yml
+++ b/.github/workflows/iam-seeding.yml
@@ -31,7 +31,7 @@ on:
       - 'docker/Dockerfile-iam-seeding'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -67,7 +67,7 @@ jobs:
         with:
           images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=dev
+            type=raw,value=main
             type=raw,value=${{ github.sha }}
 
       - name: Build and push Docker image
diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
index d03d52dd87..42f42f597d 100644
--- a/.github/workflows/kics.yml
+++ b/.github/workflows/kics.yml
@@ -21,10 +21,10 @@ name: "KICS"
 
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
   # pull_request:
   # The branches below must be a subset of the branches above
-  # branches: [main, dev]
+  # branches: [main]
   # paths-ignore:
   #   - "**/*.md"
   #   - "**/*.txt"
diff --git a/.github/workflows/maintenance-service.yml b/.github/workflows/maintenance-service.yml
index 2c8ceebf96..6c54a9aa77 100644
--- a/.github/workflows/maintenance-service.yml
+++ b/.github/workflows/maintenance-service.yml
@@ -32,7 +32,7 @@ on:
       - 'docker/Dockerfile-maintenance-service'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -68,7 +68,7 @@ jobs:
         with:
           images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=dev
+            type=raw,value=main
             type=raw,value=${{ github.sha }}
 
       - name: Build and push Docker image
@@ -114,5 +114,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/maintenance-service-image-update.yml/dispatches \
             --header "authorization: Bearer $TOKEN" \
             --header "Accept: application/vnd.github.v3+json" \
-            --data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \
+            --data '{"ref":"main", "inputs": { "new-image":"${{ github.sha }}" }}' \
             --fail
diff --git a/.github/workflows/marketplace-app-service.yml b/.github/workflows/marketplace-app-service.yml
index 70ec39ef5a..582d5fade2 100644
--- a/.github/workflows/marketplace-app-service.yml
+++ b/.github/workflows/marketplace-app-service.yml
@@ -37,7 +37,7 @@ on:
       - 'docker/Dockerfile-marketplace-app-service'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -73,7 +73,7 @@ jobs:
         with:
           images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=dev
+            type=raw,value=main
             type=raw,value=${{ github.sha }}
 
       - name: Build and push Docker image
@@ -119,5 +119,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/marketplace-app-service-image-update.yml/dispatches \
             --header "authorization: Bearer $TOKEN" \
             --header "Accept: application/vnd.github.v3+json" \
-            --data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \
+            --data '{"ref":"main", "inputs": { "new-image":"${{ github.sha }}" }}' \
             --fail
diff --git a/.github/workflows/notification-service.yml b/.github/workflows/notification-service.yml
index 75c1562123..d0bbb1f9cd 100644
--- a/.github/workflows/notification-service.yml
+++ b/.github/workflows/notification-service.yml
@@ -34,7 +34,7 @@ on:
       - 'docker/Dockerfile-notification-service'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -71,7 +71,7 @@ jobs:
         with:
           images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=dev
+            type=raw,value=main
             type=raw,value=${{ github.sha }}
 
       - name: Build and push Docker image
@@ -117,5 +117,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/notification-service-image-update.yml/dispatches \
             --header "authorization: Bearer $TOKEN" \
             --header "Accept: application/vnd.github.v3+json" \
-            --data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \
+            --data '{"ref":"main", "inputs": { "new-image":"${{ github.sha }}" }}' \
             --fail
diff --git a/.github/workflows/portal-migrations.yml b/.github/workflows/portal-migrations.yml
index f0ad12077f..047d8c698a 100644
--- a/.github/workflows/portal-migrations.yml
+++ b/.github/workflows/portal-migrations.yml
@@ -32,7 +32,7 @@ on:
       - 'docker/Dockerfile-portal-migrations'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -68,7 +68,7 @@ jobs:
         with:
           images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=dev
+            type=raw,value=main
             type=raw,value=${{ github.sha }}
 
       - name: Build and push Docker image
@@ -114,5 +114,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/portal-migrations-image-update.yml/dispatches \
             --header "authorization: Bearer $TOKEN" \
             --header "Accept: application/vnd.github.v3+json" \
-            --data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \
+            --data '{"ref":"main", "inputs": { "new-image":"${{ github.sha }}" }}' \
             --fail
diff --git a/.github/workflows/pre-checks.yml b/.github/workflows/pre-checks.yml
index d335cd2c12..ef0bdc9726 100644
--- a/.github/workflows/pre-checks.yml
+++ b/.github/workflows/pre-checks.yml
@@ -23,7 +23,7 @@ name: Pre Checks
 
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
     paths:
       - 'src/**'
   pull_request:
diff --git a/.github/workflows/processes-worker.yml b/.github/workflows/processes-worker.yml
index 8b4b9ac14e..ebe9aba2b2 100644
--- a/.github/workflows/processes-worker.yml
+++ b/.github/workflows/processes-worker.yml
@@ -39,7 +39,7 @@ on:
       - 'docker/Dockerfile-processes-worker'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -75,7 +75,7 @@ jobs:
         with:
           images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=dev
+            type=raw,value=main
             type=raw,value=${{ github.sha }}
 
       - name: Build and push Docker image
@@ -121,5 +121,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/processes-worker-image-update.yml/dispatches \
             --header "authorization: Bearer $TOKEN" \
             --header "Accept: application/vnd.github.v3+json" \
-            --data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \
+            --data '{"ref":"main", "inputs": { "new-image":"${{ github.sha }}" }}' \
             --fail
diff --git a/.github/workflows/provisioning-migrations.yml b/.github/workflows/provisioning-migrations.yml
index 4d7ba92f70..b0d7b0b9a2 100644
--- a/.github/workflows/provisioning-migrations.yml
+++ b/.github/workflows/provisioning-migrations.yml
@@ -32,7 +32,7 @@ on:
       - 'docker/Dockerfile-provisioning-migrations'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -68,7 +68,7 @@ jobs:
         with:
           images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=dev
+            type=raw,value=main
             type=raw,value=${{ github.sha }}
 
       - name: Build and push Docker image
@@ -114,5 +114,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/provisioning-migrations-image-update.yml/dispatches \
             --header "authorization: Bearer $TOKEN" \
             --header "Accept: application/vnd.github.v3+json" \
-            --data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \
+            --data '{"ref":"main", "inputs": { "new-image":"${{ github.sha }}" }}' \
             --fail
diff --git a/.github/workflows/registration-service.yml b/.github/workflows/registration-service.yml
index 80ce0cdb8f..69b26c7d09 100644
--- a/.github/workflows/registration-service.yml
+++ b/.github/workflows/registration-service.yml
@@ -36,7 +36,7 @@ on:
       - 'docker/Dockerfile-registration-service'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -72,7 +72,7 @@ jobs:
         with:
           images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=dev
+            type=raw,value=main
             type=raw,value=${{ github.sha }}
 
       - name: Build and push Docker image
@@ -118,5 +118,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/registration-service-image-update.yml/dispatches \
             --header "authorization: Bearer $TOKEN" \
             --header "Accept: application/vnd.github.v3+json" \
-            --data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \
+            --data '{"ref":"main", "inputs": { "new-image":"${{ github.sha }}" }}' \
             --fail
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 87448874fc..0f532a91fe 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -162,7 +162,7 @@ jobs:
           if [[ ${{ steps.rc-check.outputs.rc }} == 'true' ]]; then
             echo "branch=release-candidate" >> $GITHUB_OUTPUT
           else
-            echo "branch=dev" >> $GITHUB_OUTPUT
+            echo "branch=main" >> $GITHUB_OUTPUT
           fi
         if: steps.hf-check.outputs.hf == 'false'
 
diff --git a/.github/workflows/services-service.yml b/.github/workflows/services-service.yml
index ca7edbeeee..718399d7f0 100644
--- a/.github/workflows/services-service.yml
+++ b/.github/workflows/services-service.yml
@@ -36,7 +36,7 @@ on:
       - 'docker/Dockerfile-services-service'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -72,7 +72,7 @@ jobs:
         with:
           images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=dev
+            type=raw,value=main
             type=raw,value=${{ github.sha }}
 
       - name: Build and push Docker image
@@ -118,5 +118,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/services-service-image-update.yml/dispatches \
             --header "authorization: Bearer $TOKEN" \
             --header "Accept: application/vnd.github.v3+json" \
-            --data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \
+            --data '{"ref":"main", "inputs": { "new-image":"${{ github.sha }}" }}' \
             --fail
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 1d47c2ebc1..25c677c86c 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -20,7 +20,7 @@
 name: Sonarcloud
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
     paths:
       - 'src/**'
       - 'tests/**'
diff --git a/.github/workflows/trivy-dev.yml b/.github/workflows/trivy-main.yml
similarity index 97%
rename from .github/workflows/trivy-dev.yml
rename to .github/workflows/trivy-main.yml
index 32786efb7b..1b7c4e064e 100644
--- a/.github/workflows/trivy-dev.yml
+++ b/.github/workflows/trivy-main.yml
@@ -20,11 +20,11 @@
 # Depending on the location of your Docker container
 # you need to change the path to the specific Docker registry.
 #
-name: "Trivy Dev"
+name: "Trivy Main"
 
 on:
   push:
-    branches: [ dev ]
+    branches: [main]
   # pull_request:
   # The branches below must be a subset of the branches above
   # branches: [ main, master ]
@@ -91,7 +91,7 @@ jobs:
         uses: aquasecurity/trivy-action@595be6a0f6560a0a8fc419ddf630567fc623531d # v0.22.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-registration-service:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-registration-service:main"
           format: "sarif"
           output: "trivy-results3.sarif"
           vuln-type: "os,library"
@@ -123,7 +123,7 @@ jobs:
         uses: aquasecurity/trivy-action@595be6a0f6560a0a8fc419ddf630567fc623531d # v0.22.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-administration-service:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-administration-service:main"
           format: "sarif"
           output: "trivy-results4.sarif"
           vuln-type: "os,library"
@@ -155,7 +155,7 @@ jobs:
         uses: aquasecurity/trivy-action@595be6a0f6560a0a8fc419ddf630567fc623531d # v0.22.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-marketplace-app-service:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-marketplace-app-service:main"
           format: "sarif"
           output: "trivy-results5.sarif"
           vuln-type: "os,library"
@@ -187,7 +187,7 @@ jobs:
         uses: aquasecurity/trivy-action@595be6a0f6560a0a8fc419ddf630567fc623531d # v0.22.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-maintenance-service:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-maintenance-service:main"
           format: "sarif"
           output: "trivy-results6.sarif"
           vuln-type: "os,library"
@@ -219,7 +219,7 @@ jobs:
         uses: aquasecurity/trivy-action@595be6a0f6560a0a8fc419ddf630567fc623531d # v0.22.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-notification-service:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-notification-service:main"
           format: "sarif"
           output: "trivy-results7.sarif"
           vuln-type: "os,library"
@@ -251,7 +251,7 @@ jobs:
         uses: aquasecurity/trivy-action@595be6a0f6560a0a8fc419ddf630567fc623531d # v0.22.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-services-service:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-services-service:main"
           format: "sarif"
           output: "trivy-results8.sarif"
           vuln-type: "os,library"
@@ -283,7 +283,7 @@ jobs:
         uses: aquasecurity/trivy-action@595be6a0f6560a0a8fc419ddf630567fc623531d # v0.22.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-portal-migrations:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-portal-migrations:main"
           format: "sarif"
           output: "trivy-results9.sarif"
           vuln-type: "os,library"
@@ -315,7 +315,7 @@ jobs:
         uses: aquasecurity/trivy-action@595be6a0f6560a0a8fc419ddf630567fc623531d # v0.22.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-provisioning-migrations:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-provisioning-migrations:main"
           format: "sarif"
           output: "trivy-results10.sarif"
           vuln-type: "os,library"
@@ -347,7 +347,7 @@ jobs:
         uses: aquasecurity/trivy-action@595be6a0f6560a0a8fc419ddf630567fc623531d # v0.22.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-processes-worker:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-processes-worker:main"
           format: "sarif"
           output: "trivy-results11.sarif"
           vuln-type: "os,library"
@@ -379,7 +379,7 @@ jobs:
         uses: aquasecurity/trivy-action@595be6a0f6560a0a8fc419ddf630567fc623531d # v0.22.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-iam-seeding:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-iam-seeding:main"
           format: "sarif"
           output: "trivy-results12.sarif"
           vuln-type: "os,library"