Changed project name from "mvc_flask_dash" to "app"

Author: fjudith

docker-compose.yaml

@@ -6,19 +6,20 @@ services:
  restart: always
  hostname: postgres
  environment:
- POSTGRES_USER: ${POSTGRES_USER}
- POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
- POSTGRES_DB: ${POSTGRES_DB}
+ POSTGRES_USER: ${POSTGRES_USER:-postgres}
+ POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-password}
+ POSTGRES_DB: ${POSTGRES_DB:-postgres}
  ports:
- - "55432:5432"
+ - "${POSTGRES_PORT:-5432}:5432"
 
  jaeger:
  image: quay.io/jaegertracing/all-in-one:latest
  environment:
  LOG_LEVEL: debug
  COLLECTOR_OTLP_ENABLED: 'true'
  ports:
- - "58686:16686"
+ - "${JARGER_WEBUI_PORT:-16686}:16686"
+ - "${OTLP_EXPORTER_PORT:-4317}:4317"
 
  web:
  build:
@@ -38,9 +39,9 @@ services:
  OTEL_EXPORTER_OTLP_INSECURE: "true"
  # Postgres
  POSTGRES_HOST: postgres
- POSTGRES_USER: ${POSTGRES_USER}
- POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
- POSTGRES_DB: ${POSTGRES_DB}
+ POSTGRES_USER: ${POSTGRES_USER:-postgres}
+ POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-password}
+ POSTGRES_DB: ${POSTGRES_DB:-postgres}
  links:
  - jaeger
  - postgres
@@ -52,4 +53,3 @@ services:
  - ./README.md:/app/README.md
  - ./setup.cfg:/app/setup.cfg
  - ./VERSION:/app/VERSION
-

pyproject.toml

@@ -1,10 +1,3 @@
 [build-system]
 requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
-
-[tool.pytest.ini_options]
-minversion = "6.0"
-addopts = "-ra -q"
-log_cli = true
-log_cli_level = "INFO"
-# asyncio_mode = "auto"

pytest.ini

@@ -0,0 +1,8 @@
+[pytest]
+minversion = 6.0
+addopts = -ra -q
+log_cli = true
+log_cli_level = INFO
+# asyncio_mode = "auto"
+env_files =
+ .env

requirements.txt

@@ -9,16 +9,14 @@ Flask-SQLAlchemy
 flasgger
 botocore
 psycopg2-binary
-botocore
 sqlalchemy-cockroachdb
 opentelemetry-sdk-extension-aws
 opentelemetry-propagator-aws-xray
-opentelemetry-exporter-jaeger
 opentelemetry-exporter-otlp
 opentelemetry-instrumentation-botocore
 opentelemetry-instrumentation-psycopg2
 opentelemetry-instrumentation-dbapi
 opentelemetry-instrumentation-flask
 opentelemetry-instrumentation-logging
 pytest
-gunicorn
+pytest-dotenv

setup.cfg

@@ -61,4 +61,13 @@ where = src
 
 [options.entry_points]
 console_scripts =
- mvc-flask-dash = mvc_flask_dash:app
+ mvc-flask-dash = app:app
+
+[tool.pytest]
+minversion = 6.0
+addopts = -ra -q
+log_cli = true
+log_cli_level = INFO
+# asyncio_mode = "auto"
+env_files =
+ .env

src/mvc_flask_dash/__init__.py renamed to src/app/__init__.py

@@ -5,11 +5,11 @@
 
 from opentelemetry.instrumentation.flask import FlaskInstrumentor
 
-import mvc_flask_dash.config as config
-from mvc_flask_dash.database import create_db, get_migrate
-from mvc_flask_dash.controllers.postgres import postgres_controllers
-from mvc_flask_dash.views.index import index_views
-from mvc_flask_dash.views.dashboards.postgres import init_postgres_dashboard
+import app.config as config
+from app.database import create_db, get_migrate
+from app.controllers.postgres import postgres_controllers
+from app.views.index import index_views
+from app.views.dashboards.postgres import init_postgres_dashboard
 # New views must be imported and added to this list
 views = [index_views,
  postgres_controllers]
@@ -50,7 +50,7 @@ def create_app():
 
  # Enable flask telemetry
  from opentelemetry import trace
- from mvc_flask_dash.utils import get_openid_user
+ from app.utils import get_openid_user
  def request_hook(span: trace.get_current_span(), environ: app.wsgi_app):
  if span and span.is_recording():
  span.set_attribute("enduser.id", get_openid_user())

src/mvc_flask_dash/app.py renamed to src/app/__main__.py

@@ -32,10 +32,10 @@
 args, unknown = parser.parse_known_args()
 
 # Initialize logging
-from mvc_flask_dash.logging import init_logger
+from app.logging import init_logger
 init_logger(args)
 # Initialize telemetry
-from mvc_flask_dash.telemetry import init_tracer
+from app.telemetry import init_tracer
 init_tracer(args)
 
 from sqlalchemy.engine import URL

src/mvc_flask_dash/config.py renamed to src/app/config.py

@@ -3,7 +3,7 @@
 from flask import Blueprint, render_template
 from flask.json import jsonify
 from flasgger import swag_from
-from mvc_flask_dash.utils import get_openid_user
+from app.utils import get_openid_user
 
 TEMPLATE = pkg_resources.resource_filename(__name__, '../views/templates/postgres.html.j2')
 
@@ -16,7 +16,7 @@
 
 from flask_restful import Resource
 
-from mvc_flask_dash.models.postgres import Fakenames
+from app.models.postgres import Fakenames
 
 class PostgresApis(Resource):
  @staticmethod