devide cleanup

Azure · Dec 28, 2023 · 2ae179b · 2ae179b
1 parent 166904c
commit 2ae179b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/src/cleanup.ts b/src/cleanup.ts
@@ -1,11 +1,14 @@
 import * as core from '@actions/core';
 import { setUserAgent } from './common/Utils'; 
-import { cleanupAccounts } from './common/Utils';
+import { cleanupAzCLIAccounts, cleanupAzPSAccounts } from './common/Utils';
 
 async function cleanup() {
     try {
         setUserAgent();
-        cleanupAccounts();
+        await cleanupAzCLIAccounts();
+        if(core.getInput('enable-AzPSSession').toLowerCase() === "true"){
+            await cleanupAzPSAccounts();
+        }
     }
     catch (error) {
         core.setFailed(`Login cleanup failed with ${error}.`);

diff --git a/src/common/Utils.ts b/src/common/Utils.ts
@@ -12,26 +12,27 @@ export function setUserAgent(): void {
     process.env.AZUREPS_HOST_ENVIRONMENT = (!!process.env.AZUREPS_HOST_ENVIRONMENT ? `${process.env.AZUREPS_HOST_ENVIRONMENT} ` : '') + `GITHUBACTIONS/${actionName}@v1_${usrAgentRepo}`;
 }
 
-export async function cleanupAccounts(): Promise<void> {
+export async function cleanupAzCLIAccounts(): Promise<void> {
     let azPath = await io.which("az", true);
     if (!azPath) {
         throw new Error("Azure CLI is not found in the runner.");
     }
     core.debug(`Azure CLI path: ${azPath}`);
     core.info("Clearing azure cli accounts from the local cache.");
     await exec.exec(`"${azPath}"`, ["account", "clear"]);
+
+}
 
-    if(core.getInput('enable-AzPSSession').toLowerCase() === "true"){
-        let psPath: string = await io.which(AzPSConstants.PowerShell_CmdName, true);
-        if (!psPath) {
-            throw new Error("PowerShell is not found in the runner.");
-        }
-        core.debug(`PowerShell path: ${psPath}`);
-        core.debug("Importing Azure PowerShell module.");
-        setPSModulePathForGitHubRunner();
-        await importLatestAzAccounts();
-        core.info("Clearing azure powershell accounts from the local cache.");
-        await exec.exec(`"${psPath}"`, ["-Command", "Clear-AzContext", "-Scope", "Process"]);
-        await exec.exec(`"${psPath}"`, ["-Command", "Clear-AzContext", "-Scope", "CurrentUser", "-Force", "-ErrorAction", "SilentlyContinue"]);
+export async function cleanupAzPSAccounts(): Promise<void> {
+    let psPath: string = await io.which(AzPSConstants.PowerShell_CmdName, true);
+    if (!psPath) {
+        throw new Error("PowerShell is not found in the runner.");
     }
-}
+    core.debug(`PowerShell path: ${psPath}`);
+    core.debug("Importing Azure PowerShell module.");
+    setPSModulePathForGitHubRunner();
+    await importLatestAzAccounts();
+    core.info("Clearing azure powershell accounts from the local cache.");
+    await exec.exec(`"${psPath}"`, ["-Command", "Clear-AzContext", "-Scope", "Process"]);
+    await exec.exec(`"${psPath}"`, ["-Command", "Clear-AzContext", "-Scope", "CurrentUser", "-Force", "-ErrorAction", "SilentlyContinue"]);
+}
diff --git a/src/setup.ts b/src/setup.ts
@@ -1,11 +1,14 @@
 import * as core from '@actions/core';
 import { setUserAgent } from './common/Utils'; 
-import { cleanupAccounts } from './common/Utils';
+import { cleanupAzCLIAccounts, cleanupAzPSAccounts } from './common/Utils';
 
 async function setup() {
     try {
         setUserAgent();
-        cleanupAccounts();
+        await cleanupAzCLIAccounts();
+        if(core.getInput('enable-AzPSSession').toLowerCase() === "true"){
+            await cleanupAzPSAccounts();
+        }
     }
     catch (error) {
         core.setFailed(`Login setup failed with ${error}. Make sure 'az' is installed on the runner. If 'enable-AzPSSession' is true, make sure 'pwsh' is installed on the runner together with Azure PowerShell module.`);