From c4f253dd6b54cf06ed057a94a9f1c12516329dc6 Mon Sep 17 00:00:00 2001
From: Lennart Dohmann <lennart.dohmann@gdata.de>
Date: Fri, 25 Oct 2024 14:10:41 +0200
Subject: [PATCH] Fix directory path for Java SDK example in ci.yaml

---
 .github/workflows/ci.yaml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0a79195..7330bb0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -17,10 +17,17 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Checkout Vaas Helm
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          path: vaas-helm
+      
+      - name: Checkout Vaas Java SDK
+        uses: actions/checkout@v4
+        with:
+          repository: GDATASoftwareAG/vaas
+          path: vaas-sdks
 
       - name: Configure Git
         run: |
@@ -47,10 +54,10 @@ jobs:
           echo "Chart version is $version"
           echo "CHART_VERSION=$version" >> $GITHUB_ENV
           echo "CHART_VERSION=$version" >> $GITHUB_OUTPUT
-        working-directory: charts/vaas
+        working-directory: vaas-helm/charts/vaas
 
       - name: Run chart-testing (lint)
-        run: ct lint --validate-maintainers=false --charts charts/vaas
+        run: ct lint --validate-maintainers=false --charts vaas-helm/charts/vaas
 
       - name: Install Minikube
         uses: manusa/actions-setup-minikube@v2.13.0
@@ -91,8 +98,8 @@ jobs:
             allowlistLookup:
               enabled: false
           EOF
-          helm dep up charts/vaas
-          helm upgrade --install vaas charts/vaas -f values-local.yaml -n vaas --create-namespace --debug
+          helm dep up vaas-helm/charts/vaas
+          helm upgrade --install vaas vaas-helm/charts/vaas -f values-local.yaml -n vaas --create-namespace --debug
 
       - name: Verify Pods
         run: |
@@ -100,11 +107,6 @@ jobs:
           minikube kubectl -- get pods --namespace vaas || true
           minikube kubectl -- wait --for=condition=ready pods --namespace vaas --timeout=300s --all
 
-      - name: Checkout Vaas Java SDK
-        uses: actions/checkout@v4
-        with:
-          repository: GDATASoftwareAG/vaas
-
       - name: Run Java SDK Example
         run: |
           sudo echo "$(minikube ip) vaas" | sudo tee -a /etc/hosts
@@ -112,7 +114,7 @@ jobs:
           source "$HOME/.sdkman/bin/sdkman-init.sh"
           sdk install java 21.0.3-tem
           sdk use java 21.0.3-tem
-          cd ./java/examples/VaasExample
+          cd ./vaas-sdks/java/examples/VaasExample
           export SCAN_PATH=$(pwd)/build.gradle
           export CLIENT_ID=vaas
           export CLIENT_SECRET=$(minikube kubectl -- get secret -n vaas vaas-client-secret -o jsonpath="{.data.secret}" | base64 -d)
@@ -122,9 +124,7 @@ jobs:
           minikube kubectl -- logs -n vaas $(minikube kubectl -- get pods -n vaas -l app.kubernetes.io/name=gateway -o jsonpath="{.items[0].metadata.name}") | grep "Got verdict from store: Unknown"
           gradle fileScan
           minikube kubectl -- logs -n vaas $(minikube kubectl -- get pods -n vaas -l app.kubernetes.io/name=gateway -o jsonpath="{.items[0].metadata.name}") | grep "Got verdict from store: Clean"
-          cd ../../..
-          pwd
-          ls
+          cd -
 
       - name: Push chart
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
@@ -133,14 +133,14 @@ jobs:
           name: vaas
           repository: gdatasoftwareag/charts
           tag: $CHART_VERSION
-          path: charts/vaas
+          path: vaas-helm/charts/vaas
           registry: ghcr.io
           registry_username: ${{ secrets.REGISTRY_USERNAME }}
           registry_password: ${{ secrets.CR_TOKEN }}
           update_dependencies: "true"
 
       - name: create zipfile
-        run: zip -r vaas-helm.zip charts/vaas/
+        run: zip -r vaas-helm.zip vaas-helm/charts/vaas/
 
       - name: Github Release
         uses: softprops/action-gh-release@v2