Improvements to variable handling

Signed-off-by: Emiliano Suñé <[email protected]>
decentralized-identity · Oct 9, 2024 · 97f6b43 · 97f6b43
1 parent d0430aa
commit 97f6b43
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/charts/tdw-server/Chart.yaml b/charts/tdw-server/Chart.yaml
@@ -3,8 +3,8 @@ name: trustdidweb-server-py
 icon: https://identity.foundation/trustdidweb/tdw.jpg
 description: An api server to register and serve trusted web dids.
 type: application
-version: 0.0.8
-appVersion: "0.0.5"
+version: 0.0.9
+appVersion: "0.0.6"
 
 maintainers:
   - name: PatStLouis

diff --git a/charts/tdw-server/templates/server/deployment.yaml b/charts/tdw-server/templates/server/deployment.yaml
@@ -46,8 +46,8 @@ spec:
                   key: password
             - name: POSTGRES_SERVER_NAME
               value: {{ include "global.postgresql.fullname" . }}
-            - name: POSTGRES_SERVER_PASSWORD
-              value: {{ .Values.postgresql.primary.service.ports.postgresql }}
+            - name: POSTGRES_SERVER_PORT
+              value: {{ .Values.postgresql.primary.service.ports.postgresql | quote }}
           ports:
             - name: api
               containerPort: {{ .Values.server.service.apiPort }}

diff --git a/server/config.py b/server/config.py
@@ -17,10 +17,10 @@ class Settings(BaseSettings):
     DID_WEB_BASE: str = f"did:web:{DOMAIN}"
     ENDORSER_MULTIKEY: str = os.environ["ENDORSER_MULTIKEY"]
 
-    POSTGRES_USER: str = os.environ["POSTGRES_USER"]
-    POSTGRES_PASSWORD: str = os.environ["POSTGRES_PASSWORD"]
-    POSTGRES_SERVER_NAME: str = os.environ["POSTGRES_SERVER_NAME"]
-    POSTGRES_SERVER_PORT: str = os.environ["POSTGRES_SERVER_PORT"]
+    POSTGRES_USER: str = os.getenv("POSTGRES_USER", "")
+    POSTGRES_PASSWORD: str = os.getenv("POSTGRES_PASSWORD", "")
+    POSTGRES_SERVER_NAME: str = os.getenv("POSTGRES_SERVER_NAME", "")
+    POSTGRES_SERVER_PORT: str = os.getenv("POSTGRES_SERVER_PORT", "")
 
     ASKAR_DB: str = "sqlite://app.db"
     if (
@@ -33,7 +33,7 @@ class Settings(BaseSettings):
             f"Using postgres storage: {POSTGRES_SERVER_NAME}:{POSTGRES_SERVER_PORT}"
         )
         ASKAR_DB: str = (
-            f"postgres://{POSTGRES_USER}:{POSTGRES_PASSWORD}@{POSTGRES_SERVER_NAME}:{POSTGRES_SERVER_PORT}"
+            f"postgres://{POSTGRES_USER}:{POSTGRES_PASSWORD}@{POSTGRES_SERVER_NAME}:{POSTGRES_SERVER_PORT}/tdw-server"
         )
     else:
         logging.info("Using SQLite database")