forked from mtusi2026/mtusi2026lab4
реализация 4 лабы
This commit is contained in:
@@ -8,4 +8,4 @@ if [[ ! -x .venv/bin/python ]]; then
|
||||
fi
|
||||
./scripts/build.sh
|
||||
mkdir -p evidence
|
||||
.venv/bin/python -u student-tests/docker_lifecycle.py 2>&1 | sed -E 's/[[:blank:]]+$//' | tee evidence/lab3-checks.txt
|
||||
.venv/bin/python -u student-tests/docker_lifecycle.py 2>&1 | sed -E 's/[[:blank:]]+$//' | tee evidence/lab4-checks.txt
|
||||
|
||||
+29
-1
@@ -1,5 +1,8 @@
|
||||
"""Создаёт локальное окружение и secrets; существующие значения сохраняет."""
|
||||
from pathlib import Path
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import secrets
|
||||
import shutil
|
||||
from urllib.parse import quote
|
||||
@@ -18,12 +21,37 @@ password = password_file.read_text().strip()
|
||||
values = {
|
||||
"database_url": f"postgresql://messenger:{quote(password, safe='')}@postgres:5432/messenger",
|
||||
"cache_url": "redis://valkey:6379/0",
|
||||
"s3_root_user": "root-" + secrets.token_hex(8),
|
||||
"s3_root_password": secrets.token_urlsafe(32),
|
||||
"s3_access_key_id": "api-" + secrets.token_hex(8),
|
||||
"s3_secret_access_key": secrets.token_urlsafe(32),
|
||||
}
|
||||
for name, value in values.items():
|
||||
path = directory / name
|
||||
if not path.exists():
|
||||
path.write_text(value)
|
||||
dotenv = dict(line.split("=", 1) for line in (root / ".env").read_text().splitlines()
|
||||
if line.strip() and not line.lstrip().startswith("#") and "=" in line)
|
||||
bucket = os.environ.get("S3_BUCKET", dotenv.get("S3_BUCKET", "messenger-attachments"))
|
||||
if re.fullmatch(r"[a-z0-9][a-z0-9.-]{1,61}[a-z0-9]", bucket) is None:
|
||||
raise ValueError("Недопустимое имя S3 bucket")
|
||||
def local_secret(name):
|
||||
return (directory / name).read_text().strip()
|
||||
config = {"accounts": [{"id": "messenger-api", "displayName": "messenger-api"}], "identities": [
|
||||
{"name": "bootstrap", "credentials": [{"accessKey": local_secret("s3_root_user"),
|
||||
"secretKey": local_secret("s3_root_password")}], "actions": ["Admin"]},
|
||||
{"name": "messenger-api", "account": {"id": "messenger-api", "displayName": "messenger-api"},
|
||||
"credentials": [{"accessKey": local_secret("s3_access_key_id"), "secretKey": local_secret("s3_secret_access_key")}],
|
||||
"actions": ["Read:" + bucket, "List:" + bucket, "Write:" + bucket + "/attachments/*"]},
|
||||
]}
|
||||
config_file = directory / "s3_config"
|
||||
encoded_config = json.dumps(config)
|
||||
if not config_file.exists() or config_file.read_text() != encoded_config:
|
||||
temporary = directory / "s3_config.tmp"
|
||||
temporary.write_text(encoded_config)
|
||||
temporary.chmod(0o444)
|
||||
temporary.replace(config_file)
|
||||
# Каталог 0700 защищает файлы на хосте; 0444 позволяет USER 10001 читать bind-mounted secret.
|
||||
for name in ("postgres_password", "database_url", "cache_url"):
|
||||
for name in ("postgres_password", "s3_config", *values):
|
||||
(directory / name).chmod(0o444)
|
||||
print("Local .env and secrets are ready; values are not printed")
|
||||
|
||||
+2
-2
@@ -2,5 +2,5 @@
|
||||
set -euo pipefail
|
||||
project_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$project_dir"
|
||||
python3 scripts/init_local.py
|
||||
docker compose run --rm --build migrate
|
||||
./scripts/build.sh
|
||||
docker compose run --rm migrate
|
||||
|
||||
+1
-1
@@ -2,5 +2,5 @@
|
||||
set -euo pipefail
|
||||
project_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$project_dir"
|
||||
docker compose restart --timeout 8 postgres valkey api lb
|
||||
docker compose restart --timeout 8 postgres valkey s3-storage s3 api lb cleanup
|
||||
./scripts/wait-ready.sh
|
||||
|
||||
@@ -3,6 +3,5 @@ set -euo pipefail
|
||||
project_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$project_dir"
|
||||
# Сначала собираем образ и применяем только обратно совместимые миграции.
|
||||
./scripts/build.sh
|
||||
./scripts/migrate.sh
|
||||
exec python3 scripts/replicas.py rolling
|
||||
|
||||
+1
-1
@@ -3,5 +3,5 @@ set -euo pipefail
|
||||
project_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$project_dir"
|
||||
python3 scripts/init_local.py
|
||||
docker compose up -d --build lb
|
||||
docker compose up -d --build lb cleanup
|
||||
./scripts/wait-ready.sh
|
||||
|
||||
Reference in New Issue
Block a user