fix: Moved uri creation into util to ensure its always the same

Author: hofmeister

src/PostgresDB.ts

@@ -1,6 +1,5 @@
 import Config, { ConfigProvider, ResourceInfo } from '@kapeta/sdk-config';
-const RESOURCE_TYPE = 'kapeta/resource-type-postgresql';
-const PORT_TYPE = 'postgres';
+import {createDBURI} from "./utils";
 
 interface PrismaClient {
     $connect(): Promise<void>;
@@ -11,8 +10,6 @@ interface PrismaClient {
 export abstract class PostgresDB<T extends PrismaClient> {
     private readonly _resourceName: string;
     private _ready: boolean = false;
-    private _postgresInfo?: ResourceInfo;
-    private _dbName?: string;
     private _prisma?: T;
     constructor(resourceName:string) {
         this._resourceName = resourceName;
@@ -24,22 +21,7 @@ export abstract class PostgresDB<T extends PrismaClient> {
     abstract createClient(opts: any): T;
 
     async init(provider: ConfigProvider) {
-        this._postgresInfo = await provider.getResourceInfo(RESOURCE_TYPE, PORT_TYPE, this._resourceName);
-        this._dbName =
-            this._postgresInfo.options && this._postgresInfo.options.dbName
-                ? this._postgresInfo.options.dbName
-                : this._resourceName;
-
-        let credentials = '';
-        if (this._postgresInfo?.credentials?.username) {
-            credentials += this._postgresInfo.credentials.username;
-
-            if (this._postgresInfo.credentials.password) {
-                credentials += ':' + this._postgresInfo.credentials.password;
-            }
-        }
-
-        const url = `postgresql://${credentials}@${this._postgresInfo.host}:${this._postgresInfo.port}/${this._dbName}`;
+        const url = createDBURI(provider, this._resourceName);
         console.log('Connecting to postgres database: %s', url);
 
         this._prisma = this.createClient({

src/cmd-database-url.ts

@@ -1,29 +1,13 @@
 import Config from '@kapeta/sdk-config';
+import {createDBURI} from "./utils";
 
-const RESOURCE_TYPE = 'kapeta/resource-type-postgresql';
-const PORT_TYPE = 'postgres';
 
 //Disable any logging from the SDK
 console.log = function() {}
 
 async function resolveUrl(resourceName: string) {
     const provider = await Config.init(process.cwd(), '' );
-    const postgresInfo = await provider.getResourceInfo(RESOURCE_TYPE, PORT_TYPE, resourceName);
-    const dbName =
-        postgresInfo.options && postgresInfo.options.dbName
-            ? postgresInfo.options.dbName
-            : resourceName;
-
-    let credentials = ''
-    if (postgresInfo.credentials?.username) {
-        credentials += encodeURIComponent(postgresInfo.credentials.username);
-
-        if (postgresInfo.credentials.password) {
-            credentials += ':' + encodeURIComponent(postgresInfo.credentials.password);
-        }
-    }
-
-    return `postgresql://${credentials}@${postgresInfo.host}:${postgresInfo.port}/${encodeURIComponent(dbName)}`;
+    return createDBURI(provider, resourceName);
 }
 
 if (!process.argv[2]) {

src/utils.ts

@@ -0,0 +1,23 @@
+import {ConfigProvider} from "@kapeta/sdk-config";
+
+export const RESOURCE_TYPE = 'kapeta/resource-type-postgresql';
+export const PORT_TYPE = 'postgres';
+
+export async function createDBURI(provider:ConfigProvider, resourceName: string) {
+    const dbInfo = await provider.getResourceInfo(RESOURCE_TYPE, PORT_TYPE, resourceName);
+    const dbName =
+        dbInfo.options && dbInfo.options.dbName
+            ? dbInfo.options.dbName
+            : resourceName;
+
+    let credentials = ''
+    if (dbInfo.credentials?.username) {
+        credentials += encodeURIComponent(dbInfo.credentials.username);
+
+        if (dbInfo.credentials.password) {
+            credentials += ':' + encodeURIComponent(dbInfo.credentials.password);
+        }
+    }
+
+    return `postgresql://${credentials}@${dbInfo.host}:${dbInfo.port}/${encodeURIComponent(dbName)}`;
+}