refactor: enhance security by updating gitignore and workflow files to protect sensitive information

- Add comprehensive patterns for sensitive files in .gitignore
- Update deploy workflow to clean up temporary credentials
- Exclude additional configuration and secret files
- Add protection for environment-specific files

Author: AbaSheger

build_and_run.sh

@@ -1,16 +1,16 @@
-#!/bin/bash
-
-# Build Maven project
-mvn clean install
-
-# Build Docker images
-services=("eureka-server" "recommendation-service" "statistics-service" "api-gateway" "user-tracking-service")
-for service in "${services[@]}"; do
-  echo "Building Docker image for $service..."
-  cd $service
-  docker build -t $service .
-  cd ..
-done
-
-# Run Docker Compose
+#!/bin/bash
+
+# Build Maven project
+mvn clean install
+
+# Build Docker images
+services=("eureka-server" "recommendation-service" "statistics-service" "api-gateway" "user-tracking-service")
+for service in "${services[@]}"; do
+  echo "Building Docker image for $service..."
+  cd $service
+  docker build -t $service .
+  cd ..
+done
+
+# Run Docker Compose
 docker-compose up

.env.template

@@ -7,5 +7,8 @@ VM_IP=your-vm-ip
 VM_USER=your-vm-username
 SSH_KEY_PATH=path-to-your-ssh-key
 
+# Service Hostname
+ORACLE_EXTERNAL_HOSTNAME=your-instance-hostname-or-ip
+
 # Note: Copy this file to .env and fill in your actual values
 # DO NOT commit the .env file to version control

.github/workflows/ci.yml

@@ -1,52 +0,0 @@
-name: CI/CD Pipeline
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: Set up Docker Compose
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y docker-compose
-
-    - name: Set up JDK 21
-      uses: actions/setup-java@v2
-      with:
-        java-version: 21
-        distribution: 'temurin'
-
-    - name: Build with Maven
-      run: mvn clean install
-      working-directory: .
-
-    - name: Build Docker images
-      run: docker-compose build
-
-    - name: Run unit tests
-      run: mvn test
-      working-directory: .
-
-    - name: Run integration tests
-      run: mvn verify
-      working-directory: .
-
-    - name: Set up database
-      run: |
-        docker-compose up -d db
-        sleep 10 # wait for the database to be ready
-
-    - name: Run database migrations
-      run: mvn flyway:migrate
-      working-directory: .

.github/workflows/deploy.yml

@@ -0,0 +1,71 @@
+name: Deploy to Oracle VM
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v2
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Build with Maven
+      run: mvn clean install -DskipTests
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Log in to Oracle Container Registry
+      uses: docker/login-action@v1
+      with:
+        registry: ${{ secrets.OCI_REGISTRY }}
+        username: ${{ secrets.OCI_USERNAME }}
+        password: ${{ secrets.OCI_AUTH_TOKEN }}
+
+    - name: Build and push Docker images
+      env:
+        REGISTRY: ${{ secrets.OCI_REGISTRY }}
+        NAMESPACE: ${{ secrets.OCI_NAMESPACE }}
+      run: |
+        docker build -t ${REGISTRY}/${NAMESPACE}/api-gateway:latest -f api-gateway/Dockerfile .
+        docker build -t ${REGISTRY}/${NAMESPACE}/eureka-server:latest -f eureka-server/Dockerfile .
+        docker build -t ${REGISTRY}/${NAMESPACE}/recommendation-service:latest -f recommendation-service/Dockerfile .
+        docker build -t ${REGISTRY}/${NAMESPACE}/statistics-service:latest -f statistics-service/Dockerfile .
+        docker build -t ${REGISTRY}/${NAMESPACE}/user-tracking-service:latest -f user-tracking-service/Dockerfile .
+        docker push ${REGISTRY}/${NAMESPACE}/api-gateway:latest
+        docker push ${REGISTRY}/${NAMESPACE}/eureka-server:latest
+        docker push ${REGISTRY}/${NAMESPACE}/recommendation-service:latest
+        docker push ${REGISTRY}/${NAMESPACE}/statistics-service:latest
+        docker push ${REGISTRY}/${NAMESPACE}/user-tracking-service:latest
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Deploy to Oracle VM
+      env:
+        ORACLE_VM_IP: ${{ secrets.ORACLE_VM_IP }}
+      run: |
+        echo "${{ secrets.SSH_PRIVATE_KEY }}" > ssh_key.pem
+        chmod 600 ssh_key.pem
+        ssh -o StrictHostKeyChecking=no -i ssh_key.pem opc@${ORACLE_VM_IP} << 'EOF'
+          cd ~/music-analytics/vm-deploy
+          docker login ${REGISTRY} -u ${{ secrets.OCI_USERNAME }} -p ${{ secrets.OCI_AUTH_TOKEN }}
+          docker-compose pull
+          docker-compose up -d
+        EOF
+        rm -f ssh_key.pem  # Clean up sensitive files

.gitignore

@@ -21,9 +21,24 @@ target/
 
 # Environment files with sensitive information
 .env
+.env.*
+!.env.template
+set_oracle_env.bat
 *.pem
 *.key
 
+# Additional sensitive files
+**/application-*.yml
+**/application-*.properties
+!**/application.yml
+!**/application.properties
+**/secrets/
+**/*.password
+**/*.secret
+**/*.token
+**/credentials.*
+**/private-key.*
+
 # Build and deployment artifacts
 vm-deploy/
 cloud-deploy/
@@ -47,4 +62,14 @@ Thumbs.db
 
 # Node modules for frontend
 frontend/node_modules/
-frontend/build/
+frontend/build/
+frontend/.env.*
+!frontend/.env.template
+
+# Ignore SSH configuration directory
+/.ssh
+
+# Oracle Cloud specific
+**/ssh-key-*.key
+**/oracle/*.key
+**/oracle/*.pem