Skip to content

Commit dfef829

Browse files
authored
fix: revert "fix: license check in status tracker" (#64)
Reverts #63 Step 1 in bringing main back to the state before #60 that introduced a regression. To be re-applied later.
1 parent 90fc99b commit dfef829

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

src/utils/cli.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,22 +173,20 @@ export interface CliStatusTracker extends Disposable {
173173
export function createCliStatusTracker(
174174
outputChannel: LogOutputChannel,
175175
): CliStatusTracker {
176-
const setupStatus = createValueEmitter<SetupStatus>();
176+
const status = createValueEmitter<SetupStatus>();
177177
const cliPath = createValueEmitter<string | undefined>();
178178
const outdated = createValueEmitter<boolean | undefined>();
179179

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

184-
setupStatus.setValue(
184+
status.setValue(
185185
newCli?.found && newCli.executable && newCli.upToDate
186186
? "ok"
187187
: "setup_required",
188188
);
189-
cliPath.setValue(
190-
setupStatus.value() === "ok" ? newCli?.cliPath : undefined,
191-
);
189+
cliPath.setValue(status.value() === "ok" ? newCli?.cliPath : undefined);
192190
outdated.setValue(
193191
newCli?.upToDate !== undefined ? !newCli.upToDate : undefined,
194192
);
@@ -227,10 +225,10 @@ export function createCliStatusTracker(
227225
cliPath.onChange(callback);
228226
},
229227
status() {
230-
return setupStatus.value();
228+
return status.value();
231229
},
232230
onStatusChange(callback) {
233-
setupStatus.onChange(callback);
231+
status.onChange(callback);
234232
},
235233
outdated() {
236234
return outdated.value();

src/utils/license.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { execLocalStack } from "./cli.ts";
77
import type { CliStatusTracker } from "./cli.ts";
88
import { createFileStatusTracker } from "./file-status-tracker.ts";
99
import type { StatusTracker } from "./file-status-tracker.ts";
10-
import { minDelay } from "./min-delay.ts";
1110

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

119-
const isLicenseValid = await minDelay(
120-
activateLicense(cliPath, outputChannel).then(() =>
121-
checkIsLicenseValid(cliPath, outputChannel),
122-
),
123-
);
118+
const isLicenseValid = await checkIsLicenseValid(cliPath, outputChannel);
124119

125120
return isLicenseValid ? "ok" : "setup_required";
126121
},

src/utils/localstack-instance.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export function createLocalStackInstanceStatusTracker(
5959
});
6060

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

6464
if (newStatus === "running") {
6565
healthCheckStatusTracker.stop();

0 commit comments

Comments
 (0)