wip

Author: skyrpex

src/plugins/setup.ts

@@ -20,11 +20,11 @@ import { updateDockerImage } from "../utils/setup.ts";
 import { get_setup_ended } from "../utils/telemetry.ts";
 
 async function getValidCliPath() {
-	const cli = await findLocalStack()
+	const cli = await findLocalStack();
 	if (!cli.cliPath || !cli.executable || !cli.found || !cli.upToDate) {
-		return
+		return;
 	}
-	return cli.cliPath
+	return cli.cliPath;
 }
 
 export default createPlugin(
@@ -53,8 +53,6 @@ export default createPlugin(
 						},
 					});
 
-					const cliPath = cliStatusTracker.cliPath();
-
 					void window.withProgress(
 						{
 							location: ProgressLocation.Notification,
@@ -238,7 +236,8 @@ export default createPlugin(
 							// we must find it manually. This may occur when installing the
 							// CLI as part of the setup process: the CLI status tracker will
 							// detect the CLI path the next tick.
-							const cliPath = cliStatusTracker.cliPath() ?? await getValidCliPath();
+							const cliPath =
+								cliStatusTracker.cliPath() ?? (await getValidCliPath());
 							if (!cliPath) {
 								void window.showErrorMessage(
 									"Could not access the LocalStack CLI.",

src/plugins/status-bar.ts

@@ -3,6 +3,24 @@ import type { QuickPickItem } from "vscode";
 
 import { createPlugin } from "../plugins.ts";
 import { immediateOnce } from "../utils/immediate-once.ts";
+import type { LocalStackStatus } from "../utils/localstack-status.ts";
+import type { SetupStatus } from "../utils/setup-status.ts";
+
+function getStatusText(options: {
+	cliStatus: SetupStatus;
+	localStackStatus: LocalStackStatus;
+	cliOutdated: boolean | undefined;
+}) {
+	if (options.cliStatus === "ok") {
+		return options.localStackStatus;
+	}
+
+	if (options.cliOutdated) {
+		return "CLI outdated";
+	}
+
+	return "CLI not installed";
+}
 
 export default createPlugin(
 	"status-bar",
@@ -83,6 +101,7 @@ export default createPlugin(
 			const setupStatus = setupStatusTracker.status();
 			const localStackStatus = localStackStatusTracker.status();
 			const cliStatus = cliStatusTracker.status();
+			const cliOutdated = cliStatusTracker.outdated();
 			outputChannel.trace(
 				`[status-bar] setupStatus=${setupStatus} localStackStatus=${localStackStatus} cliStatus=${cliStatus}`,
 			);
@@ -111,8 +130,11 @@ export default createPlugin(
 						? "$(sync~spin)"
 						: "$(localstack-logo)";
 
-			const statusText =
-				cliStatus === "ok" ? `${localStackStatus}` : "not installed";
+			const statusText = getStatusText({
+				cliOutdated,
+				cliStatus,
+				localStackStatus,
+			});
 			statusBarItem.text = `${icon} LocalStack: ${statusText}`;
 
 			statusBarItem.tooltip = "Show LocalStack commands";

src/utils/cli.ts

@@ -166,13 +166,16 @@ export interface CliStatusTracker extends Disposable {
 	onStatusChange(callback: (status: SetupStatus | undefined) => void): void;
 	cliPath(): string | undefined;
 	onCliPathChange(callback: (cliPath: string | undefined) => void): void;
+	outdated(): boolean | undefined;
+	onOutdatedChange(callback: (outdated: boolean | undefined) => void): void;
 }
 
 export function createCliStatusTracker(
 	outputChannel: LogOutputChannel,
 ): CliStatusTracker {
 	const status = createValueEmitter<SetupStatus>();
 	const cliPath = createValueEmitter<string | undefined>();
+	const outdated = createValueEmitter<boolean | undefined>();
 
 	const track = immediateOnce(async () => {
 		const newCli = await findLocalStack().catch(() => undefined);
@@ -183,7 +186,11 @@ export function createCliStatusTracker(
 				? "ok"
 				: "setup_required",
 		);
-		cliPath.setValue(newCli?.cliPath);
+		// cliPath.setValue(newCli?.cliPath);
+		cliPath.setValue(newCli?.upToDate ? newCli?.cliPath : undefined);
+		outdated.setValue(
+			newCli?.upToDate !== undefined ? !newCli.upToDate : undefined,
+		);
 	});
 
 	const watcher = watch(
@@ -224,6 +231,12 @@ export function createCliStatusTracker(
 		onStatusChange(callback) {
 			status.onChange(callback);
 		},
+		outdated() {
+			return outdated.value();
+		},
+		onOutdatedChange(callback) {
+			outdated.onChange(callback);
+		},
 		async dispose() {
 			await watcher.close();
 		},

src/utils/setup-status.ts

@@ -278,6 +278,10 @@ function createLicenseStatusTracker(
 		"[setup-status.license]",
 		[LICENSE_FILENAME],
 		async () => {
+			if (cliTracker.outdated()) {
+				return "setup_required";
+			}
+
 			const cliPath = cliTracker.cliPath();
 			if (!cliPath) {
 				return undefined;
@@ -297,5 +301,9 @@ function createLicenseStatusTracker(
 		licenseTracker.check();
 	});
 
+	cliTracker.onOutdatedChange(() => {
+		licenseTracker.check();
+	});
+
 	return licenseTracker;
 }