From aa1433360491edccb9aa41845ec734c94d3a1214 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel@bitbadger.solutions>
Date: Sat, 20 Apr 2024 21:18:15 -0400
Subject: [PATCH] Modify test env var handling

---
 .gitea/workflows/ci.yml        |  6 +++---
 src/Tests.CSharp/PostgresDb.cs | 30 ++++++++++--------------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 5ff6ae2..4e94a95 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ "main" ]
 
+env:
+  BBDOX__PG__PORT: 8301
+
 jobs:
   build-and-test:
 
@@ -30,9 +33,6 @@ jobs:
         ports:
         - "8301:5432"
     
-    env:
-      BITBADGER__DOCUMENTS__POSTGRES__DBPORT: 8301
-    
     steps:
     - uses: actions/checkout@v3
     - name: Setup .NET 6
diff --git a/src/Tests.CSharp/PostgresDb.cs b/src/Tests.CSharp/PostgresDb.cs
index f695a04..301e9a6 100644
--- a/src/Tests.CSharp/PostgresDb.cs
+++ b/src/Tests.CSharp/PostgresDb.cs
@@ -53,66 +53,56 @@ public static class PostgresDb
     /// The host for the database
     /// </summary>
     private static readonly Lazy<string> DbHost = new(() =>
-    {
-        return Environment.GetEnvironmentVariable("BitBadger.Documents.Postgres.DbHost") switch
+        Environment.GetEnvironmentVariable("BBDOX_PG_HOST") switch
         {
             null => "localhost",
             var host when host.Trim() == "" => "localhost",
             var host => host
-        };
-    });
+        });
 
     /// <summary>
     /// The port for the database
     /// </summary>
     private static readonly Lazy<int> DbPort = new(() =>
-    {
-        return Environment.GetEnvironmentVariable("BitBadger.Documents.Postgres.DbPort") switch
+        Environment.GetEnvironmentVariable("BBDOX_PG_PORT") switch
         {
             null => 5432,
             var port when port.Trim() == "" => 5432,
             var port => int.Parse(port)
-        };
-    });
+        });
 
     /// <summary>
     /// The database itself
     /// </summary>
     private static readonly Lazy<string> DbDatabase = new(() =>
-    {
-        return Environment.GetEnvironmentVariable("BitBadger.Documents.Postres.DbDatabase") switch
+        Environment.GetEnvironmentVariable("BBDOX_PG_DATABASE") switch
         {
             null => "postgres",
             var db when db.Trim() == "" => "postgres",
             var db => db
-        };
-    });
+        });
 
     /// <summary>
     /// The user to use in connecting to the database
     /// </summary>
     private static readonly Lazy<string> DbUser = new(() =>
-    {
-        return Environment.GetEnvironmentVariable("BitBadger.Documents.Postgres.DbUser") switch
+        Environment.GetEnvironmentVariable("BBDOX_PG_USER") switch
         {
             null => "postgres",
             var user when user.Trim() == "" => "postgres",
             var user => user
-        };
-    });
+        });
 
     /// <summary>
     /// The password to use for the database
     /// </summary>
     private static readonly Lazy<string> DbPassword = new(() =>
-    {
-        return Environment.GetEnvironmentVariable("BitBadger.Documents.Postrgres.DbPwd") switch
+        Environment.GetEnvironmentVariable("BBDOX_PG_PWD") switch
         {
             null => "postgres",
             var pwd when pwd.Trim() == "" => "postgres",
             var pwd => pwd
-        };
-    });
+        });
 
     /// <summary>
     /// The overall connection string