Merge branch 'main' into develop

Author: anibalcontreras

.github/workflows/cd-deploy.yml

@@ -0,0 +1,29 @@
+name: CD Deploy
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+    deploy:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Configure AWS credentials
+              uses: aws-actions/configure-aws-credentials@v1
+              with:
+                aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+                aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+                aws-region: us-east-2
+            - name: Deploy application
+              id: deployApplicaiton
+              run: |
+                deploymentId=$(aws deploy create-deployment \
+                    --application-name PiggyWallet-backend \
+                    --deployment-config-name CodeDeployDefault.OneAtATime \
+                    --deployment-group-name CodeDeployGitHubDemo-DepGrp \
+                    --description "Automatic deployment of ${{github.sha}}" \
+                    --github-location repository=Kalgoc/piggy-wallet-backend,commitId=${{github.sha}} | jq -r '.deploymentId')
+                echo "deploymentId=$deploymentId" >> $GITHUB_OUTPUT
+            - name: Wait for deployment to finish
+              run: aws deploy wait deployment-successful --deployment-id ${{ steps.deployApplicaiton.outputs.deploymentId }}

appspec.yml

@@ -4,7 +4,7 @@ os: linux
 # In this case we copy all the files of the project to the EC2
 files:
   - source: /
-    destination: /home/ubuntu/api
+    destination: /home/ubuntu/piggy-wallet-backend
 
 # If a file already exists in the destination, it will be OVERWRITTEN
 file_exists_behavior: OVERWRITE

docker-compose.yml

@@ -6,17 +6,21 @@ services:
     image: postgres:latest
     volumes:
       - postgres_data:/var/lib/postgresql/data
-    environment:
-      POSTGRES_HOST_AUTH_METHOD: trust
     ports:
       - "5432:5432"
     networks:
       - app_network
+    environment:
+      POSTGRES_DB: ${DB_NAME}
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_PORT: ${DB_PORT}
+      POSTGRES_HOST: ${DB_HOST}
 
   web:
     build:
       context: .
-      dockerfile: Dev.Dockerfile
+      dockerfile: Dockerfile
     container_name: web
     volumes:
       - .:/app
@@ -33,7 +37,7 @@ services:
       POSTGRES_PORT: ${DB_PORT}
       POSTGRES_HOST: ${DB_HOST}
       OPENAI_API_KEY: ${OPENAI_API_KEY}
-      DJANGO_SETTINGS_MODULE: piggywallet.settings.dev
+      DJANGO_SETTINGS_MODULE: piggywallet.settings.prod
 
 networks:
   app_network:

playground/tests.py

@@ -6,4 +6,4 @@ class HelloWorldTest(TestCase):
     def test_hello_world(self):
         response = self.client.get(reverse("hello-world"))
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "Hello World!")
+        self.assertContains(response, "Hello World")

playground/views.py

@@ -2,4 +2,4 @@
 
 
 def hello_world(request):
-    return JsonResponse({"message": "Hello World!"})
+    return JsonResponse({"message": "Hello World"})

scripts/after_install.sh

@@ -1,4 +1,4 @@
 # !/bin/bash
-cd /home/ubuntu/api
+cd /home/ubuntu/piggy-wallet-backend
 
 echo "Running After Start Script ..."

scripts/application_start.sh

@@ -1,5 +1,5 @@
 # !/bin/bash
-cd /home/ubuntu/api
+cd /home/ubuntu/piggy-wallet-backend
 
 echo "Starting service ..."
-docker compose up -d
+sudo docker compose up -d --build

scripts/application_stop.sh

@@ -1,5 +1,5 @@
 # !/bin/bash
-cd /home/ubuntu/api
+cd /home/ubuntu/piggy-wallet-backend
 
 echo "Stopping service ..."
-docker compose down
+sudo docker compose down

scripts/validate_service.sh

@@ -1,4 +1,4 @@
 # !/bin/bash
-cd /home/ubuntu/api
+cd /home/ubuntu/piggy-wallet-backend
 
 echo "Validating service is Up ..."