Refactoring (#30)

* refactoring * fix CI
airtai · Nov 8, 2024 · 5a4f849 · 5a4f849
1 parent f1fb07b
commit 5a4f849
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 115 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,6 +14,7 @@ jobs:
       matrix:
         python-version: ["3.12", "3.11", "3.10"]
         app-type: ["fastapi+mesop", "mesop", "nats+fastapi+mesop"]
+        authentication: ["google", "none"]
       fail-fast: false
     runs-on: ubuntu-latest
     timeout-minutes: 15
@@ -30,7 +31,7 @@ jobs:
         run: pip install cookiecutter
 
       - name: Test Cookiecutter
-        run: ./scripts/test_cookiecutter.sh ${{ matrix.app-type }} ${{ matrix.python-version }}
+        run: ./scripts/test_cookiecutter.sh ${{ matrix.app-type }} ${{ matrix.python-version }} ${{ matrix.authentication }}
 
   # https://github.com/marketplace/actions/alls-green#why
   check: # This job does nothing and is only used for the branch protection

diff --git a/cookiecutter_replay/fastapi+mesop_3.10.json b/cookiecutter_replay/fastapi+mesop_3.10.json
diff --git a/cookiecutter_replay/fastapi+mesop_3.11.json b/cookiecutter_replay/fastapi+mesop_3.11.json
diff --git a/cookiecutter_replay/fastapi+mesop_3.12.json b/cookiecutter_replay/fastapi+mesop_3.12.json
diff --git a/cookiecutter_replay/mesop_3.10.json b/cookiecutter_replay/mesop_3.10.json
diff --git a/cookiecutter_replay/mesop_3.11.json b/cookiecutter_replay/mesop_3.11.json
diff --git a/cookiecutter_replay/mesop_3.12.json b/cookiecutter_replay/mesop_3.12.json
diff --git a/cookiecutter_replay/nats+fastapi+mesop_3.10.json b/cookiecutter_replay/nats+fastapi+mesop_3.10.json
diff --git a/cookiecutter_replay/nats+fastapi+mesop_3.11.json b/cookiecutter_replay/nats+fastapi+mesop_3.11.json
diff --git a/cookiecutter_replay/nats+fastapi+mesop_3.12.json b/cookiecutter_replay/nats+fastapi+mesop_3.12.json
diff --git a/scripts/generate_cookiecutter_replay.py b/scripts/generate_cookiecutter_replay.py
diff --git a/scripts/generate_cookiecutter_replay.sh b/scripts/generate_cookiecutter_replay.sh
diff --git a/scripts/test_cookiecutter.sh b/scripts/test_cookiecutter.sh
@@ -1,22 +1,23 @@
 #!/bin/bash
 
 # This script is used to test the cookiecutter template
-# It will create a new project using the cookiecutter template under the generated/ directory
+# It will create a new project using the cookiecutter template under the generated/$1-$2-$3/ directory
 # The script accepts two positional arguments: app-type and python-version
 # The cookiecutter replay file is used to provide the default values for the cookiecutter template
 
 # Accept two arguments: app-type and python-version
-echo -e "\033[32mGenerating project using cookiecutter template with app-type: $1 and python-version: $2\033[0m"
-cookiecutter -f --replay-file ./cookiecutter_replay/$1_$2.json --output-dir generated/ ./ 
+echo -e "\033[32mGenerating project using cookiecutter template with app-type: $1, python-version: $2 and authentication: $3\033[0m"
+rm -rf generated/$1-$2-$3
+cookiecutter -f --no-input --output-dir generated/$1-$2-$3/ ./ app_type=$1 python_version=$2 authentication=$3
 
 # Install generated project's dependencies
 echo -e "\033[32mInstalling dependencies for the generated project\033[0m"
-cd generated/my_fastagency_app && pip install -e .[dev] && cd ../../
+cd generated/$1-$2-$3/my_fastagency_app && pip install -e .[dev] && cd ../../..
 
 # Initialize git in the generated project(needed for pre-commit)
 echo -e "\033[32mInitializing git in the generated project\033[0m"
-cd generated/my_fastagency_app && git init && git add . && cd ../../
+cd generated/$1-$2-$3/my_fastagency_app && git init && git add . && cd ../../..
 
 # Run pre-commit
 echo -e "\033[32mRunning pre-commit\033[0m"
-cd generated/my_fastagency_app && pre-commit run --show-diff-on-failure --color=always --all-files && cd ../../
+cd generated/$1-$2-$3/my_fastagency_app && pre-commit run --show-diff-on-failure --color=always --all-files && cd ../../..