Changes for deployment

Author: lyncasterc

.github/workflows/pipeline.yml

@@ -67,67 +67,33 @@ jobs:
           start: npm run server:test, npm start
           wait-on: 'http://localhost:3001/health, http://localhost:3000'
           working-directory: ./frontend
-
-  build:
-    runs-on: ubuntu-20.04
-    defaults:
-      run:
-        working-directory: backend
-    needs: [test_lint_backend, test_lint_frontend]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-      - name: npm install
-        run: npm install
-      - name: install frontend dependencies
-        run: cd ../frontend && npm install
-      - name: build ui
-        run: npm run build:ui
-
-  build-and-push-docker:
-    runs-on: ubuntu-20.04
-    needs: [build]
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      -
-        name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: user/instaclone:latest
-    
   deploy:
     if: ${{ github.ref == 'refs/head/main' }}
+    needs: [test_lint_backend, test_lint_frontend]
     runs-on: ubuntu-20.04
-    needs: [build-and-push-docker]
     steps:
-      - uses: actions/checkout@v2
-      - uses: akhileshns/[email protected]
-        with:
-          heroku_api_key: ${{secrets.HEROKU_API_KEY}}
-          heroku_app_name: "instaclone-sc"
-          heroku_email: "[email protected]"
-          appdir: "backend"
-          healthcheck: ""
-          checkstring: "ok"
-          rollbackonhealthcheckfailed: true
+    - uses: actions/checkout@v2
+    - name: Login to Heroku Container registry
+      env: 
+        HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+      run: heroku container:login 
+    - name: Set Heroku Config Vars
+      env:
+        HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+      run: |
+        heroku config:set JWT_SECRET=${{ secrets.JWT_SECRET }} -a instaclone
+        heroku config:set CLOUDINARY_API_SECRET=${{ secrets.CLOUDINARY_API_SECRET }} -a instaclone
+        heroku config:set CLOUDINARY_API_KEY=${{ secrets.CLOUDINARY_API_KEY }} -a instaclone
+        heroku config:set CLOUDINARY_NAME=${{ secrets.CLOUDINARY_NAME }} -a instaclone
+        heroku config:set PROD_MONGODB_URI=${{ secrets.PROD_MONGODB_URI }} -a instaclone
+    - name: Build and push
+      env:
+        HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+      run: heroku container:push -a instaclone web 
+    - name: Release
+      env:
+        HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+      run: heroku container:release -a instaclone web         
   tag_release:
     if: ${{ github.ref == 'refs/head/main' }}
     needs: [deploy]
@@ -139,7 +105,4 @@ jobs:
       - name: Bump version and push tag
         uses: anothrNick/[email protected]
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-# for deploying, make sure to have all final dependencies installed before deploying at all. aka, don't deploy, realize you need a new dep and then deploy again
-  # todo: research how i can add new packages after deployment and then redeploy 
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 

backend/src/app.ts

@@ -16,8 +16,16 @@ import { errorHandler, logErrorCodes } from './utils/middleware';
 const { NODE_ENV } = process.env;
 const app = express();
 
-if (NODE_ENV === 'development') {
-  mongodbConnect(config.DEV_MONGODB_URI!);
+if (NODE_ENV === 'production' || NODE_ENV === 'development') {
+  const mongodbUri = NODE_ENV === 'production'
+    ? config.PROD_MONGODB_URI
+    : config.DEV_MONGODB_URI;
+
+  if (!mongodbUri) {
+    throw new Error(`The ${NODE_ENV} MongoDB URI is not defined.`);
+  }
+
+  mongodbConnect(mongodbUri);
 } else if (NODE_ENV === 'cypress') {
   (async () => {
     await testMongodb.connect();

backend/src/mongo/index.ts

@@ -1,13 +1,15 @@
 import mongoose from 'mongoose';
 import logger from '../utils/logger';
 
+const { NODE_ENV } = process.env;
+
 const connect = async (uri: string) => {
   try {
     await mongoose.connect(uri);
     logger.info('Connected to: ', uri);
   } catch (error) {
     const message = logger.getErrorMessage(error);
-    logger.error('Error connecting to dev MongoDB: ', message);
+    logger.error(`Error connecting to ${NODE_ENV}  MongoDB: `, message);
   }
 };
 

backend/src/utils/config.ts

@@ -2,6 +2,7 @@ require('dotenv').config();
 
 const {
   DEV_MONGODB_URI,
+  PROD_MONGODB_URI,
   PORT,
   CLOUDINARY_NAME,
   CLOUDINARY_API_KEY,
@@ -16,4 +17,5 @@ export default {
   CLOUDINARY_API_KEY,
   CLOUDINARY_API_SECRET,
   JWT_SECRET,
+  PROD_MONGODB_URI,
 };