mirror of
https://github.com/dat515-2025/Group-8.git
synced 2026-03-22 15:12:08 +01:00
Compare commits
27 Commits
merge/clou
...
3eeec5ab30
| Author | SHA1 | Date | |
|---|---|---|---|
| 3eeec5ab30 | |||
| 95c8bf1e92 | |||
| b213f22a15 | |||
| 0cf06b7bd9 | |||
| 7a67b12533 | |||
| a91aea805f | |||
| 32764ab1b0 | |||
| df0f2584ae | |||
| b7570e334f | |||
| 4ea6876b74 | |||
| 6d5dd1a222 | |||
|
|
f09f9eaa82 | ||
| ae10c4daff | |||
| abebdb019b | |||
| 6040f4339c | |||
| 72c241f4f7 | |||
| 8db669ac72 | |||
| e32e18f0de | |||
| 95996d22f8 | |||
|
|
991c070918 | ||
|
|
a717e4afeb | ||
|
|
2bc03bcd5b | ||
| dbd37a8b83 | |||
| f1cbdbce9c | |||
| fa1b9523a1 | |||
| e5fceb886b | |||
| ec7c0cbc7a |
2
.github/workflows/deploy-pr.yaml
vendored
2
.github/workflows/deploy-pr.yaml
vendored
@@ -114,7 +114,7 @@ jobs:
|
|||||||
uninstall:
|
uninstall:
|
||||||
if: github.event.action == 'closed'
|
if: github.event.action == 'closed'
|
||||||
name: Helm uninstall (PR preview)
|
name: Helm uninstall (PR preview)
|
||||||
runs-on: ubuntu-latest
|
runs-on: vhs
|
||||||
steps:
|
steps:
|
||||||
- name: Setup Helm
|
- name: Setup Helm
|
||||||
uses: azure/setup-helm@v4
|
uses: azure/setup-helm@v4
|
||||||
|
|||||||
4
.github/workflows/deploy-prod.yaml
vendored
4
.github/workflows/deploy-prod.yaml
vendored
@@ -5,9 +5,11 @@ on:
|
|||||||
branches: [ "main" ]
|
branches: [ "main" ]
|
||||||
paths:
|
paths:
|
||||||
- 7project/backend/**
|
- 7project/backend/**
|
||||||
|
- 7project/frontend/**
|
||||||
- 7project/charts/myapp-chart/**
|
- 7project/charts/myapp-chart/**
|
||||||
- .github/workflows/deploy-prod.yaml
|
- .github/workflows/deploy-prod.yaml
|
||||||
- .github/workflows/build-image.yaml
|
- .github/workflows/build-image.yaml
|
||||||
|
- .github/workflows/frontend-pages.yml
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
|
|
||||||
@@ -38,7 +40,7 @@ jobs:
|
|||||||
deploy:
|
deploy:
|
||||||
name: Helm upgrade/install (prod)
|
name: Helm upgrade/install (prod)
|
||||||
runs-on: vhs
|
runs-on: vhs
|
||||||
needs: [build]
|
needs: [build, frontend]
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|||||||
29
.github/workflows/frontend-pages.yml
vendored
29
.github/workflows/frontend-pages.yml
vendored
@@ -60,21 +60,40 @@ jobs:
|
|||||||
EVENT_NAME: ${{ github.event_name }}
|
EVENT_NAME: ${{ github.event_name }}
|
||||||
PR_NUMBER: ${{ github.event.pull_request.number || inputs.pr_number }}
|
PR_NUMBER: ${{ github.event.pull_request.number || inputs.pr_number }}
|
||||||
PR_TEMPLATE: ${{ vars.BACKEND_URL_PR_TEMPLATE }}
|
PR_TEMPLATE: ${{ vars.BACKEND_URL_PR_TEMPLATE }}
|
||||||
PROD_DOMAIN: ${{ vars.PROD_DOMAIN }}
|
DEV_BASE_DOMAIN: ${{ secrets.BASE_DOMAIN }}
|
||||||
|
PROD_DOMAIN_VAR: ${{ vars.PROD_DOMAIN }}
|
||||||
|
PROD_DOMAIN_SECRET: ${{ secrets.PROD_DOMAIN }}
|
||||||
|
BACKEND_URL_OVERRIDE: ${{ vars.BACKEND_URL || secrets.BACKEND_URL }}
|
||||||
MODE: ${{ inputs.mode }}
|
MODE: ${{ inputs.mode }}
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
URL=""
|
URL=""
|
||||||
if [ -n "${PROD_DOMAIN:-}" ]; then
|
# 1) Explicit override wins (from repo var or secret)
|
||||||
|
if [ -n "${BACKEND_URL_OVERRIDE:-}" ]; then
|
||||||
|
if echo "$BACKEND_URL_OVERRIDE" | grep -Eiq '^https?://'; then
|
||||||
|
URL="$BACKEND_URL_OVERRIDE"
|
||||||
|
else
|
||||||
|
URL="https://${BACKEND_URL_OVERRIDE}"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# 2) PR-specific URL when building for PR
|
||||||
|
if [ "${MODE:-}" = "pr" ] || [ "${EVENT_NAME}" = "pull_request" ]; then
|
||||||
|
if [ -n "${PR_TEMPLATE:-}" ] && [ -n "${PR_NUMBER:-}" ] ; then
|
||||||
|
URL="${PR_TEMPLATE//\{PR\}/${PR_NUMBER}}"
|
||||||
|
elif [ -n "${DEV_BASE_DOMAIN:-}" ] && [ -n "${PR_NUMBER:-}" ]; then
|
||||||
|
URL="https://pr-${PR_NUMBER}.${DEV_BASE_DOMAIN}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
# 3) Fallback to PROD_DOMAIN (prefer repo var, then secret)
|
||||||
|
if [ -z "$URL" ]; then
|
||||||
|
PROD_DOMAIN="${PROD_DOMAIN_VAR:-${PROD_DOMAIN_SECRET:-}}"
|
||||||
|
if [ -n "$PROD_DOMAIN" ]; then
|
||||||
if echo "$PROD_DOMAIN" | grep -Eiq '^https?://'; then
|
if echo "$PROD_DOMAIN" | grep -Eiq '^https?://'; then
|
||||||
URL="$PROD_DOMAIN"
|
URL="$PROD_DOMAIN"
|
||||||
else
|
else
|
||||||
URL="https://${PROD_DOMAIN}"
|
URL="https://${PROD_DOMAIN}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [ "${MODE:-}" = "pr" ] || [ "${EVENT_NAME}" = "pull_request" ]; then
|
|
||||||
if [ -n "${PR_TEMPLATE:-}" ] && [ -n "${PR_NUMBER:-}" ] ; then
|
|
||||||
URL="${PR_TEMPLATE//\{PR\}/${PR_NUMBER}}"
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
echo "Using backend URL: ${URL:-<empty>}"
|
echo "Using backend URL: ${URL:-<empty>}"
|
||||||
|
|||||||
@@ -45,11 +45,11 @@ flowchart LR
|
|||||||
proc_cron[Task planner] --> proc_queue
|
proc_cron[Task planner] --> proc_queue
|
||||||
proc_queue_worker --> ext_bank[(Bank API)]
|
proc_queue_worker --> ext_bank[(Bank API)]
|
||||||
proc_queue_worker --> db
|
proc_queue_worker --> db
|
||||||
client[Client/UI] --> api[API Gateway / Web Server]
|
client[Client/UI] <--> api[API Gateway / Web Server]
|
||||||
api --> svc[Web API]
|
api <--> svc[Web API]
|
||||||
svc --> proc_queue
|
svc --> proc_queue
|
||||||
svc --> db[(Database)]
|
svc <--> db[(Database)]
|
||||||
svc --> cache[(Cache)]
|
svc <--> cache[(Cache)]
|
||||||
```
|
```
|
||||||
|
|
||||||
- Components and responsibilities: What does each box do?
|
- Components and responsibilities: What does each box do?
|
||||||
|
|||||||
@@ -5,4 +5,4 @@ COPY requirements.txt .
|
|||||||
RUN pip install --no-cache-dir -r requirements.txt
|
RUN pip install --no-cache-dir -r requirements.txt
|
||||||
COPY . .
|
COPY . .
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
CMD alembic upgrade head && uvicorn app.app:app --host 0.0.0.0 --port 8000
|
CMD alembic upgrade head && uvicorn app.app:fastApi --host 0.0.0.0 --port 8000
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ script_location = %(here)s/alembic
|
|||||||
# Uncomment the line below if you want the files to be prepended with date and time
|
# Uncomment the line below if you want the files to be prepended with date and time
|
||||||
# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
|
# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
|
||||||
# for all available tokens
|
# for all available tokens
|
||||||
# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
|
file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
|
||||||
|
|
||||||
# sys.path path, will be prepended to sys.path if present.
|
# sys.path path, will be prepended to sys.path if present.
|
||||||
# defaults to the current working directory. for multiple paths, the path separator
|
# defaults to the current working directory. for multiple paths, the path separator
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
"""Init migration
|
"""add categories
|
||||||
|
|
||||||
Revision ID: 81f275275556
|
Revision ID: 63e072f09836
|
||||||
Revises:
|
Revises:
|
||||||
Create Date: 2025-09-24 17:39:25.346690
|
Create Date: 2025-10-09 14:56:14.653249
|
||||||
|
|
||||||
"""
|
"""
|
||||||
from typing import Sequence, Union
|
from typing import Sequence, Union
|
||||||
@@ -13,7 +13,7 @@ import sqlalchemy as sa
|
|||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
# revision identifiers, used by Alembic.
|
||||||
revision: str = '81f275275556'
|
revision: str = '63e072f09836'
|
||||||
down_revision: Union[str, Sequence[str], None] = None
|
down_revision: Union[str, Sequence[str], None] = None
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
@@ -22,12 +22,6 @@ depends_on: Union[str, Sequence[str], None] = None
|
|||||||
def upgrade() -> None:
|
def upgrade() -> None:
|
||||||
"""Upgrade schema."""
|
"""Upgrade schema."""
|
||||||
# ### commands auto generated by Alembic - please adjust! ###
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
op.create_table('transaction',
|
|
||||||
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
|
|
||||||
sa.Column('amount', sa.Float(), nullable=False),
|
|
||||||
sa.Column('description', sa.String(length=255), nullable=True),
|
|
||||||
sa.PrimaryKeyConstraint('id')
|
|
||||||
)
|
|
||||||
op.create_table('user',
|
op.create_table('user',
|
||||||
sa.Column('first_name', sa.String(length=100), nullable=True),
|
sa.Column('first_name', sa.String(length=100), nullable=True),
|
||||||
sa.Column('last_name', sa.String(length=100), nullable=True),
|
sa.Column('last_name', sa.String(length=100), nullable=True),
|
||||||
@@ -40,13 +34,38 @@ def upgrade() -> None:
|
|||||||
sa.PrimaryKeyConstraint('id')
|
sa.PrimaryKeyConstraint('id')
|
||||||
)
|
)
|
||||||
op.create_index(op.f('ix_user_email'), 'user', ['email'], unique=True)
|
op.create_index(op.f('ix_user_email'), 'user', ['email'], unique=True)
|
||||||
|
op.create_table('categories',
|
||||||
|
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
|
||||||
|
sa.Column('name', sa.String(length=100), nullable=False),
|
||||||
|
sa.Column('description', sa.String(length=255), nullable=True),
|
||||||
|
sa.Column('user_id', fastapi_users_db_sqlalchemy.generics.GUID(), nullable=False),
|
||||||
|
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
|
||||||
|
sa.PrimaryKeyConstraint('id'),
|
||||||
|
sa.UniqueConstraint('name')
|
||||||
|
)
|
||||||
|
op.create_table('transaction',
|
||||||
|
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
|
||||||
|
sa.Column('amount', sa.Float(), nullable=False),
|
||||||
|
sa.Column('description', sa.String(length=255), nullable=True),
|
||||||
|
sa.Column('user_id', fastapi_users_db_sqlalchemy.generics.GUID(), nullable=False),
|
||||||
|
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
|
||||||
|
sa.PrimaryKeyConstraint('id')
|
||||||
|
)
|
||||||
|
op.create_table('category_transaction',
|
||||||
|
sa.Column('id_category', sa.Integer(), nullable=True),
|
||||||
|
sa.Column('id_transaction', sa.Integer(), nullable=True),
|
||||||
|
sa.ForeignKeyConstraint(['id_category'], ['categories.id'], ),
|
||||||
|
sa.ForeignKeyConstraint(['id_transaction'], ['transaction.id'], )
|
||||||
|
)
|
||||||
# ### end Alembic commands ###
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
def downgrade() -> None:
|
||||||
"""Downgrade schema."""
|
"""Downgrade schema."""
|
||||||
# ### commands auto generated by Alembic - please adjust! ###
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_table('category_transaction')
|
||||||
|
op.drop_table('transaction')
|
||||||
|
op.drop_table('categories')
|
||||||
op.drop_index(op.f('ix_user_email'), table_name='user')
|
op.drop_index(op.f('ix_user_email'), table_name='user')
|
||||||
op.drop_table('user')
|
op.drop_table('user')
|
||||||
op.drop_table('transaction')
|
|
||||||
# ### end Alembic commands ###
|
# ### end Alembic commands ###
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
"""update categories unique
|
||||||
|
|
||||||
|
Revision ID: 390041bd839e
|
||||||
|
Revises: 63e072f09836
|
||||||
|
Create Date: 2025-10-09 15:14:31.557686
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = '390041bd839e'
|
||||||
|
down_revision: Union[str, Sequence[str], None] = '63e072f09836'
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
"""Upgrade schema."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_index(op.f('name'), table_name='categories')
|
||||||
|
op.create_unique_constraint('uix_name_user_id', 'categories', ['name', 'user_id'])
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade schema."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_constraint('uix_name_user_id', 'categories', type_='unique')
|
||||||
|
op.create_index(op.f('name'), 'categories', ['name'], unique=True)
|
||||||
|
# ### end Alembic commands ###
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
"""add user oauth
|
||||||
|
|
||||||
|
Revision ID: 7af8f296d089
|
||||||
|
Revises: 390041bd839e
|
||||||
|
Create Date: 2025-10-10 14:05:00.153376
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
import fastapi_users_db_sqlalchemy
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = '7af8f296d089'
|
||||||
|
down_revision: Union[str, Sequence[str], None] = '390041bd839e'
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
"""Upgrade schema."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.create_table('oauth_account',
|
||||||
|
sa.Column('id', fastapi_users_db_sqlalchemy.generics.GUID(), nullable=False),
|
||||||
|
sa.Column('user_id', fastapi_users_db_sqlalchemy.generics.GUID(), nullable=False),
|
||||||
|
sa.Column('oauth_name', sa.String(length=100), nullable=False),
|
||||||
|
sa.Column('access_token', sa.String(length=1024), nullable=False),
|
||||||
|
sa.Column('expires_at', sa.Integer(), nullable=True),
|
||||||
|
sa.Column('refresh_token', sa.String(length=1024), nullable=True),
|
||||||
|
sa.Column('account_id', sa.String(length=320), nullable=False),
|
||||||
|
sa.Column('account_email', sa.String(length=320), nullable=False),
|
||||||
|
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='cascade'),
|
||||||
|
sa.PrimaryKeyConstraint('id')
|
||||||
|
)
|
||||||
|
op.create_index(op.f('ix_oauth_account_account_id'), 'oauth_account', ['account_id'], unique=False)
|
||||||
|
op.create_index(op.f('ix_oauth_account_oauth_name'), 'oauth_account', ['oauth_name'], unique=False)
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade schema."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_index(op.f('ix_oauth_account_oauth_name'), table_name='oauth_account')
|
||||||
|
op.drop_index(op.f('ix_oauth_account_account_id'), table_name='oauth_account')
|
||||||
|
op.drop_table('oauth_account')
|
||||||
|
# ### end Alembic commands ###
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
"""change token length
|
||||||
|
|
||||||
|
Revision ID: 5ab2e654c96e
|
||||||
|
Revises: 7af8f296d089
|
||||||
|
Create Date: 2025-10-11 21:07:41.930470
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
from sqlalchemy.dialects import mysql
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = '5ab2e654c96e'
|
||||||
|
down_revision: Union[str, Sequence[str], None] = '7af8f296d089'
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
"""Upgrade schema."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.alter_column('oauth_account', 'access_token',
|
||||||
|
existing_type=mysql.VARCHAR(length=1024),
|
||||||
|
type_=sa.String(length=4096),
|
||||||
|
existing_nullable=False)
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade schema."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.alter_column('oauth_account', 'access_token',
|
||||||
|
existing_type=sa.String(length=4096),
|
||||||
|
type_=mysql.VARCHAR(length=1024),
|
||||||
|
existing_nullable=False)
|
||||||
|
# ### end Alembic commands ###
|
||||||
@@ -4,12 +4,12 @@ from fastapi.middleware.cors import CORSMiddleware
|
|||||||
from app.models.user import User
|
from app.models.user import User
|
||||||
|
|
||||||
from app.schemas.user import UserCreate, UserRead, UserUpdate
|
from app.schemas.user import UserCreate, UserRead, UserUpdate
|
||||||
from app.services.user_service import auth_backend, current_active_verified_user, fastapi_users
|
from app.services.user_service import auth_backend, current_active_verified_user, fastapi_users, get_oauth_provider
|
||||||
|
|
||||||
app = FastAPI()
|
fastApi = FastAPI()
|
||||||
|
|
||||||
# CORS for frontend dev server
|
# CORS for frontend dev server
|
||||||
app.add_middleware(
|
fastApi.add_middleware(
|
||||||
CORSMiddleware,
|
CORSMiddleware,
|
||||||
allow_origins=[
|
allow_origins=[
|
||||||
"http://localhost:5173",
|
"http://localhost:5173",
|
||||||
@@ -20,37 +20,59 @@ app.add_middleware(
|
|||||||
allow_headers=["*"],
|
allow_headers=["*"],
|
||||||
)
|
)
|
||||||
|
|
||||||
app.include_router(
|
fastApi.include_router(
|
||||||
fastapi_users.get_auth_router(auth_backend), prefix="/auth/jwt", tags=["auth"]
|
fastapi_users.get_auth_router(auth_backend), prefix="/auth/jwt", tags=["auth"]
|
||||||
)
|
)
|
||||||
app.include_router(
|
fastApi.include_router(
|
||||||
fastapi_users.get_register_router(UserRead, UserCreate),
|
fastapi_users.get_register_router(UserRead, UserCreate),
|
||||||
prefix="/auth",
|
prefix="/auth",
|
||||||
tags=["auth"],
|
tags=["auth"],
|
||||||
)
|
)
|
||||||
app.include_router(
|
fastApi.include_router(
|
||||||
fastapi_users.get_reset_password_router(),
|
fastapi_users.get_reset_password_router(),
|
||||||
prefix="/auth",
|
prefix="/auth",
|
||||||
tags=["auth"],
|
tags=["auth"],
|
||||||
)
|
)
|
||||||
app.include_router(
|
fastApi.include_router(
|
||||||
fastapi_users.get_verify_router(UserRead),
|
fastapi_users.get_verify_router(UserRead),
|
||||||
prefix="/auth",
|
prefix="/auth",
|
||||||
tags=["auth"],
|
tags=["auth"],
|
||||||
)
|
)
|
||||||
app.include_router(
|
fastApi.include_router(
|
||||||
fastapi_users.get_users_router(UserRead, UserUpdate),
|
fastapi_users.get_users_router(UserRead, UserUpdate),
|
||||||
prefix="/users",
|
prefix="/users",
|
||||||
tags=["users"],
|
tags=["users"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
fastApi.include_router(
|
||||||
|
fastapi_users.get_oauth_router(
|
||||||
|
get_oauth_provider("MojeID"),
|
||||||
|
auth_backend,
|
||||||
|
"SECRET",
|
||||||
|
associate_by_email=True,
|
||||||
|
),
|
||||||
|
prefix="/auth/mojeid",
|
||||||
|
tags=["auth"],
|
||||||
|
)
|
||||||
|
|
||||||
|
fastApi.include_router(
|
||||||
|
fastapi_users.get_oauth_router(
|
||||||
|
get_oauth_provider("BankID"),
|
||||||
|
auth_backend,
|
||||||
|
"SECRET",
|
||||||
|
associate_by_email=True,
|
||||||
|
),
|
||||||
|
prefix="/auth/bankid",
|
||||||
|
tags=["auth"],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
# Liveness/root endpoint
|
# Liveness/root endpoint
|
||||||
@app.get("/", include_in_schema=False)
|
@fastApi.get("/", include_in_schema=False)
|
||||||
async def root():
|
async def root():
|
||||||
return {"status": "ok"}
|
return {"status": "ok"}
|
||||||
|
|
||||||
|
|
||||||
@app.get("/authenticated-route")
|
@fastApi.get("/authenticated-route")
|
||||||
async def authenticated_route(user: User = Depends(current_active_verified_user)):
|
async def authenticated_route(user: User = Depends(current_active_verified_user)):
|
||||||
return {"message": f"Hello {user.email}!"}
|
return {"message": f"Hello {user.email}!"}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ if not DATABASE_URL:
|
|||||||
# Load all models to register them
|
# Load all models to register them
|
||||||
from app.models.user import User
|
from app.models.user import User
|
||||||
from app.models.transaction import Transaction
|
from app.models.transaction import Transaction
|
||||||
|
from app.models.categories import Category
|
||||||
|
|
||||||
ssl_enabled = os.getenv("MARIADB_HOST", "localhost") != "localhost"
|
ssl_enabled = os.getenv("MARIADB_HOST", "localhost") != "localhost"
|
||||||
connect_args = {"ssl": {"ssl": True}} if ssl_enabled else {}
|
connect_args = {"ssl": {"ssl": True}} if ssl_enabled else {}
|
||||||
|
|||||||
25
7project/backend/app/models/categories.py
Normal file
25
7project/backend/app/models/categories.py
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
from fastapi_users_db_sqlalchemy import GUID
|
||||||
|
from sqlalchemy import Column, Integer, String, ForeignKey, Table, UniqueConstraint
|
||||||
|
from sqlalchemy.orm import relationship
|
||||||
|
|
||||||
|
from app.core.base import Base
|
||||||
|
|
||||||
|
association_table = Table(
|
||||||
|
"category_transaction",
|
||||||
|
Base.metadata,
|
||||||
|
Column("id_category", Integer, ForeignKey("categories.id")),
|
||||||
|
Column("id_transaction", Integer, ForeignKey("transaction.id"))
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class Category(Base):
|
||||||
|
__tablename__ = "categories"
|
||||||
|
__table_args__ = (
|
||||||
|
UniqueConstraint("name", "user_id", name="uix_name_user_id"),
|
||||||
|
)
|
||||||
|
id = Column(Integer, primary_key=True, autoincrement=True)
|
||||||
|
name = Column(String(length=100), nullable=False)
|
||||||
|
description = Column(String(length=255), nullable=True)
|
||||||
|
user_id = Column(GUID, ForeignKey("user.id"), nullable=False)
|
||||||
|
user = relationship("User", back_populates="categories")
|
||||||
|
transactions = relationship("Transaction", secondary=association_table, back_populates="categories")
|
||||||
@@ -1,9 +1,17 @@
|
|||||||
from sqlalchemy import Column, Integer, String, Float
|
from fastapi_users_db_sqlalchemy import GUID
|
||||||
|
from sqlalchemy import Column, Integer, String, Float, ForeignKey
|
||||||
|
from sqlalchemy.orm import relationship
|
||||||
from app.core.base import Base
|
from app.core.base import Base
|
||||||
|
from app.models.categories import association_table
|
||||||
|
|
||||||
|
|
||||||
class Transaction(Base):
|
class Transaction(Base):
|
||||||
__tablename__ = "transaction"
|
__tablename__ = "transaction"
|
||||||
id = Column(Integer, primary_key=True, autoincrement=True)
|
id = Column(Integer, primary_key=True, autoincrement=True)
|
||||||
amount = Column(Float, nullable=False)
|
amount = Column(Float, nullable=False)
|
||||||
description = Column(String(length=255), nullable=True)
|
description = Column(String(length=255), nullable=True)
|
||||||
|
user_id = Column(GUID, ForeignKey("user.id"), nullable=False)
|
||||||
|
|
||||||
|
# Relationship
|
||||||
|
user = relationship("User", back_populates="transactions")
|
||||||
|
categories = relationship("Category", secondary=association_table, back_populates="transactions")
|
||||||
|
|||||||
@@ -1,7 +1,19 @@
|
|||||||
from sqlalchemy import Column, String
|
from sqlalchemy import Column, String
|
||||||
from fastapi_users.db import SQLAlchemyBaseUserTableUUID
|
from sqlalchemy.orm import relationship, mapped_column, Mapped
|
||||||
|
from fastapi_users.db import SQLAlchemyBaseUserTableUUID, SQLAlchemyBaseOAuthAccountTableUUID
|
||||||
from app.core.base import Base
|
from app.core.base import Base
|
||||||
|
|
||||||
|
|
||||||
|
class OAuthAccount(SQLAlchemyBaseOAuthAccountTableUUID, Base):
|
||||||
|
# BankID token is longer than default
|
||||||
|
access_token: Mapped[str] = mapped_column(String(length=4096), nullable=False)
|
||||||
|
|
||||||
|
|
||||||
class User(SQLAlchemyBaseUserTableUUID, Base):
|
class User(SQLAlchemyBaseUserTableUUID, Base):
|
||||||
first_name = Column(String(length=100), nullable=True)
|
first_name = Column(String(length=100), nullable=True)
|
||||||
last_name = Column(String(length=100), nullable=True)
|
last_name = Column(String(length=100), nullable=True)
|
||||||
|
oauth_accounts = relationship("OAuthAccount", lazy="joined")
|
||||||
|
|
||||||
|
# Relationship
|
||||||
|
transactions = relationship("Transaction", back_populates="user")
|
||||||
|
categories = relationship("Category", back_populates="user")
|
||||||
|
|||||||
0
7project/backend/app/oauth/__init__.py
Normal file
0
7project/backend/app/oauth/__init__.py
Normal file
50
7project/backend/app/oauth/bank_id.py
Normal file
50
7project/backend/app/oauth/bank_id.py
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
import secrets
|
||||||
|
from typing import Optional, Literal
|
||||||
|
|
||||||
|
from httpx_oauth.oauth2 import T
|
||||||
|
|
||||||
|
from app.oauth.custom_openid import CustomOpenID
|
||||||
|
|
||||||
|
|
||||||
|
class BankID(CustomOpenID):
|
||||||
|
def __init__(self, client_id: str, client_secret: str):
|
||||||
|
super().__init__(
|
||||||
|
client_id,
|
||||||
|
client_secret,
|
||||||
|
"https://oidc.sandbox.bankid.cz/.well-known/openid-configuration",
|
||||||
|
"BankID",
|
||||||
|
base_scopes=["openid", "profile.email", "profile.name"],
|
||||||
|
)
|
||||||
|
|
||||||
|
async def get_user_info(self, token: str) -> dict:
|
||||||
|
info = await self.get_profile(token)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"first_name": info.get("given_name"),
|
||||||
|
"last_name": info.get("family_name"),
|
||||||
|
}
|
||||||
|
|
||||||
|
async def get_authorization_url(
|
||||||
|
self,
|
||||||
|
redirect_uri: str,
|
||||||
|
state: Optional[str] = None,
|
||||||
|
scope: Optional[list[str]] = None,
|
||||||
|
code_challenge: Optional[str] = None,
|
||||||
|
code_challenge_method: Optional[Literal["plain", "S256"]] = None,
|
||||||
|
extras_params: Optional[T] = None,
|
||||||
|
) -> str:
|
||||||
|
if extras_params is None:
|
||||||
|
extras_params = {}
|
||||||
|
|
||||||
|
# BankID requires random nonce parameter for security
|
||||||
|
# https://developer.bankid.cz/docs/security_sep
|
||||||
|
extras_params["nonce"] = secrets.token_urlsafe()
|
||||||
|
|
||||||
|
return await super().get_authorization_url(
|
||||||
|
redirect_uri,
|
||||||
|
state,
|
||||||
|
scope,
|
||||||
|
code_challenge,
|
||||||
|
code_challenge_method,
|
||||||
|
extras_params,
|
||||||
|
)
|
||||||
6
7project/backend/app/oauth/custom_openid.py
Normal file
6
7project/backend/app/oauth/custom_openid.py
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
from httpx_oauth.clients.openid import OpenID
|
||||||
|
|
||||||
|
|
||||||
|
class CustomOpenID(OpenID):
|
||||||
|
async def get_user_info(self, token: str) -> dict:
|
||||||
|
raise NotImplementedError()
|
||||||
56
7project/backend/app/oauth/moje_id.py
Normal file
56
7project/backend/app/oauth/moje_id.py
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
import json
|
||||||
|
from typing import Optional, Literal, Any
|
||||||
|
|
||||||
|
from httpx_oauth.oauth2 import T
|
||||||
|
|
||||||
|
from app.oauth.custom_openid import CustomOpenID
|
||||||
|
|
||||||
|
|
||||||
|
class MojeIDOAuth(CustomOpenID):
|
||||||
|
def __init__(self, client_id: str, client_secret: str):
|
||||||
|
super().__init__(
|
||||||
|
client_id,
|
||||||
|
client_secret,
|
||||||
|
"https://mojeid.regtest.nic.cz/.well-known/openid-configuration/",
|
||||||
|
"MojeID",
|
||||||
|
base_scopes=["openid", "email", "profile"],
|
||||||
|
)
|
||||||
|
|
||||||
|
async def get_user_info(self, token: str) -> Optional[Any]:
|
||||||
|
info = await self.get_profile(token)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"first_name": info.get("given_name"),
|
||||||
|
"last_name": info.get("family_name"),
|
||||||
|
}
|
||||||
|
|
||||||
|
async def get_authorization_url(
|
||||||
|
self,
|
||||||
|
redirect_uri: str,
|
||||||
|
state: Optional[str] = None,
|
||||||
|
scope: Optional[list[str]] = None,
|
||||||
|
code_challenge: Optional[str] = None,
|
||||||
|
code_challenge_method: Optional[Literal["plain", "S256"]] = None,
|
||||||
|
extras_params: Optional[T] = None,
|
||||||
|
) -> str:
|
||||||
|
required_fields = {
|
||||||
|
'id_token': {
|
||||||
|
'name': {'essential': True},
|
||||||
|
'given_name': {'essential': True},
|
||||||
|
'family_name': {'essential': True},
|
||||||
|
'email': {'essential': True},
|
||||||
|
'mojeid_valid': {'essential': True},
|
||||||
|
}}
|
||||||
|
|
||||||
|
if extras_params is None:
|
||||||
|
extras_params = {}
|
||||||
|
extras_params["claims"] = json.dumps(required_fields)
|
||||||
|
|
||||||
|
return await super().get_authorization_url(
|
||||||
|
redirect_uri,
|
||||||
|
state,
|
||||||
|
scope,
|
||||||
|
code_challenge,
|
||||||
|
code_challenge_method,
|
||||||
|
extras_params,
|
||||||
|
)
|
||||||
@@ -4,11 +4,13 @@ from sqlalchemy.ext.asyncio import AsyncSession
|
|||||||
from fastapi_users.db import SQLAlchemyUserDatabase
|
from fastapi_users.db import SQLAlchemyUserDatabase
|
||||||
|
|
||||||
from ..core.db import async_session_maker
|
from ..core.db import async_session_maker
|
||||||
from ..models.user import User
|
from ..models.user import User, OAuthAccount
|
||||||
|
|
||||||
|
|
||||||
async def get_async_session() -> AsyncGenerator[AsyncSession, None]:
|
async def get_async_session() -> AsyncGenerator[AsyncSession, None]:
|
||||||
async with async_session_maker() as session:
|
async with async_session_maker() as session:
|
||||||
yield session
|
yield session
|
||||||
|
|
||||||
|
|
||||||
async def get_user_db(session: AsyncSession = Depends(get_async_session)):
|
async def get_user_db(session: AsyncSession = Depends(get_async_session)):
|
||||||
yield SQLAlchemyUserDatabase(session, User)
|
yield SQLAlchemyUserDatabase(session, User, OAuthAccount)
|
||||||
|
|||||||
@@ -3,26 +3,66 @@ import uuid
|
|||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
from fastapi import Depends, Request
|
from fastapi import Depends, Request
|
||||||
from fastapi_users import BaseUserManager, FastAPIUsers, UUIDIDMixin
|
from fastapi_users import BaseUserManager, FastAPIUsers, UUIDIDMixin, models
|
||||||
from fastapi_users.authentication import (
|
from fastapi_users.authentication import (
|
||||||
AuthenticationBackend,
|
AuthenticationBackend,
|
||||||
BearerTransport,
|
BearerTransport,
|
||||||
)
|
)
|
||||||
from fastapi_users.authentication.strategy.jwt import JWTStrategy
|
from fastapi_users.authentication.strategy.jwt import JWTStrategy
|
||||||
from fastapi_users.db import SQLAlchemyUserDatabase
|
from fastapi_users.db import SQLAlchemyUserDatabase
|
||||||
|
from httpx_oauth.oauth2 import BaseOAuth2
|
||||||
|
|
||||||
from app.models.user import User
|
from app.models.user import User
|
||||||
|
from app.oauth.bank_id import BankID
|
||||||
|
from app.oauth.custom_openid import CustomOpenID
|
||||||
|
from app.oauth.moje_id import MojeIDOAuth
|
||||||
from app.services.db import get_user_db
|
from app.services.db import get_user_db
|
||||||
from app.core.queue import enqueue_email
|
from app.core.queue import enqueue_email
|
||||||
|
|
||||||
SECRET = os.getenv("SECRET", "CHANGE_ME_SECRET")
|
SECRET = os.getenv("SECRET", "CHANGE_ME_SECRET")
|
||||||
|
|
||||||
FRONTEND_URL = os.getenv("FRONTEND_URL", "http://localhost:5173")
|
FRONTEND_URL = os.getenv("FRONTEND_URL", "http://localhost:5173")
|
||||||
BACKEND_URL = os.getenv("BACKEND_URL", "http://localhost:8000")
|
BACKEND_URL = os.getenv("BACKEND_URL", "http://localhost:8000")
|
||||||
|
|
||||||
|
providers = {
|
||||||
|
"MojeID": MojeIDOAuth(
|
||||||
|
os.getenv("MOJEID_CLIENT_ID", "CHANGE_ME_CLIENT_ID"),
|
||||||
|
os.getenv("MOJEID_CLIENT_SECRET", "CHANGE_ME_CLIENT_SECRET"),
|
||||||
|
),
|
||||||
|
"BankID": BankID(
|
||||||
|
os.getenv("BANKID_CLIENT_ID", "CHANGE_ME_CLIENT_ID"),
|
||||||
|
os.getenv("BANKID_CLIENT_SECRET", "CHANGE_ME_CLIENT_SECRET"),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def get_oauth_provider(name: str) -> Optional[BaseOAuth2]:
|
||||||
|
if name not in providers:
|
||||||
|
return None
|
||||||
|
return providers[name]
|
||||||
|
|
||||||
|
|
||||||
class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):
|
class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):
|
||||||
reset_password_token_secret = SECRET
|
reset_password_token_secret = SECRET
|
||||||
verification_token_secret = SECRET
|
verification_token_secret = SECRET
|
||||||
|
|
||||||
|
async def oauth_callback(self: "BaseUserManager[models.UOAP, models.ID]", oauth_name: str, access_token: str,
|
||||||
|
account_id: str, account_email: str, expires_at: Optional[int] = None,
|
||||||
|
refresh_token: Optional[str] = None, request: Optional[Request] = None, *,
|
||||||
|
associate_by_email: bool = False, is_verified_by_default: bool = False) -> models.UOAP:
|
||||||
|
|
||||||
|
user = await super().oauth_callback(oauth_name, access_token, account_id, account_email, expires_at,
|
||||||
|
refresh_token, request, associate_by_email=associate_by_email,
|
||||||
|
is_verified_by_default=is_verified_by_default)
|
||||||
|
|
||||||
|
# set additional user info from the OAuth provider
|
||||||
|
provider = get_oauth_provider(oauth_name)
|
||||||
|
if provider is not None and isinstance(provider, CustomOpenID):
|
||||||
|
update_dict = await provider.get_user_info(access_token)
|
||||||
|
await self.user_db.update(user, update_dict)
|
||||||
|
|
||||||
|
return user
|
||||||
|
|
||||||
async def on_after_register(self, user: User, request: Optional[Request] = None):
|
async def on_after_register(self, user: User, request: Optional[Request] = None):
|
||||||
await self.request_verify(user, request)
|
await self.request_verify(user, request)
|
||||||
|
|
||||||
@@ -52,14 +92,18 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):
|
|||||||
print("[Email Fallback] Subject:", subject)
|
print("[Email Fallback] Subject:", subject)
|
||||||
print("[Email Fallback] Body:\n", body)
|
print("[Email Fallback] Body:\n", body)
|
||||||
|
|
||||||
|
|
||||||
async def get_user_manager(user_db: SQLAlchemyUserDatabase = Depends(get_user_db)):
|
async def get_user_manager(user_db: SQLAlchemyUserDatabase = Depends(get_user_db)):
|
||||||
yield UserManager(user_db)
|
yield UserManager(user_db)
|
||||||
|
|
||||||
|
|
||||||
bearer_transport = BearerTransport(tokenUrl="auth/jwt/login")
|
bearer_transport = BearerTransport(tokenUrl="auth/jwt/login")
|
||||||
|
|
||||||
|
|
||||||
def get_jwt_strategy() -> JWTStrategy:
|
def get_jwt_strategy() -> JWTStrategy:
|
||||||
return JWTStrategy(secret=SECRET, lifetime_seconds=3600)
|
return JWTStrategy(secret=SECRET, lifetime_seconds=3600)
|
||||||
|
|
||||||
|
|
||||||
auth_backend = AuthenticationBackend(
|
auth_backend = AuthenticationBackend(
|
||||||
name="jwt",
|
name="jwt",
|
||||||
transport=bearer_transport,
|
transport=bearer_transport,
|
||||||
@@ -70,4 +114,3 @@ fastapi_users = FastAPIUsers[User, uuid.UUID](get_user_manager, [auth_backend])
|
|||||||
|
|
||||||
current_active_user = fastapi_users.current_user(active=True)
|
current_active_user = fastapi_users.current_user(active=True)
|
||||||
current_active_verified_user = fastapi_users.current_user(active=True, verified=True)
|
current_active_verified_user = fastapi_users.current_user(active=True, verified=True)
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ asyncmy==0.2.9
|
|||||||
bcrypt==4.3.0
|
bcrypt==4.3.0
|
||||||
billiard==4.2.2
|
billiard==4.2.2
|
||||||
celery==5.5.3
|
celery==5.5.3
|
||||||
|
certifi==2025.10.5
|
||||||
cffi==2.0.0
|
cffi==2.0.0
|
||||||
click==8.1.8
|
click==8.1.8
|
||||||
click-didyoumean==0.3.1
|
click-didyoumean==0.3.1
|
||||||
@@ -25,7 +26,10 @@ fastapi-users==14.0.1
|
|||||||
fastapi-users-db-sqlalchemy==7.0.0
|
fastapi-users-db-sqlalchemy==7.0.0
|
||||||
greenlet==3.2.4
|
greenlet==3.2.4
|
||||||
h11==0.16.0
|
h11==0.16.0
|
||||||
|
httpcore==1.0.9
|
||||||
httptools==0.6.4
|
httptools==0.6.4
|
||||||
|
httpx==0.28.1
|
||||||
|
httpx-oauth==0.16.1
|
||||||
idna==3.10
|
idna==3.10
|
||||||
kombu==5.5.4
|
kombu==5.5.4
|
||||||
makefun==1.16.0
|
makefun==1.16.0
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ spec:
|
|||||||
- containerPort: {{ .Values.app.port }}
|
- containerPort: {{ .Values.app.port }}
|
||||||
env:
|
env:
|
||||||
- name: MARIADB_HOST
|
- name: MARIADB_HOST
|
||||||
value: {{ printf "%s.%s.svc.cluster.local" .Values.mariadb.mariaDbRef.name .Values.mariadb.mariaDbRef.namespace | quote }}
|
value: "mariadb-repl-maxscale-internal.mariadb-operator.svc.cluster.local"
|
||||||
- name: MARIADB_PORT
|
- name: MARIADB_PORT
|
||||||
value: '3306'
|
value: '3306'
|
||||||
- name: MARIADB_DB
|
- name: MARIADB_DB
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ worker:
|
|||||||
# Queue name for Celery worker and for CRD Queue
|
# Queue name for Celery worker and for CRD Queue
|
||||||
mailQueueName: "mail_queue"
|
mailQueueName: "mail_queue"
|
||||||
|
|
||||||
|
|
||||||
service:
|
service:
|
||||||
port: 80
|
port: 80
|
||||||
|
|
||||||
|
|||||||
81
7project/checklist.md
Normal file
81
7project/checklist.md
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
# Project Evaluation Checklist
|
||||||
|
|
||||||
|
The group earn points by completing items from the categories below.
|
||||||
|
You are not expected to complete all items.
|
||||||
|
Focus on areas that align with your project goals and interests.
|
||||||
|
|
||||||
|
The core deliverables are required.
|
||||||
|
This means that you must get at least 2 points for each item in this category.
|
||||||
|
|
||||||
|
| **Category** | **Item** | **Max Points** | **Points** |
|
||||||
|
| -------------------------------- | --------------------------------------- | -------------- | ---------------- |
|
||||||
|
| **Core Deliverables (Required)** | | | |
|
||||||
|
| Codebase & Organization | Well-organized project structure | 5 | |
|
||||||
|
| | Clean, readable code | 5 | |
|
||||||
|
| | Use planning tool (e.g., GitHub issues) | 5 | |
|
||||||
|
| | Proper version control usage | 5 | |
|
||||||
|
| | Complete source code | 5 | |
|
||||||
|
| Documentation | Comprehensive reproducibility report | 10 | |
|
||||||
|
| | Updated design document | 5 | |
|
||||||
|
| | Clear build/deployment instructions | 5 | |
|
||||||
|
| | Troubleshooting guide | 5 | |
|
||||||
|
| | Completed self-assessment table | 5 | |
|
||||||
|
| | Hour sheets for all members | 5 | |
|
||||||
|
| Presentation Video | Project demonstration | 5 | |
|
||||||
|
| | Code walk-through | 5 | |
|
||||||
|
| | Deployment showcase | 5 | |
|
||||||
|
| **Technical Implementation** | | | |
|
||||||
|
| Application Functionality | Basic functionality works | 10 | |
|
||||||
|
| | Advanced features implemented | 10 | |
|
||||||
|
| | Error handling & robustness | 10 | |
|
||||||
|
| | User-friendly interface | 5 | |
|
||||||
|
| Backend & Architecture | Stateless web server | 5 | |
|
||||||
|
| | Stateful application | 10 | |
|
||||||
|
| | Database integration | 10 | |
|
||||||
|
| | API design | 5 | |
|
||||||
|
| | Microservices architecture | 10 | |
|
||||||
|
| Cloud Integration | Basic cloud deployment | 10 | |
|
||||||
|
| | Cloud APIs usage | 10 | |
|
||||||
|
| | Serverless components | 10 | |
|
||||||
|
| | Advanced cloud services | 5 | |
|
||||||
|
| **DevOps & Deployment** | | | |
|
||||||
|
| Containerization | Basic Dockerfile | 5 | |
|
||||||
|
| | Optimized Dockerfile | 5 | |
|
||||||
|
| | Docker Compose | 5 | |
|
||||||
|
| | Persistent storage | 5 | |
|
||||||
|
| Deployment & Scaling | Manual deployment | 5 | |
|
||||||
|
| | Automated deployment | 5 | |
|
||||||
|
| | Multiple replicas | 5 | |
|
||||||
|
| | Kubernetes deployment | 10 | |
|
||||||
|
| **Quality Assurance** | | | |
|
||||||
|
| Testing | Unit tests | 5 | |
|
||||||
|
| | Integration tests | 5 | |
|
||||||
|
| | End-to-end tests | 5 | |
|
||||||
|
| | Performance testing | 5 | |
|
||||||
|
| Monitoring & Operations | Health checks | 5 | |
|
||||||
|
| | Logging | 5 | |
|
||||||
|
| | Metrics/Monitoring | 5 | |
|
||||||
|
| Security | HTTPS/TLS | 5 | |
|
||||||
|
| | Authentication | 5 | |
|
||||||
|
| | Authorization | 5 | |
|
||||||
|
| **Innovation & Excellence** | | | |
|
||||||
|
| Advanced Features and | AI/ML Integration | 10 | |
|
||||||
|
| Technical Excellence | Real-time features | 10 | |
|
||||||
|
| | Creative problem solving | 10 | |
|
||||||
|
| | Performance optimization | 5 | |
|
||||||
|
| | Exceptional user experience | 5 | |
|
||||||
|
| **Total** | | **255** | **[Your Total]** |
|
||||||
|
|
||||||
|
## Grading Scale
|
||||||
|
|
||||||
|
- **Minimum Required: 100 points**
|
||||||
|
- **Maximum: 200+ points**
|
||||||
|
|
||||||
|
| Grade | Points |
|
||||||
|
| ----- | -------- |
|
||||||
|
| A | 180-200+ |
|
||||||
|
| B | 160-179 |
|
||||||
|
| C | 140-159 |
|
||||||
|
| D | 120-139 |
|
||||||
|
| E | 100-119 |
|
||||||
|
| F | 0-99 |
|
||||||
@@ -8,4 +8,8 @@ fi
|
|||||||
cd backend || { echo "Directory 'backend' does not exist"; exit 1; }
|
cd backend || { echo "Directory 'backend' does not exist"; exit 1; }
|
||||||
alembic revision --autogenerate -m "$1"
|
alembic revision --autogenerate -m "$1"
|
||||||
git add alembic/versions/*
|
git add alembic/versions/*
|
||||||
|
YELLOW='\033[1;33m'
|
||||||
|
NC='\033[0m' # No Color
|
||||||
|
|
||||||
|
echo -e "${YELLOW}Don't forget to check imports in the new migration file!${NC}"
|
||||||
cd - || exit
|
cd - || exit
|
||||||
54
7project/meetings/meeting-9-10.md
Normal file
54
7project/meetings/meeting-9-10.md
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
# Weekly Meeting Notes
|
||||||
|
|
||||||
|
- Group 8 - Personal finance tracker
|
||||||
|
- Mentor: Jaychander
|
||||||
|
|
||||||
|
Keep all meeting notes in the `meetings.md` file in your project folder.
|
||||||
|
Just copy the template below for each weekly meeting and fill in the details.
|
||||||
|
|
||||||
|
## Administrative Info
|
||||||
|
|
||||||
|
- Date: 2025-10-08
|
||||||
|
- Attendees: Dejan Ribarovski, Lukas Trkan
|
||||||
|
- Notetaker: Dejan Ribarovski
|
||||||
|
|
||||||
|
## Progress Update (Before Meeting)
|
||||||
|
|
||||||
|
Summary of what has been accomplished since the last meeting in the following categories.
|
||||||
|
|
||||||
|
### Coding
|
||||||
|
|
||||||
|
Lukas has implemented the template source directories, source files and config files necessary for deployment
|
||||||
|
- docker compose for database, redis cache and rabbit MQ
|
||||||
|
- tofu
|
||||||
|
- backend template
|
||||||
|
- frontend template
|
||||||
|
- charts templates
|
||||||
|
|
||||||
|
### Documentation
|
||||||
|
- Created GitHub issues for the next steps
|
||||||
|
- Added this document + checklist and report
|
||||||
|
|
||||||
|
## Questions and Topics for Discussion (Before Meeting)
|
||||||
|
|
||||||
|
Prepare 3-5 questions and topics you want to discuss with your mentor.
|
||||||
|
|
||||||
|
1. Anything we should add structure-wise?
|
||||||
|
2. Anything you would like us to prioritize until next week?
|
||||||
|
|
||||||
|
## Discussion Notes (During Meeting)
|
||||||
|
|
||||||
|
- start working on the report
|
||||||
|
- start coding the actual code
|
||||||
|
- write problems solved
|
||||||
|
- redo the system diagram - see the response as well
|
||||||
|
- create a meetings folder wih seperate meetings files
|
||||||
|
## Action Items for Next Week (During Meeting)
|
||||||
|
|
||||||
|
Last 3 minutes of the meeting, summarize action items.
|
||||||
|
|
||||||
|
- [ ] start coding the app logic
|
||||||
|
- [ ] start writing the report so it matches the actual progress
|
||||||
|
- [ ] redo the system diagram so it includes a response flow
|
||||||
|
|
||||||
|
---
|
||||||
41
7project/meetings/meeting-template.md
Normal file
41
7project/meetings/meeting-template.md
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
# Weekly Meeting Notes
|
||||||
|
|
||||||
|
- Group X - Project Title
|
||||||
|
- Mentor: Mentor Name
|
||||||
|
|
||||||
|
Keep all meeting notes in the `meetings.md` file in your project folder.
|
||||||
|
Just copy the template below for each weekly meeting and fill in the details.
|
||||||
|
|
||||||
|
## Administrative Info
|
||||||
|
|
||||||
|
- Date: 2025-09-19
|
||||||
|
- Attendees: Name1, Name2, Name3
|
||||||
|
- Notetaker: Name1
|
||||||
|
|
||||||
|
## Progress Update (Before Meeting)
|
||||||
|
|
||||||
|
Summary of what has been accomplished since the last meeting in the following categories.
|
||||||
|
|
||||||
|
### Coding
|
||||||
|
|
||||||
|
### Documentation
|
||||||
|
|
||||||
|
## Questions and Topics for Discussion (Before Meeting)
|
||||||
|
|
||||||
|
Prepare 3-5 questions and topics you want to discuss with your mentor.
|
||||||
|
|
||||||
|
1. Question 1
|
||||||
|
2. Question 2
|
||||||
|
3. Question 3
|
||||||
|
|
||||||
|
## Discussion Notes (During Meeting)
|
||||||
|
|
||||||
|
## Action Items for Next Week (During Meeting)
|
||||||
|
|
||||||
|
Last 3 minutes of the meeting, summarize action items.
|
||||||
|
|
||||||
|
- [ ] Action Item 1
|
||||||
|
- [ ] Action Item 2
|
||||||
|
- [ ] Action Item 3
|
||||||
|
|
||||||
|
---
|
||||||
302
7project/report.md
Normal file
302
7project/report.md
Normal file
@@ -0,0 +1,302 @@
|
|||||||
|
# Project Report
|
||||||
|
|
||||||
|
> **Instructions**:
|
||||||
|
> This template provides the structure for your project report.
|
||||||
|
> Replace the placeholder text with your actual content.
|
||||||
|
> Remove instructions that are not relevant for your project, but leave the headings along with a (NA) label.
|
||||||
|
|
||||||
|
## Project Overview
|
||||||
|
|
||||||
|
**Project Name**: [Your project name]
|
||||||
|
|
||||||
|
**Group Members**:
|
||||||
|
|
||||||
|
- Student number, Name, GitHub username
|
||||||
|
- Student number, Name, GitHub username
|
||||||
|
- Student number, Name, GitHub username
|
||||||
|
|
||||||
|
**Brief Description**:
|
||||||
|
[2-3 sentences describing what your application does and its main purpose]
|
||||||
|
|
||||||
|
## Architecture Overview
|
||||||
|
|
||||||
|
### High-Level Architecture
|
||||||
|
|
||||||
|
[Describe the overall system architecture. Consider including a diagram using mermaid or linking to an image]
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph TD
|
||||||
|
A[Component A] --> B[Component B]
|
||||||
|
B --> C[Component C]
|
||||||
|
```
|
||||||
|
|
||||||
|
### Components
|
||||||
|
|
||||||
|
- **Component 1**: [Description of what this component does]
|
||||||
|
- **Component 2**: [Description of what this component does]
|
||||||
|
- **Component 3**: [Description of what this component does]
|
||||||
|
|
||||||
|
### Technologies Used
|
||||||
|
|
||||||
|
- **Backend**: [e.g., Go, Node.js, Python]
|
||||||
|
- **Database**: [e.g., PostgreSQL, MongoDB, Redis]
|
||||||
|
- **Cloud Services**: [e.g., AWS EC2, Google Cloud Run, Azure Functions]
|
||||||
|
- **Container Orchestration**: [e.g., Docker, Kubernetes]
|
||||||
|
- **Other**: [List other significant technologies]
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
### System Requirements
|
||||||
|
|
||||||
|
- Operating System: [e.g., Linux, macOS, Windows]
|
||||||
|
- Minimum RAM: [e.g., 8GB]
|
||||||
|
- Storage: [e.g., 10GB free space]
|
||||||
|
|
||||||
|
### Required Software
|
||||||
|
|
||||||
|
- [Software 1] (version X.X or higher)
|
||||||
|
- [Software 2] (version X.X or higher)
|
||||||
|
- [etc.]
|
||||||
|
|
||||||
|
### Dependencies
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# List key dependencies that need to be installed
|
||||||
|
# For example:
|
||||||
|
# Docker Engine 20.10+
|
||||||
|
# Node.js 18+
|
||||||
|
# Go 1.25+
|
||||||
|
```
|
||||||
|
|
||||||
|
## Build Instructions
|
||||||
|
|
||||||
|
### 1. Clone the Repository
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone [your-repository-url]
|
||||||
|
cd [repository-name]
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. Install Dependencies
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Provide step-by-step commands
|
||||||
|
# For example:
|
||||||
|
# npm install
|
||||||
|
# go mod download
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. Build the Application
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Provide exact build commands
|
||||||
|
# For example:
|
||||||
|
# make build
|
||||||
|
# docker build -t myapp .
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. Configuration
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Any configuration steps needed
|
||||||
|
# Environment variables to set
|
||||||
|
# Configuration files to create
|
||||||
|
```
|
||||||
|
|
||||||
|
## Deployment Instructions
|
||||||
|
|
||||||
|
### Local Deployment
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Step-by-step commands for local deployment
|
||||||
|
# For example:
|
||||||
|
# docker-compose up -d
|
||||||
|
# kubectl apply -f manifests/
|
||||||
|
```
|
||||||
|
|
||||||
|
### Cloud Deployment
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Commands for cloud deployment
|
||||||
|
# Include any cloud-specific setup
|
||||||
|
```
|
||||||
|
|
||||||
|
### Verification
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Commands to verify deployment worked
|
||||||
|
# How to check if services are running
|
||||||
|
# Example health check endpoints
|
||||||
|
```
|
||||||
|
|
||||||
|
## Testing Instructions
|
||||||
|
|
||||||
|
### Unit Tests
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Commands to run unit tests
|
||||||
|
# For example:
|
||||||
|
# go test ./...
|
||||||
|
# npm test
|
||||||
|
```
|
||||||
|
|
||||||
|
### Integration Tests
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Commands to run integration tests
|
||||||
|
# Any setup required for integration tests
|
||||||
|
```
|
||||||
|
|
||||||
|
### End-to-End Tests
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Commands to run e2e tests
|
||||||
|
# How to set up test environment
|
||||||
|
```
|
||||||
|
|
||||||
|
## Usage Examples
|
||||||
|
|
||||||
|
### Basic Usage
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Examples of how to use the application
|
||||||
|
# Common commands or API calls
|
||||||
|
# Sample data or test scenarios
|
||||||
|
```
|
||||||
|
|
||||||
|
### Advanced Features
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Examples showcasing advanced functionality
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Presentation Video
|
||||||
|
|
||||||
|
**YouTube Link**: [Insert your YouTube link here]
|
||||||
|
|
||||||
|
**Duration**: [X minutes Y seconds]
|
||||||
|
|
||||||
|
**Video Includes**:
|
||||||
|
|
||||||
|
- [ ] Project overview and architecture
|
||||||
|
- [ ] Live demonstration of key features
|
||||||
|
- [ ] Code walkthrough
|
||||||
|
- [ ] Build and deployment showcase
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
### Common Issues
|
||||||
|
|
||||||
|
#### Issue 1: [Common problem]
|
||||||
|
|
||||||
|
**Symptoms**: [What the user sees]
|
||||||
|
**Solution**: [Step-by-step fix]
|
||||||
|
|
||||||
|
#### Issue 2: [Another common problem]
|
||||||
|
|
||||||
|
**Symptoms**: [What the user sees]
|
||||||
|
**Solution**: [Step-by-step fix]
|
||||||
|
|
||||||
|
### Debug Commands
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Useful commands for debugging
|
||||||
|
# Log viewing commands
|
||||||
|
# Service status checks
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Self-Assessment Table
|
||||||
|
|
||||||
|
> Be honest and detailed in your assessments.
|
||||||
|
> This information is used for individual grading.
|
||||||
|
> Link to the specific commit on GitHub for each contribution.
|
||||||
|
|
||||||
|
| Task/Component | Assigned To | Status | Time Spent | Difficulty | Notes |
|
||||||
|
| ------------------------------------------------------------------- | ----------- | ------------- | ---------- | ---------- | ----------- |
|
||||||
|
| Project Setup & Repository | [Name] | ✅ Complete | [X hours] | Medium | [Any notes] |
|
||||||
|
| [Design Document](https://github.com/dat515-2025/group-name) | [Name] | ✅ Complete | [X hours] | Easy | [Any notes] |
|
||||||
|
| [Backend API Development](https://github.com/dat515-2025/group-name) | [Name] | ✅ Complete | [X hours] | Hard | [Any notes] |
|
||||||
|
| [Database Setup & Models](https://github.com/dat515-2025/group-name) | [Name] | ✅ Complete | [X hours] | Medium | [Any notes] |
|
||||||
|
| [Frontend Development](https://github.com/dat515-2025/group-name) | [Name] | 🔄 In Progress | [X hours] | Medium | [Any notes] |
|
||||||
|
| [Docker Configuration](https://github.com/dat515-2025/group-name) | [Name] | ✅ Complete | [X hours] | Easy | [Any notes] |
|
||||||
|
| [Cloud Deployment](https://github.com/dat515-2025/group-name) | [Name] | ✅ Complete | [X hours] | Hard | [Any notes] |
|
||||||
|
| [Testing Implementation](https://github.com/dat515-2025/group-name) | [Name] | ⏳ Pending | [X hours] | Medium | [Any notes] |
|
||||||
|
| [Documentation](https://github.com/dat515-2025/group-name) | [Name] | ✅ Complete | [X hours] | Easy | [Any notes] |
|
||||||
|
| [Presentation Video](https://github.com/dat515-2025/group-name) | [Name] | ✅ Complete | [X hours] | Medium | [Any notes] |
|
||||||
|
|
||||||
|
**Legend**: ✅ Complete | 🔄 In Progress | ⏳ Pending | ❌ Not Started
|
||||||
|
|
||||||
|
## Hour Sheet
|
||||||
|
|
||||||
|
> Link to the specific commit on GitHub for each contribution.
|
||||||
|
|
||||||
|
### [Team Member 1 Name]
|
||||||
|
|
||||||
|
| Date | Activity | Hours | Description |
|
||||||
|
| --------- | ------------------- | ---------- | ----------------------------------- |
|
||||||
|
| [Date] | Initial Setup | [X.X] | Repository setup, project structure |
|
||||||
|
| [Date] | Backend Development | [X.X] | Implemented user authentication |
|
||||||
|
| [Date] | Testing | [X.X] | Unit tests for API endpoints |
|
||||||
|
| [Date] | Documentation | [X.X] | Updated README and design doc |
|
||||||
|
| **Total** | | **[XX.X]** | |
|
||||||
|
|
||||||
|
### [Team Member 2 Name]
|
||||||
|
|
||||||
|
| Date | Activity | Hours | Description |
|
||||||
|
| --------- | -------------------- | ---------- | ----------------------------------------- |
|
||||||
|
| [Date] | Frontend Development | [X.X] | Created user interface mockups |
|
||||||
|
| [Date] | Integration | [X.X] | Connected frontend to backend API |
|
||||||
|
| [Date] | Deployment | [X.X] | Docker configuration and cloud deployment |
|
||||||
|
| [Date] | Testing | [X.X] | End-to-end testing |
|
||||||
|
| **Total** | | **[XX.X]** | |
|
||||||
|
|
||||||
|
### [Team Member 3 Name] (if applicable)
|
||||||
|
|
||||||
|
| Date | Activity | Hours | Description |
|
||||||
|
| --------- | ------------------------ | ---------- | -------------------------------- |
|
||||||
|
| [Date] | Database Design | [X.X] | Schema design and implementation |
|
||||||
|
| [Date] | Cloud Configuration | [X.X] | AWS/GCP setup and configuration |
|
||||||
|
| [Date] | Performance Optimization | [X.X] | Caching and query optimization |
|
||||||
|
| [Date] | Monitoring | [X.X] | Logging and monitoring setup |
|
||||||
|
| **Total** | | **[XX.X]** | |
|
||||||
|
|
||||||
|
### Group Total: [XXX.X] hours
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Final Reflection
|
||||||
|
|
||||||
|
### What We Learned
|
||||||
|
|
||||||
|
[Reflect on the key technical and collaboration skills learned during this project]
|
||||||
|
|
||||||
|
### Challenges Faced
|
||||||
|
|
||||||
|
[Describe the main challenges and how you overcame them]
|
||||||
|
|
||||||
|
### If We Did This Again
|
||||||
|
|
||||||
|
[What would you do differently? What worked well that you'd keep?]
|
||||||
|
|
||||||
|
### Individual Growth
|
||||||
|
|
||||||
|
#### [Team Member 1 Name]
|
||||||
|
|
||||||
|
[Personal reflection on growth, challenges, and learning]
|
||||||
|
|
||||||
|
#### [Team Member 2 Name]
|
||||||
|
|
||||||
|
[Personal reflection on growth, challenges, and learning]
|
||||||
|
|
||||||
|
#### [Team Member 3 Name] (if applicable)
|
||||||
|
|
||||||
|
[Personal reflection on growth, challenges, and learning]
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**Report Completion Date**: [Date]
|
||||||
|
**Last Updated**: [Date]
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
name: maxscale-helm
|
name: maxscale-helm
|
||||||
version: 1.0.7
|
version: 1.0.8
|
||||||
description: Helm chart for MaxScale related Kubernetes manifests
|
description: Helm chart for MaxScale related Kubernetes manifests
|
||||||
|
|||||||
@@ -60,6 +60,8 @@ spec:
|
|||||||
scrapeTimeout: 10s
|
scrapeTimeout: 10s
|
||||||
prometheusRelease: kube-prometheus-stack
|
prometheusRelease: kube-prometheus-stack
|
||||||
jobLabel: mariadb-monitoring
|
jobLabel: mariadb-monitoring
|
||||||
|
auth:
|
||||||
|
generate: true
|
||||||
|
|
||||||
tls:
|
tls:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ spec:
|
|||||||
- name: DATABASE_ENABLE_SSL
|
- name: DATABASE_ENABLE_SSL
|
||||||
value: "yes"
|
value: "yes"
|
||||||
- name: DATABASE_HOST
|
- name: DATABASE_HOST
|
||||||
value: "mariadb-repl"
|
value: "mariadb-repl-maxscale-internal"
|
||||||
- name: DATABASE_PORT_NUMBER
|
- name: DATABASE_PORT_NUMBER
|
||||||
value: "3306"
|
value: "3306"
|
||||||
- name: PHPMYADMIN_ALLOW_NO_PASSWORD
|
- name: PHPMYADMIN_ALLOW_NO_PASSWORD
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ locals {
|
|||||||
|
|
||||||
resource "kubectl_manifest" "secrets" {
|
resource "kubectl_manifest" "secrets" {
|
||||||
yaml_body = local.mariadb_secret_yaml
|
yaml_body = local.mariadb_secret_yaml
|
||||||
depends_on = [ kubernetes_namespace.mariadb-operator ]
|
depends_on = [kubernetes_namespace.mariadb-operator]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -41,7 +41,7 @@ resource "helm_release" "mariadb-operator-crds" {
|
|||||||
chart = "mariadb-operator-crds"
|
chart = "mariadb-operator-crds"
|
||||||
namespace = "mariadb-operator"
|
namespace = "mariadb-operator"
|
||||||
version = "25.8.4"
|
version = "25.8.4"
|
||||||
depends_on = [ kubectl_manifest.secrets ]
|
depends_on = [kubectl_manifest.secrets]
|
||||||
timeout = 3600
|
timeout = 3600
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -50,16 +50,17 @@ resource "helm_release" "mariadb-operator" {
|
|||||||
name = "mariadb-operator"
|
name = "mariadb-operator"
|
||||||
repository = "https://helm.mariadb.com/mariadb-operator"
|
repository = "https://helm.mariadb.com/mariadb-operator"
|
||||||
chart = "mariadb-operator"
|
chart = "mariadb-operator"
|
||||||
depends_on = [ helm_release.mariadb-operator-crds, kubectl_manifest.secrets ]
|
depends_on = [helm_release.mariadb-operator-crds, kubectl_manifest.secrets]
|
||||||
namespace = "mariadb-operator"
|
namespace = "mariadb-operator"
|
||||||
|
version = "25.8.3"
|
||||||
timeout = 3600
|
timeout = 3600
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "helm_release" "maxscale_helm" {
|
resource "helm_release" "maxscale_helm" {
|
||||||
name = "maxscale-helm"
|
name = "maxscale-helm"
|
||||||
chart = "${path.module}/charts/maxscale-helm"
|
chart = "${path.module}/charts/maxscale-helm"
|
||||||
version = "1.0.7"
|
version = "1.0.8"
|
||||||
depends_on = [ helm_release.mariadb-operator-crds, kubectl_manifest.secrets ]
|
depends_on = [helm_release.mariadb-operator-crds, kubectl_manifest.secrets]
|
||||||
timeout = 3600
|
timeout = 3600
|
||||||
|
|
||||||
set = [
|
set = [
|
||||||
|
|||||||
15
7project/tofu/modules/metrics-server/values.yaml
Normal file
15
7project/tofu/modules/metrics-server/values.yaml
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
# Values overriding defaults for metrics-server Helm chart
|
||||||
|
# Fix TLS and address selection issues when scraping kubelets (common on Talos)
|
||||||
|
args:
|
||||||
|
- --kubelet-insecure-tls
|
||||||
|
- --kubelet-preferred-address-types=InternalIP,Hostname,InternalDNS,ExternalDNS,ExternalIP
|
||||||
|
- --kubelet-use-node-status-port=true
|
||||||
|
|
||||||
|
# Using hostNetwork often helps in restricted CNI/DNS environments
|
||||||
|
#hostNetwork: true
|
||||||
|
# Required when hostNetwork is true so DNS works as expected
|
||||||
|
#dnsPolicy: ClusterFirstWithHostNet
|
||||||
|
|
||||||
|
# Enable metrics API service monitor if Prometheus Operator is present (optional)
|
||||||
|
# serviceMonitor:
|
||||||
|
# enabled: true
|
||||||
@@ -16,6 +16,12 @@ terraform {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
resource "kubernetes_namespace" "rabbitmq_namespace" {
|
||||||
|
metadata {
|
||||||
|
name = "rabbitmq-system"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
resource "helm_release" "rabbitmq_operator" {
|
resource "helm_release" "rabbitmq_operator" {
|
||||||
name = "rabbitmq-cluster-operator"
|
name = "rabbitmq-cluster-operator"
|
||||||
@@ -25,7 +31,6 @@ resource "helm_release" "rabbitmq_operator" {
|
|||||||
version = "4.4.34"
|
version = "4.4.34"
|
||||||
|
|
||||||
namespace = "rabbitmq-system"
|
namespace = "rabbitmq-system"
|
||||||
create_namespace = true
|
|
||||||
|
|
||||||
# Zde můžete přepsat výchozí hodnoty chartu, pokud by bylo potřeba
|
# Zde můžete přepsat výchozí hodnoty chartu, pokud by bylo potřeba
|
||||||
# Například sledovat jen určité namespace, nastavit tolerations atd.
|
# Například sledovat jen určité namespace, nastavit tolerations atd.
|
||||||
@@ -59,6 +64,7 @@ resource "helm_release" "rabbitmq_operator" {
|
|||||||
value = "true"
|
value = "true"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
depends_on = [kubernetes_namespace.rabbitmq_namespace]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -2,4 +2,4 @@ apiVersion: rabbitmq.com/v1beta1
|
|||||||
kind: RabbitmqCluster
|
kind: RabbitmqCluster
|
||||||
metadata:
|
metadata:
|
||||||
name: 'rabbitmq-cluster'
|
name: 'rabbitmq-cluster'
|
||||||
namespace: "rabbitmq"
|
namespace: "rabbitmq-system"
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ apiVersion: networking.cfargotunnel.com/v1alpha1
|
|||||||
kind: TunnelBinding
|
kind: TunnelBinding
|
||||||
metadata:
|
metadata:
|
||||||
name: rabbit-tunnel-binding
|
name: rabbit-tunnel-binding
|
||||||
namespace: rabbitmq
|
namespace: rabbitmq-system
|
||||||
subjects:
|
subjects:
|
||||||
- name: rabbit-gui
|
- name: rabbit-gui
|
||||||
spec:
|
spec:
|
||||||
|
|||||||
Reference in New Issue
Block a user