Changing problematic USERNAME config value name. Fixing tsc errors.

Author: adam-in-ict

.env.example

@@ -1,4 +1,4 @@
 HOST=
 DATABASE=
-USERNAME=
+DB_USERNAME=
 PASSWORD=

src/config.ts

@@ -16,7 +16,7 @@ export const instanceConfigFields: IntegrationInstanceConfigFieldMap = {
     type: 'string',
     mask: false,
   },
-  username: {
+  dbUsername: {
     type: 'string',
     mask: false,
   },
@@ -29,7 +29,7 @@ export const instanceConfigFields: IntegrationInstanceConfigFieldMap = {
 export interface IntegrationConfig extends IntegrationInstanceConfig {
   host: string;
   database: string;
-  username: string;
+  dbUsername: string;
   password: string;
 }
 
@@ -40,11 +40,11 @@ export async function validateInvocation({
   if (
     !config.host ||
     !config.database ||
-    !config.username ||
+    !config.dbUsername ||
     !config.password
   ) {
     throw new IntegrationValidationError(
-      'Config requires all of host, database, username, password',
+      'Config requires all of host, database, dbUsername, password',
     );
   }
 

src/configuration-manager/index.ts

@@ -25,7 +25,7 @@ async function createMicrosoftConfigurationManagerClient(
   client = await createClient({
     dbHost: config.host,
     dbName: config.database,
-    dbUsername: config.username,
+    dbUsername: config.dbUsername,
     dbPassword: config.password,
     onRequestFailed(err) {
       logger.error({ err }, 'Error running request');

test/config.ts

@@ -11,7 +11,17 @@ if (process.env.LOAD_ENV) {
   });
 }
 
-export const integrationConfig: IntegrationConfig = {};
+const DEFAULT_HOST = 'test_host';
+const DEFAULT_DATABASE = 'test_db';
+const DEFAULT_USERNAME = 'test_username';
+const DEFAULT_PASSWORD = 'fakepassword';
+
+export const integrationConfig: IntegrationConfig = {
+  host: process.env.HOST || DEFAULT_HOST,
+  database: process.env.DATABASE || DEFAULT_DATABASE,
+  dbUsername: process.env.DB_USERNAME || DEFAULT_USERNAME,
+  password: process.env.PASSWORD || DEFAULT_PASSWORD,
+};
 
 export function buildStepTestConfigForStep(stepId: string): StepTestConfig {
   return {