Merge branch 'main' into fix/199-fix-policy-api

.config/README.md

@@ -14,6 +14,5 @@ This folder contains configuration, rules and suppression files for code quality
 | irs.header                  | Copyright header definition for the checkstyle module RegexpHeader.                       | see checkstyle.xml file                                                                                                |
 | owasp-suppressions.xml      | [OWASP dependendy check](https://owasp.org/www-project-dependency-check/) suppressions.   | [OWASP suppressions documentation](https://jeremylong.github.io/DependencyCheck/general/suppression.html)              |
 | pmd-rules.xml               | [PMD Source Code Analyzer](https://pmd.github.io/) rules.                                 | [PMD rules documentation](https://pmd.github.io/pmd/pmd_userdocs_making_rulesets.html)                                 |
-| spotbugs-excludes.xml       | [Spotbugs](https://spotbugs.github.io/) excludes.                                         | [Spotbugs excludes documentation](https://spotbugs.readthedocs.io/en/stable/filter.html)                               |
 
 

.github/workflows/codeql.yml

@@ -93,4 +93,4 @@ jobs:
           mvn clean package --batch-mode -DskipTests
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

.github/workflows/helm-chart-release.yaml

@@ -25,13 +25,13 @@ jobs:
       - name: Get helm charts latest tag version
         id: step1
         run: |
-          latestVersion=$(git tag | grep "irs-helm-[1-9]" | tail -1)
+          latestVersion=$(git tag | grep "item-relationship-service-[1-9]" | sort -V | tail -1)
           echo "::set-output name=latest_version::$latestVersion"
           echo "Exported $latestVersion latest helm charts version"
       - name: Get helm charts current version
         id: step2
         run: |
-          chartVersion=irs-helm-$(cat ./charts/irs-helm/Chart.yaml | grep "version:" | head -1 | cut -d ":" -d " " -f2)
+          chartVersion=item-relationship-service-$(cat ./charts/item-relationship-service/Chart.yaml | grep "version:" | head -1 | cut -d ":" -d " " -f2)
           echo "::set-output name=current_version::$chartVersion"
           echo "Exported $chartVersion helm charts version"
 
@@ -60,7 +60,7 @@ jobs:
           version: v3.9.3
 
       - name: Update helm dependencies for irs
-        working-directory: charts/irs-helm/
+        working-directory: charts/item-relationship-service/
         run: |
           helm repo add bitnami https://charts.bitnami.com/bitnami
           helm repo add minio https://charts.min.io/
@@ -69,11 +69,11 @@ jobs:
           helm dependency update
 
       - name: Create temporary CHANGELOG file for helm release
-        working-directory: charts/irs-helm/
+        working-directory: charts/item-relationship-service/
         run: |
           touch CHANGELOG-temp.md
           
-          currentVersionNumber=$(echo ${{ needs.get-helm-charts-versions-irs.outputs.current_version }} | sed -e "s/^irs-helm-//" )
+          currentVersionNumber=$(echo ${{ needs.get-helm-charts-versions-irs.outputs.current_version }} | sed -e "s/^item-relationship-service-//" )
           echo currentVersionNumber=$currentVersionNumber
           
           sed -n -e '/## \['"${currentVersionNumber}"'\]/,/## \[/ p' CHANGELOG.md | head -n -1 | tail -n +2 >> CHANGELOG-temp.md

.github/workflows/helm-test.yaml

@@ -72,5 +72,5 @@ jobs:
           helm repo add minio https://charts.min.io/
           helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
           helm repo add grafana https://grafana.github.io/helm-charts
-          ct install --charts charts/irs-helm --helm-extra-set-args "--set=image.tag=testing --set=image.repository=kind-registry:5000/irs-api"
+          ct install --charts charts/item-relationship-service --helm-extra-set-args "--set=image.tag=testing --set=image.repository=kind-registry:5000/irs-api"
         if: steps.list-changed.outputs.changed == 'true'

.github/workflows/helm-upgrade.yaml

@@ -3,7 +3,7 @@ name: Upgrade Charts
 on:
   pull_request:
     paths:
-      - 'charts/irs-helm/**'
+      - 'charts/item-relationship-service/**'
   workflow_dispatch:
 
 jobs:
@@ -32,12 +32,12 @@ jobs:
           helm repo add irs https://eclipse-tractusx.github.io/item-relationship-service
 
       - name: Run helm install
-        # Install latest released irs-helm version
+        # Install latest released item-relationship-service version
         run: |
-          helm install irs irs/irs-helm
+          helm install irs irs/item-relationship-service 
 
       - name: Run helm upgrade
-        # Upgrade the installed irs-helm version with the locally available charts
+        # Upgrade the installed item-relationship-service version with the locally available charts
         run: |
-          helm dependency update charts/irs-helm
-          helm upgrade irs charts/irs-helm
+          helm dependency update charts/item-relationship-service
+          helm upgrade irs charts/item-relationship-service 

.github/workflows/irs-build.yml

@@ -9,6 +9,7 @@ on:
       - 'charts/**'
       - '.config/**'
       - 'docs/**'
+      - '!docs/src/api/**'
       - 'local/**'
       - 'CHANGELOG.md'
   push:

.github/workflows/release.yaml

@@ -13,17 +13,17 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Calculate Helm release version from CHANGELOG
-        run: echo HELM_VERSION=$(cat charts/irs-helm/CHANGELOG.md | sed -n 's/.*\[\([0-9]\+\.[0-9]\+\.[0-9]\+\)\].*/\1/p' | head -n 1) >> $GITHUB_ENV
+        run: echo HELM_VERSION=$(cat charts/item-relationship-service/CHANGELOG.md | sed -n 's/.*\[\([0-9]\+\.[0-9]\+\.[0-9]\+\)\].*/\1/p' | head -n 1) >> $GITHUB_ENV
 
       - name: Update Chart.yaml appVersion
         uses: mikefarah/[email protected]
         with:
-          cmd: yq -i eval '.appVersion = "${{ github.ref_name }}"' charts/irs-helm/Chart.yaml
+          cmd: yq -i eval '.appVersion = "${{ github.ref_name }}"' charts/item-relationship-service/Chart.yaml
 
       - name: Update Chart.yaml version
         uses: mikefarah/[email protected]
         with:
-          cmd: yq -i eval '.version = "${{ env.HELM_VERSION }}"' charts/irs-helm/Chart.yaml
+          cmd: yq -i eval '.version = "${{ env.HELM_VERSION }}"' charts/item-relationship-service/Chart.yaml
 
       - name: Prepare Helm release
         uses: peter-evans/create-pull-request@v5

.gitignore

@@ -71,5 +71,5 @@ docs/src/diagram-replacer/package.json
 docs/src/diagram-replacer/plantuml.jar
 
 # Helm Chart Dependencies
-/charts/item-relationship-service/charts/
 /charts/item-relationship-service/Chart.lock
+/charts/item-relationship-service/charts/