From f7b125cc5061d6941e3d0baa4bf58b3da5131a34 Mon Sep 17 00:00:00 2001
From: Dennis Seah <dennis.seah@gmail.com>
Date: Thu, 19 Mar 2020 14:25:56 -0700
Subject: [PATCH 1/2] attempt to fix introspection test failure

---
 src/commands/deployment/onboard.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/commands/deployment/onboard.ts b/src/commands/deployment/onboard.ts
index 6db253139..ec5ad11a5 100644
--- a/src/commands/deployment/onboard.ts
+++ b/src/commands/deployment/onboard.ts
@@ -121,8 +121,16 @@ export const setConfiguration = (
 ): boolean => {
   try {
     const data = readYaml<ConfigYaml>(defaultConfigFile());
-    data.introspection!.azure!.account_name = storageAccountName;
-    data.introspection!.azure!.table_name = storageTableName;
+    if (!data.introspection) {
+      data.introspection = {
+        azure: {}
+      };
+    } else if (!data.introspection.azure) {
+      data.introspection.azure = {};
+    }
+
+    data.introspection.azure!.account_name = storageAccountName;
+    data.introspection.azure!.table_name = storageTableName;
     const jsonData = yaml.safeDump(data);
     logger.verbose(jsonData);
     fs.writeFileSync(defaultConfigFile(), jsonData);

From d754923ac2e6febd860e299edb5f844248b08e4e Mon Sep 17 00:00:00 2001
From: Dennis Seah <dennis.seah@gmail.com>
Date: Thu, 19 Mar 2020 15:02:50 -0700
Subject: [PATCH 2/2] Update azurecredentials.ts

---
 src/lib/azure/azurecredentials.ts | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/lib/azure/azurecredentials.ts b/src/lib/azure/azurecredentials.ts
index 5cec76d0f..87576aaa4 100644
--- a/src/lib/azure/azurecredentials.ts
+++ b/src/lib/azure/azurecredentials.ts
@@ -42,13 +42,18 @@ export const getManagementCredentials = async (
   opts: AzureAccessOpts = {}
 ): Promise<msRestNodeAuth.ApplicationTokenCredentials | undefined> => {
   // Load config from opts and fallback to spk config
-  const { azure } = Config().introspection!;
+  const conf = Config();
+  let servicePrincipalId = opts.servicePrincipalId;
+  let servicePrincipalPassword = opts.servicePrincipalPassword;
+  let tenantId = opts.tenantId;
 
-  const {
-    servicePrincipalId = azure && azure.service_principal_id,
-    servicePrincipalPassword = azure && azure.service_principal_secret,
-    tenantId = azure && azure.tenant_id
-  } = opts;
+  if (conf && conf.introspection && conf.introspection.azure) {
+    const azure = conf.introspection.azure;
+    servicePrincipalId = servicePrincipalId || azure.service_principal_id;
+    servicePrincipalPassword =
+      servicePrincipalPassword || azure.service_principal_secret;
+    tenantId = tenantId || azure.tenant_id;
+  }
 
   if (
     !verifyConfigDefined(servicePrincipalId, servicePrincipalPassword, tenantId)