feat configs: don't duplicate dbconnection in config_vars, pass it th…

…rough env (#54)

DB env variables for 'pg_service_template-container' service in docker-compose.yml are not used at all. This is misleading and leads to the need to look for errors and change the code in several places if the database has changed.

Co-authored-by: Lev Sabantsev <[email protected]>

Makefile

@@ -69,9 +69,12 @@ format:
 	find src -name '*pp' -type f | xargs $(CLANG_FORMAT) -i
 	find tests -name '*.py' -type f | xargs autopep8 -i
 
+# Set environment for --in-docker-start
+export DB_CONNECTION := postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@service-postgres:5432/${POSTGRES_DB}
+
 # Internal hidden targets that are used only in docker environment
 --in-docker-start-debug --in-docker-start-release: --in-docker-start-%: install-%
-	psql 'postgresql://user:password@service-postgres:5432/pg_service_template_db_1' -f ./postgresql/data/initial_data.sql
+	psql ${DB_CONNECTION} -f ./postgresql/data/initial_data.sql
 	/home/user/.local/bin/pg_service_template \
 		--config /home/user/.local/etc/pg_service_template/static_config.yaml \
 		--config_vars /home/user/.local/etc/pg_service_template/config_vars.docker.yaml

configs/config_vars.docker.yaml

@@ -5,5 +5,3 @@ logger-level: debug
 is-testing: false
 
 server-port: 8080
-
-dbconnection: 'postgresql://user:password@service-postgres:5432/pg_service_template_db_1'

configs/static_config.yaml

@@ -57,6 +57,7 @@ components_manager:
 
         postgres-db-1:
             dbconnection: $dbconnection
+            dbconnection#env: DB_CONNECTION
             blocking_task_processor: fs-task-processor
             dns_resolver: async
             sync-start: false

docker-compose.yml

@@ -4,10 +4,10 @@ services:
     postgres:
         container_name: service-postgres
         image: postgres:12
-        environment:
-          - POSTGRES_DB=pg_service_template_db_1
-          - POSTGRES_USER=user
-          - POSTGRES_PASSWORD=password
+        environment: &db_env
+          POSTGRES_DB: pg_service_template_db_1
+          POSTGRES_USER: user
+          POSTGRES_PASSWORD: password
         ports:
           - 5432
         volumes:
@@ -20,12 +20,10 @@ services:
         image: ghcr.io/userver-framework/ubuntu-22.04-userver-pg:latest
         privileged: true
         environment:
-          - POSTGRES_DB=pg_service_template_db_1
-          - POSTGRES_USER=user
-          - POSTGRES_PASSWORD=password
-          - PREFIX=${PREFIX:-~/.local}
-          - CCACHE_DIR=/pg_service_template/.ccache
-          - CORES_DIR=/cores
+          <<: *db_env
+          PREFIX: ${PREFIX:-~/.local}
+          CCACHE_DIR: /pg_service_template/.ccache
+          CORES_DIR: /cores
         volumes:
           - .:/pg_service_template:rw
           - ${TC_CORES_DIR:-./.cores}:/cores:rw