Push to master

.gitattributes

@@ -1,2 +1,3 @@
 *.sh text eol=lf
+*.env text eol=lf
 Makefile text eol=lf

.github/workflows/deploy.yml

@@ -32,21 +32,17 @@ jobs:
 
       - name: Set VERSION environment variable
         run: echo "VERSION=${{ steps.version.outputs.version }}" >> $GITHUB_ENV
-
-      - name: Log in to DockerHub
-        uses: docker/login-action@v2
+  
+      - name: Build and push Docker image using Kaniko
+        uses: aevea/action-kaniko@master
         with:
+          image: ${{ secrets.USER_SERVICE_NAME }}
+          tag: ${{ env.VERSION }}
+          path: ./src/
+          build_file: Dockerfile
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build Docker image
-        run: |
-          docker build -t ${{ secrets.USER_SERVICE_NAME }}:${{ env.VERSION }} ./src
-
-      - name: Push Docker image
-        run: |
-          docker push ${{ secrets.USER_SERVICE_NAME }}:${{ env.VERSION }}
-
       - name: Push tag
         run: |
           git config user.name "github-actions"

.github/workflows/sonarqube.yml

@@ -0,0 +1,39 @@
+name: Sonarqube Analysis
+
+on:
+  push:
+    branches:
+      - feature-sonarqube # Temporary
+  pull_request:
+    branches:
+      - master
+      - develop
+
+jobs:
+  sonarqube:
+    name: SonarQube
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.24
+
+      - name: Cache Go modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/go/pkg/mod
+            ~/.cache/go-build
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - name: SonarQube Scan
+        uses: SonarSource/sonarqube-scan-action@v6
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/test.yml

@@ -84,4 +84,6 @@ jobs:
         run: chmod 400 keys/private_key.key
 
       - name: Run tests
-        run: make test_integration
+        run: | 
+          chmod +x ./run-integration.sh
+          make test_integration MODE=ci

.gitignore

@@ -3,7 +3,7 @@ test-out/
 # If you prefer the allow list template instead of the deny list, see community template:
 # https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
 #
-# Binaries for programs and plugins
+# Binaries for programs and plugins.
 *.exe
 *.exe~
 *.dll
@@ -28,6 +28,7 @@ go.work.sum
 
 # env file
 .env
+override.env
 
 # Editor/IDE
 # .idea/

Makefile

@@ -1,5 +1,12 @@
 .PHONY: run
 
+# Usage:
+# make [command] {MODE}
+#
+# command := run (default) / test / test_unit / test_integration
+# MODE :=    ci / local
+#
+
 run:
 	echo "Run using infrastructure/"
 
@@ -9,5 +16,4 @@ test_unit:
 	./run-tests.sh
 
 test_integration:
-	docker compose -f compose.integration.yml up --build --abort-on-container-exit --exit-code-from test-runner
-	docker compose -f compose.integration.yml down
+	./run-integration.sh $(MODE)

ci.override.env

@@ -0,0 +1,7 @@
+RESERVATION_SERVICE_PATH=./services/reservation-service
+RESERVATION_SERVICE_REPO=https://github.com/book-em/reservation-service.git
+RESERVATION_SERVICE_BRANCH=feature-delete-user-complete
+
+ROOM_SERVICE_PATH=./services/room-service
+ROOM_SERVICE_REPO=https://github.com/book-em/room-service.git
+ROOM_SERVICE_BRANCH=feature-delete-user-complete

compose.integration.yml

@@ -1,15 +1,28 @@
 services:
   test-runner:
     build:
-      context: ./src
+      context: ${TEST_RUNNER_PATH}/src
       dockerfile: test.Dockerfile
     depends_on:
       db:
         condition: service_healthy
       user-service:
         condition: service_healthy
+      room-db:
+        condition: service_healthy
+      room-service:
+        condition: service_healthy
+      room-images:
+        condition: service_healthy
+      reservation-db:
+        condition: service_healthy
+      reservation-service:
+        condition: service_healthy
+    environment:
+      JWT_PUBLIC_KEY_PATH: /app/keys/public_key.pem
     volumes:
       - go-mod-cache:/go/pkg/mod
+      - ${USER_SERVICE_PATH}/keys/public_key.pem:/app/keys/public_key.pem:ro
 
   user-service:
     build:
@@ -27,6 +40,8 @@ services:
       JWT_PRIVATE_KEY_PATH: /app/keys/private_key.key
       JWT_PUBLIC_KEY_PATH: /app/keys/public_key.pem
       ENABLE_TEST_MODE: "true"
+      SERVICE_NAME: user-service
+      DEPLOYMENT_ENV: test
     depends_on:
       db:
         condition: service_healthy
@@ -56,5 +71,110 @@ services:
       timeout: 3s
       retries: 5
 
+  room-service:
+    build:
+      context: ${ROOM_SERVICE_PATH}/src
+      dockerfile: Dockerfile
+    image: room-service-test
+    ports:
+      - "${ROOM_SERVICE_PORT}:8080"
+    environment:
+      DB_HOST: room-db
+      DB_PORT: 5432
+      DB_NAME: bookem_roomdb_test
+      DB_USER: bookem_roomdb_user
+      DB_PASSWORD: testpass
+      JWT_PUBLIC_KEY_PATH: /app/keys/public_key.pem
+      ENABLE_TEST_MODE: "true"
+    depends_on:
+      room-db:
+        condition: service_healthy
+    volumes:
+      - ${ROOM_SERVICE_PATH}/keys/public_key.pem:/app/keys/public_key.pem:ro
+      - room_images:/app/images/
+
+    healthcheck:
+      test: ["CMD-SHELL", "wget --spider --tries=1 --no-verbose http://room-service:8080/healthz || exit 1"]
+      interval: 3s
+      timeout: 3s
+      retries: 5
+
+  room-db:
+    image: postgres:15-alpine
+    environment:
+      POSTGRES_DB: bookem_roomdb_test
+      POSTGRES_USER: bookem_roomdb_user
+      POSTGRES_PASSWORD: testpass
+    ports:
+      - "${ROOM_SERVICE_DB_PORT}:5432"
+    volumes:
+      - type: tmpfs
+        target: /var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
+      interval: 3s
+      timeout: 3s
+      retries: 5
+
+  room-images:
+    restart: always
+    build:
+      context: ${ROOM_SERVICE_PATH}/nginx
+      dockerfile: Dockerfile
+    ports:
+      - "${ROOM_SERVICE_IMAGES_PORT}:80"    
+    volumes:
+      - room_images:/usr/share/nginx/html/images/
+    healthcheck:
+      test: service nginx status || exit 1
+      interval: 15s
+      timeout: 3s
+      retries: 2
+
+  reservation-service:
+    build:
+      context: ${RESERVATION_SERVICE_PATH}/src
+      dockerfile: Dockerfile
+    image: reservation-service-test
+    ports:
+      - "${RESERVATION_SERVICE_PORT}:8080"
+    environment:
+      DB_HOST: reservation-db
+      DB_PORT: 5432
+      DB_NAME: bookem_reservationdb_test
+      DB_USER: bookem_reservationdb_user
+      DB_PASSWORD: testpass
+      JWT_PUBLIC_KEY_PATH: /app/keys/public_key.pem
+      ENABLE_TEST_MODE: "true"
+    depends_on:
+      reservation-db:
+        condition: service_healthy
+    volumes:
+      - ${RESERVATION_SERVICE_PATH}/keys/public_key.pem:/app/keys/public_key.pem:ro
+
+    healthcheck:
+      test: ["CMD-SHELL", "wget --spider --tries=1 --no-verbose http://reservation-service:8080/healthz || exit 1"]
+      interval: 3s
+      timeout: 3s
+      retries: 5
+
+  reservation-db:
+    image: postgres:15-alpine
+    environment:
+      POSTGRES_DB: bookem_reservationdb_test
+      POSTGRES_USER: bookem_reservationdb_user
+      POSTGRES_PASSWORD: testpass
+    ports:
+      - "${RESERVATION_SERVICE_DB_PORT}:5432"
+    volumes:
+      - type: tmpfs
+        target: /var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
+      interval: 3s
+      timeout: 3s
+      retries: 5
+
 volumes:
-  go-mod-cache:
+  go-mod-cache:
+  room_images:

default.env

@@ -0,0 +1,14 @@
+TEST_RUNNER_PATH=.
+
+RESERVATION_SERVICE_PATH=../reservation-service
+RESERVATION_SERVICE_PORT=0
+RESERVATION_SERVICE_DB_PORT=0
+
+USER_SERVICE_PATH=.
+USER_SERVICE_PORT=0
+USER_SERVICE_DB_PORT=0
+
+ROOM_SERVICE_PATH=../room-service
+ROOM_SERVICE_PORT=0
+ROOM_SERVICE_DB_PORT=0
+ROOM_SERVICE_IMAGES_PORT=0

run-integration.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+set -e
+
+# run-tests.sh [ci|local]
+#
+# - ci:    Loads default + ci.override.env
+# - local: Loads default + override.env
+
+# Determine mode
+
+mode="$1"
+if [[ "$mode" != "ci" && "$mode" != "local" ]]; then
+  echo "Must specify 'ci' or 'local' as first argument"
+  exit 1
+fi
+
+# Determine which env files to read
+
+ENV_FILES=("./default.env")
+
+if [[ "$mode" == "ci" ]]; then
+  echo "Loading CI overrides..."
+  ENV_FILES+=("./ci.override.env")
+else
+  echo "Loading local overrides..."
+  ENV_FILES+=("./override.env")
+fi
+
+# Load env files
+
+for file in "${ENV_FILES[@]}"; do
+  if [[ -f "$file" ]]; then
+    echo "Loading env vars from $file"
+    set -o allexport
+    source "$file"
+    set +o allexport
+  else
+    echo "Skipping missing optional env file: $file"
+  fi
+done
+
+# Clone repos if CI
+
+if [[ "$mode" == "ci" ]]; then
+  echo "Extracting the test private key for $USER_SERVICE_REPO"
+  tar -xvzf "$USER_SERVICE_PATH/keys/keys.tar.gz" -C "$USER_SERVICE_PATH/keys"
+
+  echo "Cloning $RESERVATION_SERVICE_REPO branch $RESERVATION_SERVICE_REPO into $RESERVATION_SERVICE_PATH"
+  git clone --branch "$RESERVATION_SERVICE_BRANCH" "$RESERVATION_SERVICE_REPO" "$RESERVATION_SERVICE_PATH"
+
+  echo "Cloning $ROOM_SERVICE_REPO branch $ROOM_SERVICE_BRANCH into $ROOM_SERVICE_PATH"
+  git clone --branch "$ROOM_SERVICE_BRANCH" "$ROOM_SERVICE_REPO" "$ROOM_SERVICE_PATH"
+fi
+
+# Run integration tests
+
+docker compose -f ./compose.integration.yml up --build --abort-on-container-exit --exit-code-from test-runner
+docker compose -f ./compose.integration.yml down

services/.gitignore

@@ -0,0 +1 @@
+*/

sonar-project.properties

@@ -0,0 +1,14 @@
+sonar.projectKey=book-em_user-service
+sonar.organization=book-em
+
+
+# This is the name and version displayed in the SonarCloud UI.
+sonar.projectName=user-service
+sonar.projectVersion=1.0
+
+
+# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
+sonar.sources=.
+
+# Encoding of the source code. Default is default system encoding
+#sonar.sourceEncoding=UTF-8