From f7e1866d4e76ddb65759b8408f9d8b8070b5313b Mon Sep 17 00:00:00 2001 From: kk10 Date: Tue, 6 Oct 2026 13:18:46 +0300 Subject: [PATCH] feat(config): add redis url secret --- .env.example | 3 +-- docker-compose.yml | 3 +++ internal/config/config.go | 13 +++++++++++++ internal/redis/client.go | 1 + 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 internal/redis/client.go diff --git a/.env.example b/.env.example index 25f9cfd..5bbc5eb 100644 --- a/.env.example +++ b/.env.example @@ -6,6 +6,5 @@ SESSION_TTL_SECONDS=3600 LOG_LEVEL=INFO DATABASE_URL_FILE=/run/secrets/database_url -# Optional on 3, required use on 4 in lab2; Redis OR Valkey: -SESSION_STORE=postgres + CACHE_URL_FILE=/run/secrets/cache_url diff --git a/docker-compose.yml b/docker-compose.yml index 85f2f1f..eaa1e10 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,7 @@ services: - .env secrets: - database_url + - cache_url depends_on: migrate: condition: service_completed_successfully @@ -62,6 +63,8 @@ secrets: file: ./secrets/postgres_password.txt database_url: file: ./secrets/database_url.txt + cache_url: + file: ./secrets/cache_url.txt volumes: pgdata: diff --git a/internal/config/config.go b/internal/config/config.go index 2c0d222..ccffe79 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -14,6 +14,7 @@ type Config struct { Server ServerConfig Logging LoggingConfig Database DatabaseConfig + Redis RedisConfig } type ServerConfig struct { @@ -35,6 +36,14 @@ func (c DatabaseConfig) URL() (string, error) { return readSecretFile(c.URLFile) } +type RedisConfig struct { + URLFile string +} + +func (c RedisConfig) URL() (string, error) { + return readSecretFile(c.URLFile) +} + func Load() Config { return Config{ Server: ServerConfig{ @@ -51,6 +60,10 @@ func Load() Config { Database: DatabaseConfig{ URLFile: getEnv("DATABASE_URL_FILE", "/run/secrets/database_url"), }, + + Redis: RedisConfig{ + URLFile: getEnv("CACHE_URL_FILE", "/run/secrets/cache_url"), + }, } } diff --git a/internal/redis/client.go b/internal/redis/client.go new file mode 100644 index 0000000..65a229e --- /dev/null +++ b/internal/redis/client.go @@ -0,0 +1 @@ +package redis