Move license-related code to a separate module

Author: tiurin

src/plugins/setup.ts

@@ -1,16 +1,18 @@
 import { commands, ProgressLocation, window } from "vscode";
-import type { LogOutputChannel } from "vscode";
 
 import { createPlugin } from "../plugins.ts";
 import {
 	checkIsAuthenticated,
-	checkIsLicenseValid,
 	requestAuthentication,
 	saveAuthToken,
 } from "../utils/authenticate.ts";
-import { execLocalStack } from "../utils/cli.ts";
 import { configureAwsProfiles } from "../utils/configure-aws.ts";
 import { runInstallProcess } from "../utils/install.ts";
+import {
+	activateLicense,
+	checkIsLicenseValid,
+	activateLicenseUntilValid,
+} from "../utils/license.ts";
 import { minDelay } from "../utils/promises.ts";
 
 export default createPlugin(
@@ -172,9 +174,7 @@ export default createPlugin(
 							// then there will be no license info to be reported by `localstack license info`.
 							// Also, an expired license could be cached.
 							// Activating the license pre-emptively to know its state during the setup process.
-							await execLocalStack(["license", "activate"], {
-								outputChannel,
-							});
+							await activateLicense(outputChannel);
 							const licenseIsValid = await minDelay(
 								checkIsLicenseValid(outputChannel),
 							);
@@ -190,7 +190,7 @@ export default createPlugin(
 
 								commands.executeCommand("localstack.openLicensePage");
 
-								await checkLicenseUntilValid(outputChannel);
+								await activateLicenseUntilValid(outputChannel);
 							}
 							//TODO add telemetry
 
@@ -252,19 +252,3 @@ export default createPlugin(
 		}
 	},
 );
-
-async function checkLicenseUntilValid(
-	outputChannel: LogOutputChannel,
-): Promise<void> {
-	while (true) {
-		const licenseIsValid = await checkIsLicenseValid(outputChannel);
-		if (licenseIsValid) {
-			break;
-		}
-		await execLocalStack(["license", "activate"], {
-			outputChannel,
-		});
-		// Wait before trying again
-		await new Promise((resolve) => setTimeout(resolve, 1000));
-	}
-}

src/utils/authenticate.ts

@@ -10,7 +10,6 @@ import type {
 import { env, Uri, window } from "vscode";
 
 import { assertIsError } from "./assert.ts";
-import { execLocalStack } from "./cli.ts";
 
 /**
  * Registers a {@link UriHandler} that waits for an authentication token from the browser,
@@ -113,21 +112,6 @@ export async function saveAuthToken(
 	}
 }
 
-const LICENSE_VALIDITY_MARKER = "license validity: valid";
-
-export async function checkIsLicenseValid(outputChannel: LogOutputChannel) {
-	try {
-		const licenseInfoResponse = await execLocalStack(["license", "info"], {
-			outputChannel,
-		});
-		return licenseInfoResponse.stdout.includes(LICENSE_VALIDITY_MARKER);
-	} catch (error) {
-		outputChannel.error(error instanceof Error ? error : String(error));
-
-		return false;
-	}
-}
-
 /**
  * Checks if the user is authenticated by validating the stored auth token.
  *

src/utils/license.ts

@@ -0,0 +1,38 @@
+import type { LogOutputChannel } from "vscode";
+
+import { execLocalStack } from "./cli.ts";
+
+const LICENSE_VALIDITY_MARKER = "license validity: valid";
+
+export async function checkIsLicenseValid(outputChannel: LogOutputChannel) {
+	try {
+		const licenseInfoResponse = await execLocalStack(["license", "info"], {
+			outputChannel,
+		});
+		return licenseInfoResponse.stdout.includes(LICENSE_VALIDITY_MARKER);
+	} catch (error) {
+		outputChannel.error(error instanceof Error ? error : String(error));
+
+		return false;
+	}
+}
+
+export async function activateLicense(outputChannel: LogOutputChannel) {
+	await execLocalStack(["license", "activate"], {
+		outputChannel,
+	});
+}
+
+export async function activateLicenseUntilValid(
+	outputChannel: LogOutputChannel,
+): Promise<void> {
+	while (true) {
+		const licenseIsValid = await checkIsLicenseValid(outputChannel);
+		if (licenseIsValid) {
+			break;
+		}
+		await activateLicense(outputChannel);
+		// Wait before trying again
+		await new Promise((resolve) => setTimeout(resolve, 1000));
+	}
+}

src/utils/manage.ts

@@ -2,9 +2,9 @@ import { v7 as uuidv7 } from "uuid";
 import type { ExtensionContext, LogOutputChannel, MessageItem } from "vscode";
 import { commands, env, Uri, window } from "vscode";
 
-import { checkIsLicenseValid } from "./authenticate.ts";
 import { spawnLocalStack } from "./cli.ts";
 import { exec } from "./exec.ts";
+import { checkIsLicenseValid } from "./license.ts";
 import type { Telemetry } from "./telemetry.ts";
 
 export type LocalstackStatus = "running" | "starting" | "stopping" | "stopped";