Merge branch 'dev' into feat/concept-svc

lennyStreavent · lennyStreavent · commit 14158d695a83 · 2025-07-11T10:37:55.000+02:00
diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - main
+      - dev
   pull_request:
     branches:
       - main
+      - dev
 
 jobs:
   generate_api_code:
@@ -43,11 +45,56 @@ jobs:
           chmod +x api/scripts/gen-all.sh
           ./api/scripts/gen-all.sh
 
-      - name: Upload entire repository as artifact
+      # Upload separate artifacts for each service
+      - name: Upload client artifact
         uses: actions/upload-artifact@v4
         with:
-          name: full-repository
-          path: .
+          name: client-code
+          path: ./client
+          if-no-files-found: error
+
+      - name: Set executable permissions for gradlew files
+        run: |
+          chmod +x gateway/gradlew
+          chmod +x user-svc/gradlew
+          chmod +x concept-svc/gradlew
+          ls -la gateway/gradlew
+          ls -la user-svc/gradlew
+          ls -la concept-svc/gradlew
+
+      - name: Upload gateway artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: gateway-code
+          path: |
+            ./gateway
+            ./gateway/gradle/wrapper/
+          if-no-files-found: error
+
+      - name: Upload user-svc artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: user-svc-code
+          path: |
+            ./user-svc
+            ./user-svc/gradle/wrapper/
+          if-no-files-found: error
+
+      - name: Upload concept-svc artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: concept-svc-code
+          path: |
+            ./concept-svc
+            ./concept-svc/gradle/wrapper/
+          if-no-files-found: error
+
+      - name: Upload genai-svc artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: genai-svc-code
+          path: ./genai-svc
+          if-no-files-found: error
 
   test-java:
     name: Run Java Tests
@@ -57,11 +104,11 @@ jobs:
       matrix:
         service: [gateway, user-svc, concept-svc]
     steps:
-      - name: Download full repository artifact
+      - name: Download service artifact
         uses: actions/download-artifact@v4
         with:
-          name: full-repository
-          path: .
+          name: ${{ matrix.service }}-code
+          path: ./${{ matrix.service }}
 
       - uses: actions/setup-java@v4
         with:
@@ -71,19 +118,30 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
 
+      - name: Set executable permissions for gradlew
+        run: |
+          echo "Setting executable permissions for ${{ matrix.service }}/gradlew"
+          ls -la ${{ matrix.service }}
+          chmod +x ${{ matrix.service }}/gradlew
+          ls -la ${{ matrix.service }}/gradlew
+
       - name: Build and test with Gradle
-        run: cd ${{ matrix.service }} && ./gradlew build test
+        run: |
+          cd ${{ matrix.service }}
+          pwd
+          ls -la
+          ./gradlew build test
 
   test-python:
     name: Run Python Tests
     needs: generate_api_code
     runs-on: ubuntu-latest
     steps:
-      - name: Download full repository artifact
+      - name: Download genai-svc artifact
         uses: actions/download-artifact@v4
         with:
-          name: full-repository
-          path: .
+          name: genai-svc-code
+          path: ./genai-svc
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -108,13 +166,12 @@ jobs:
     strategy:
       matrix:
         service: [client, gateway, user-svc, concept-svc, genai-svc]
-      max-parallel: 1
     steps:
-      - name: Download full repository artifact
+      - name: Download service artifact
         uses: actions/download-artifact@v4
         with:
-          name: full-repository
-          path: .
+          name: ${{ matrix.service }}-code
+          path: ./${{ matrix.service }}
 
       - name: Log in to the Container registry
         uses: docker/login-action@v3
diff --git a/.github/workflows/deploy_kubernetes.yaml b/.github/workflows/deploy_kubernetes.yaml
@@ -5,6 +5,9 @@ on:
     workflows: [Build Docker Images]
     types:
       - completed
+    branches:
+      - main
+    conclusion: success
 
 jobs:
   deployment:
diff --git a/.github/workflows/deploy_staging_kubernetes.yaml b/.github/workflows/deploy_staging_kubernetes.yaml
@@ -1,116 +1,26 @@
 name: Deploy to Staging Kubernetes
 
 on:
-  push:
+  workflow_run:
+    workflows: [Build Docker Images]
+    types:
+      - completed
     branches:
       - dev
+    conclusion: success
   pull_request:
     branches:
       - dev
 
 jobs:
-  generate_api_code:
+  deployment:
     runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-          cache: 'npm'
-
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.13'
-          cache: 'pip'
-
-      - name: Install OpenAPI Generator
-        run: |
-          npm install -g @openapitools/openapi-generator-cli
-          pip install openapi-python-client
-
-      - name: Generate Code
-        run: |
-          chmod +x api/scripts/gen-all.sh
-          ./api/scripts/gen-all.sh
-
-      - name: Upload entire repository as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: full-repository
-          path: .
-
-  build_images:
-    runs-on: ubuntu-latest
-    needs: generate_api_code
-    strategy:
-      matrix:
-        service: [client, gateway, user-svc, concept-svc, genai-svc]
-      max-parallel: 1
-    steps:
-      - name: Download full repository artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: full-repository
-          path: .
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: all
-
-      - name: Install Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/${{ github.repository }}/${{ matrix.service }}
-          tags: |
-            type=raw,value=pr-${{ github.event.pull_request.number }},enable=${{ github.event_name == 'pull_request' }}
-            type=raw,value=latest,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/dev' }}
-
-      - name: Build and push Docker Image
-        uses: docker/build-push-action@v5
-        with:
-          platforms: linux/amd64,linux/arm64
-          context: ./${{ matrix.service }}
-          file: ./${{ matrix.service }}/Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha,scope=${{ matrix.service }}
-          cache-to: type=gha,scope=${{ matrix.service }},mode=max
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build_images
     environment:
       name: staging
 
     steps:
-      - name: Download full repository artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: full-repository
-          path: .
+      - name: Checkout code
+        uses: actions/checkout@v4
 
       - name: Setup Helm
         uses: azure/setup-helm@v3
@@ -127,18 +37,33 @@ jobs:
           mkdir -p $HOME/.kube
           echo "${{ secrets.KUBECONFIG }}" > $HOME/.kube/config
 
-      - name: Run Helm Upgrade
+      - name: Run Helm Upgrade for workflow_run
+        if: github.event_name == 'workflow_run'
+        run: |
+          cd helm/ai-event-concepter
+          helm upgrade --install ai-event-concepter . \
+            --namespace team-git-push-force-dev \
+            --create-namespace \
+            --set ingress.host=dev-aieventconcepter.student.k8s.aet.cit.tum.de \
+            --set client.image.tag=dev \
+            --set gateway.image.tag=dev \
+            --set usersvc.image.tag=dev \
+            --set conceptsvc.image.tag=dev \
+            --set genaisvc.image.tag=dev
+
+      - name: Run Helm Upgrade for pull_request
+        if: github.event_name == 'pull_request'
         run: |
           cd helm/ai-event-concepter
           helm upgrade --install ai-event-concepter . \
             --namespace team-git-push-force-dev \
             --create-namespace \
             --set ingress.host=dev-aieventconcepter.student.k8s.aet.cit.tum.de \
-            --set client.image.tag=pr-${{ github.event.pull_request.number || github.sha }} \
-            --set gateway.image.tag=pr-${{ github.event.pull_request.number || github.sha }} \
-            --set usersvc.image.tag=pr-${{ github.event.pull_request.number || github.sha }} \
-            --set conceptsvc.image.tag=pr-${{ github.event.pull_request.number || github.sha }} \
-            --set genaisvc.image.tag=pr-${{ github.event.pull_request.number || github.sha }}
+            --set client.image.tag=pr-${{ github.event.pull_request.number }} \
+            --set gateway.image.tag=pr-${{ github.event.pull_request.number }} \
+            --set usersvc.image.tag=pr-${{ github.event.pull_request.number }} \
+            --set conceptsvc.image.tag=pr-${{ github.event.pull_request.number }} \
+            --set genaisvc.image.tag=pr-${{ github.event.pull_request.number }}
 
       - name: Rollout Restart Deployments
         run: |
diff --git a/gateway/gradle/wrapper/gradle-wrapper.jar b/gateway/gradle/wrapper/gradle-wrapper.jar
diff --git a/gateway/src/test/java/de/tum/aet/devops25/GatewayHealthControllerTest.java b/gateway/src/test/java/de/tum/aet/devops25/GatewayHealthControllerTest.java
@@ -0,0 +1,38 @@
+package de.tum.aet.devops25;
+
+import de.tum.aet.devops25.api.generated.model.GetGatewayHealth200Response;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.ResponseEntity;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@SpringBootTest
+class GatewayHealthControllerTest {
+
+    @Autowired
+    private GatewayHealthController gatewayHealthController;
+
+    @Test
+    void contextLoads() {
+        // This test verifies that the Spring Boot application context can be loaded successfully
+    }
+
+    @Test
+    void testGetGatewayHealth() {
+        // Test the getGatewayHealth method of the GatewayHealthController
+        ResponseEntity<GetGatewayHealth200Response> response = gatewayHealthController.getGatewayHealth();
+        
+        // Verify that the response is not null
+        assertNotNull(response);
+        assertNotNull(response.getBody());
+        
+        // Verify that the status is "UP"
+        assertEquals("UP", response.getBody().getStatus());
+        
+        // Verify that the timestamp is not null
+        assertNotNull(response.getBody().getTimestamp());
+    }
+}
