From b3525d1c0e7aefb32f1bd95be0fb748a891a3cbf Mon Sep 17 00:00:00 2001
From: Louis Dutoit <louis.dutoitld@gmail.com>
Date: Mon, 18 Jan 2021 18:15:25 +0100
Subject: [PATCH] :wrench: config

---
 .circleci/config.yml | 89 ++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 52 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6c4215e..0667733 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,78 +1,52 @@
-version: 2.1
-workflows:
-  version: 2
-  devopsTP4:
-    jobs:
-      - install
-      - back-deploy-heroku:
-          requires:
-            - install
-      - docker-build-and-push:
-          requires:
-            - install
-
+version: 2
 jobs:
   install:
     docker:
-      - image: cimg/python:3.9.1
-      - image: circleci/postgres:9.6.2
+      - image: circleci/python:3.9.1
+      - image: circleci/postgres:9.6.5
+        environment:
+          POSTGRES_DB: example
+          POSTGRES_USER: circleci
+          POSTGRES_PASSWORD: somePwd
+          POSTGRES_PORT: 5432
+          DATABASE_URL: postgresql://circleci:somePwd@localhost:5432/example
     working_directory: ~/repo
     steps:
       - checkout
-      - setup_remote_docker
       - restore_cache:
           keys:
             - dependencies-{{ checksum "requirements/dev.txt" }}-{{ checksum "requirements/prod.txt" }}
+            - dependencies-
+      - run: 
+          name: Install dependencies
+          command: pip install -r requirements/dev.txt
+      # Upgrade Dependencies
       - run:
-          name: install python and dependencies
-          command: |
-            python3 -m venv venv
-            . venv/bin/activate
-            pip install -r requirements/dev.txt
-      
-      - run: docker container run --name flask_db_test -e POSTGRES_PASSWORD=somePwd -e POSTGRES_USER=myUsr -p 5432:5432 -d postgres
-      - run: sleep 1
-      - run:
-          name: db migration
+          command: pip install sqlalchemy --upgrade && pip install Flask-SQLAlchemy --upgrade
+      - run: 
+          name: Setup dababase
           environment:
             FLASK_APP: /home/circleci/repo/autoapp.py
-            FLASK_DEBUG: 0
-            POSTGRES_USER: postgres
-            POSTGRES_DB: bdtest
-            POSTGRES_PASSWORD: somePwd
-            POSTGRES_PORT: 5432
-            DATABASE_URL: postgresql://postgres:somePwd@localhost:5432/postgres
-          command: |
-            . venv/bin/activate
-            flask db stamp head
-      - run:
-          name: db migration
+            FLASK_DEBUG: 0 
+          command: flask db upgrade
+      - run: 
+          name: Flask test
           environment:
             FLASK_APP: /home/circleci/repo/autoapp.py
             FLASK_DEBUG: 0
-            POSTGRES_USER: postgres
-            POSTGRES_DB: bdtest
-            POSTGRES_PASSWORD: somePwd
-            POSTGRES_PORT: 5432
-            DATABASE_URL: postgresql://postgres:somePwd@localhost:5432/postgres
-          command: |
-            . venv/bin/activate
-            flask db migrate
-      - run: docker container stop flask_db_test
-      - run: docker container rm flask_db_test
-      - run: unset DATABASE_URL
-  back-deploy-heroku:
+          command: flask test
+  deploy-heroku:
     docker:
       - image: buildpack-deps:trusty
     steps:
       - checkout
       - run:
           name: Heroku Deploy
-          command: git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_APP_NAME.git HEAD:main
+          command: git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_APP_NAME.git HEAD:main -f
       - run:
           name: Smoke Test
           command: |
-            HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://devops-final-heroku.herokuapp.com/api/articles`
+            HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://devops-final-heroku.herokuapp.com/`
             if [[ "$HTTPCODE" -ne 200 ]]; then
               echo "heroku app not responding, failing deploy" \
               exit 1; \
@@ -94,4 +68,15 @@ jobs:
             docker tag app $DOCKER_HUB_USER_ID/devops-back-final:$CIRCLE_BUILD_NUM
             docker tag app $DOCKER_HUB_USER_ID/devops-back-final:latest
             docker push $DOCKER_HUB_USER_ID/devops-back-final:$CIRCLE_BUILD_NUM
-            docker push $DOCKER_HUB_USER_ID/devops-back-final:latest
\ No newline at end of file
+            docker push $DOCKER_HUB_USER_ID/devops-back-final:latest
+workflows:
+  version: 2
+  build-test:
+    jobs:
+      - install
+      - deploy-heroku:
+          requires:
+            - install
+      - docker-build-and-push:
+          requires:
+            - install
\ No newline at end of file