[Infra] Docker configs

.github/workflows/lint-testing-action.yml

@@ -36,7 +36,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Run pytest
-        run: python -m pytest --junitxml=pytest.xml --cov-report=term-missing:skip-covered --cov=app tests/ | tee pytest-coverage.txt
+        run: docker-compose run --rm app sh -c "python -m pytest --junitxml=pytest.xml --cov-report=term-missing:skip-covered --cov=app tests/"
       - name: Pytest coverage report
         id: coverageReport
         uses: MishaKav/pytest-coverage-comment@main

Dockerfile

@@ -0,0 +1,28 @@
+FROM python:3.9-alpine3.13
+LABEL maintainer="github.com/vbuxbaum"
+
+ENV PYTHONUNBUFFERED 1
+
+COPY ./requirements.txt /tmp/requirements.txt
+COPY ./dev-requirements.txt /tmp/dev-requirements.txt
+COPY ./app /app
+WORKDIR /app
+EXPOSE 8000
+# curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+ARG DEV=false
+RUN echo 'starting...' && \
+    apk add --update build-base && \
+    python -m venv /py && \
+    /py/bin/pip install --upgrade pip setuptools wheel && \
+    /py/bin/pip install -r /tmp/requirements.txt && \
+    if [ $DEV = "true" ]; \
+        then /py/bin/pip install -r /tmp/dev-requirements.txt ; \
+    fi && \
+    rm -rf /tmp && \
+    adduser \
+        --disabled-password \
+        fastapi-user
+
+ENV PATH="/py/bin:$PATH"
+
+USER fastapi-user

app/main.py → app/src/main.py

@@ -1,6 +1,6 @@
 from fastapi import FastAPI
 
-from app.routes import cards_route, rounds_route
+from src.routes import cards_route, rounds_route
 
 app = FastAPI()
 

app/models/base_model.py → app/src/models/base_model.py

@@ -1,7 +1,7 @@
 from pymongo.database import Database
 from pymongo import MongoClient
 import pydantic
-from app.config import get_settings
+from src.config import get_settings
 from bson.objectid import ObjectId
 
 

app/models/player_model.py → app/src/models/player_model.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field
-from app.models.card_model import BingoCard
+from src.models.card_model import BingoCard
 
 
 class RoundPlayer(BaseModel):

app/models/round_model.py → app/src/models/round_model.py

@@ -4,8 +4,8 @@
 from bson.objectid import ObjectId
 from pydantic import Field
 
-from app.models.base_model import BaseModel
-from app.models.player_model import RoundPlayer
+from src.models.base_model import BaseModel
+from src.models.player_model import RoundPlayer
 
 
 def pin_generator() -> str:

app/routes/cards_route.py → app/src/routes/cards_route.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Query, HTTPException, status
 
-from app.models.card_model import BingoCard
-from app.services.card_generators import CARD_GENERATORS
+from src.models.card_model import BingoCard
+from src.services.card_generators import CARD_GENERATORS
 
 router = APIRouter(prefix="/card", tags=["cards"])
 

app/routes/rounds_route.py → app/src/routes/rounds_route.py

@@ -1,8 +1,8 @@
 from typing import List
 from fastapi import APIRouter, Body, Depends, HTTPException, Query, status
-from app.models.round_model import RoundModel
-from app.services.rounds_manager import RoundManager
-from app.services.authentication import validate_token
+from src.models.round_model import RoundModel
+from src.services.rounds_manager import RoundManager
+from src.services.authentication import validate_token
 
 router = APIRouter(prefix="/rounds", tags=["rounds"])
 

app/services/authentication.py → app/src/services/authentication.py

@@ -1,4 +1,4 @@
-from app.config import get_settings
+from src.config import get_settings
 
 
 def validate_token(token: str):

app/services/card_generators.py → app/src/services/card_generators.py

@@ -3,7 +3,7 @@
 from typing import Type
 from frozendict import frozendict
 
-from app.models.card_model import BingoCard, CardValues
+from src.models.card_model import BingoCard, CardValues
 
 
 class CardGenerator(ABC):

app/services/rounds_manager.py → app/src/services/rounds_manager.py

@@ -2,9 +2,9 @@
 from fastapi.encoders import jsonable_encoder
 from pymongo.results import DeleteResult
 
-from app.models.base_model import db
-from app.models.round_model import RoundModel, RoundPlayer
-from app.services.card_generators import CARD_GENERATORS
+from src.models.base_model import db
+from src.models.round_model import RoundModel, RoundPlayer
+from src.services.card_generators import CARD_GENERATORS
 
 
 class RoundManager:

tests/conftest.py → app/tests/conftest.py

@@ -1,5 +1,5 @@
 import pytest
-from app.main import app
+from src.main import app
 from fastapi.testclient import TestClient
 
 

tests/factories/round_factory.py → app/tests/factories/round_factory.py

@@ -1,5 +1,5 @@
 from factory import Factory, Faker
-from app.models.round_model import RoundModel
+from src.models.round_model import RoundModel
 
 
 class RoundFactory(Factory):

tests/test_authentication.py → app/tests/test_authentication.py

@@ -1,4 +1,4 @@
-from app.services import authentication
+from src.services import authentication
 
 
 def test_token_validation(mocker, monkeypatch):

tests/test_base_model.py → app/tests/test_base_model.py

@@ -1,4 +1,4 @@
-from app.models.base_model import BaseModel
+from src.models.base_model import BaseModel
 import pytest
 
 

tests/test_cards_generators.py → app/tests/test_cards_generators.py

@@ -1,10 +1,10 @@
-from app.services.card_generators import (
+from src.services.card_generators import (
     CardGenerator,
     ClassicGenerator,
     NSquareDiagGenerator,
     NSquareGenerator,
 )
-from app.models.card_model import BingoCard
+from src.models.card_model import BingoCard
 from hypothesis import given, strategies as st
 import pytest
 

tests/test_cards_model.py → app/tests/test_cards_model.py

@@ -1,5 +1,5 @@
-from app.models import card_model
-from app.services import card_generators
+from src.models import card_model
+from src.services import card_generators
 
 
 def test_compare_equal_cards():

tests/test_cards_route.py → app/tests/test_cards_route.py

@@ -1,6 +1,6 @@
 from hypothesis import given
 import hypothesis.strategies as st
-from app.services.card_generators import CARD_GENERATORS
+from src.services.card_generators import CARD_GENERATORS
 from fastapi.testclient import TestClient
 
 

tests/test_rounds_manager.py → app/tests/test_rounds_manager.py

@@ -1,5 +1,5 @@
 import mongomock
-from app.services.rounds_manager import RoundManager
+from src.services.rounds_manager import RoundManager
 from tests.factories.round_factory import RoundFactory
 import pytest
 from hypothesis import given, HealthCheck, settings, strategies as st

tests/test_rounds_route.py → app/tests/test_rounds_route.py

@@ -4,7 +4,7 @@
 
 def test_get_current_rounds(client: TestClient, mocker):
     mock_get = mocker.patch(
-        "app.services.rounds_manager.RoundManager.get_many"
+        "src.services.rounds_manager.RoundManager.get_many"
     )
     mock_get.return_value = [round_factory.RoundFactory()]
     client.get("/rounds")
@@ -13,7 +13,7 @@ def test_get_current_rounds(client: TestClient, mocker):
 
 def test_get_round_by_id(client: TestClient, mocker):
     mock_get = mocker.patch(
-        "app.services.rounds_manager.RoundManager.get_one_by_id"
+        "src.services.rounds_manager.RoundManager.get_one_by_id"
     )
     mock_get.return_value = round_factory.RoundFactory()
     id_str = "g41ui24kg123b"