Correct environvariable checking (#47)

* correct environvariable checking

* move isServicePrincipalSetInEnv() into azureUtils

src/integratedShell.ts

@@ -8,8 +8,8 @@ import { commands, Uri, ViewColumn, workspace } from "vscode";
 import { BaseShell } from "./baseShell";
 import { Constants } from "./constants";
 import { TerminalType, TFTerminal } from "./shared";
-import { isEmpty } from "./utilities";
 import { TestOption } from "./utilities";
+import { isServicePrincipalSetInEnv } from "./utils/azureUtils";
 import { executeCommand } from "./utils/cpUtils";
 import { isDockerInstalled, runE2EInDocker, runLintInDocker } from "./utils/dockerUtils";
 import { drawGraph } from "./utils/dotUtils";
@@ -94,21 +94,10 @@ export class IntegratedShell extends BaseShell {
         }
         const containerName: string = vscode.workspace.getConfiguration("tf-azure").get("test-container");
 
-        // Check if the environment variables are set locally
-        this.outputChannel.appendLine("Checking SPN environment variables\n");
-        /* tslint:disable:no-string-literal */
-        if (isEmpty(process.env["ARM_SUBSCRIPTION_ID"] ||
-            process.env["ARM_CLIENT_ID"] ||
-            process.env["ARM_CLIENT_SECRET"] ||
-            process.env["ARM_TENANT_ID"] ||
-            process.env["ARM_TEST_LOCATION"] ||
-            process.env["ARM_TEST_LOCATION_ALT"])) {
-            vscode.window.showErrorMessage(
-                "Azure Service Principal is not set (See documentation at: " +
-                "https://docs.microsoft.com/en-us/cli/azure/ad/sp?view=azure-cli-latest#az_ad_sp_create_for_rbac)");
+        this.outputChannel.appendLine("Checking Azure Service Principal environment variables...");
+        if (!isServicePrincipalSetInEnv()) {
             return;
         }
-        /* tslint:enable:no-string-literal */
 
         switch (TestType) {
             case TestOption.lint: {
@@ -154,7 +143,7 @@ export class IntegratedShell extends BaseShell {
                     await executeCommand(
                         "docker",
                         cmd.split(" "),
-                        {shell: true},
+                        { shell: true },
                         this.outputChannel,
                     );
                 }

src/utilities.ts

@@ -17,14 +17,6 @@ export class CSTerminal {
     public terminal: vscode.Terminal;
 }
 
-export function isEmpty(param) {
-    if ( param === null || param.lenght === 0 || param === undefined) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
 export interface IExecResult {
     error: Error | null;
     stdout: string;

src/utils/azureUtils.ts

@@ -0,0 +1,12 @@
+"use strict";
+
+import * as vscode from "vscode";
+
+export function isServicePrincipalSetInEnv(): boolean {
+    if (!(process.env.ARM_SUBSCRIPTION_ID && process.env.ARM_CLIENT_ID && process.env.ARM_CLIENT_SECRET &&
+        process.env.ARM_TENANT_ID && process.env.ARM_TEST_LOCATION)) {
+        vscode.window.showErrorMessage("Azure Service Principal is not set. (See documentation at: https://www.terraform.io/docs/providers/azurerm/authenticating_via_azure_cli.html)");
+        return false;
+    }
+    return true;
+}

src/utils/dockerUtils.ts

@@ -8,7 +8,6 @@ export async function isDockerInstalled(): Promise<boolean> {
         await executeCommand("docker", ["-v"], { shell: true });
         return true;
     } catch (error) {
-        vscode.window.showErrorMessage("Docker isn't installed, please install Docker to continue (https://www.docker.com/)");
         return false;
     }
 }