Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/utils/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,22 +173,20 @@ export interface CliStatusTracker extends Disposable {
export function createCliStatusTracker(
outputChannel: LogOutputChannel,
): CliStatusTracker {
const setupStatus = createValueEmitter<SetupStatus>();
const status = createValueEmitter<SetupStatus>();
const cliPath = createValueEmitter<string | undefined>();
const outdated = createValueEmitter<boolean | undefined>();

const track = createOnceImmediate(async () => {
const newCli = await findLocalStack().catch(() => undefined);
outputChannel.info(`[cli]: findLocalStack = ${newCli?.cliPath}`);

setupStatus.setValue(
status.setValue(
newCli?.found && newCli.executable && newCli.upToDate
? "ok"
: "setup_required",
);
cliPath.setValue(
setupStatus.value() === "ok" ? newCli?.cliPath : undefined,
);
cliPath.setValue(status.value() === "ok" ? newCli?.cliPath : undefined);
outdated.setValue(
newCli?.upToDate !== undefined ? !newCli.upToDate : undefined,
);
Expand Down Expand Up @@ -227,10 +225,10 @@ export function createCliStatusTracker(
cliPath.onChange(callback);
},
status() {
return setupStatus.value();
return status.value();
},
onStatusChange(callback) {
setupStatus.onChange(callback);
status.onChange(callback);
},
outdated() {
return outdated.value();
Expand Down
7 changes: 1 addition & 6 deletions src/utils/license.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { execLocalStack } from "./cli.ts";
import type { CliStatusTracker } from "./cli.ts";
import { createFileStatusTracker } from "./file-status-tracker.ts";
import type { StatusTracker } from "./file-status-tracker.ts";
import { minDelay } from "./min-delay.ts";

/**
* See https://github.com/localstack/localstack/blob/de861e1f656a52eaa090b061bd44fc1a7069715e/localstack-core/localstack/utils/files.py#L38-L55.
Expand Down Expand Up @@ -116,11 +115,7 @@ export function createLicenseStatusTracker(
return "waiting_for_dependencies";
}

const isLicenseValid = await minDelay(
activateLicense(cliPath, outputChannel).then(() =>
checkIsLicenseValid(cliPath, outputChannel),
),
);
const isLicenseValid = await checkIsLicenseValid(cliPath, outputChannel);

return isLicenseValid ? "ok" : "setup_required";
},
Expand Down
2 changes: 1 addition & 1 deletion src/utils/localstack-instance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export function createLocalStackInstanceStatusTracker(
});

status.onChange((newStatus) => {
outputChannel.trace(`[localstack-instance-status] status=${newStatus}`);
outputChannel.trace(`[localstack-instances-status] status=${newStatus}`);

if (newStatus === "running") {
healthCheckStatusTracker.stop();
Expand Down
Loading