Skip to content

Commit 5550086

Browse files
committed
Move getDefaultCliVersion out of GitHubFeatureFlags
It doesn't need to be in there since it doesn't depend on the API itself and call `getDefaultCliVersionFromFlags` directly
1 parent 2d6b98c commit 5550086

File tree

8 files changed

+56
-83
lines changed

8 files changed

+56
-83
lines changed

lib/analyze-action.js

Lines changed: 7 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/autobuild-action.js

Lines changed: 7 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/init-action-post.js

Lines changed: 7 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/init-action.js

Lines changed: 7 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/setup-codeql-action.js

Lines changed: 7 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/start-proxy-action.js

Lines changed: 7 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/upload-sarif-action.js

Lines changed: 7 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/feature-flags.ts

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,13 @@ export class Features implements FeatureEnablement {
378378
async getDefaultCliVersion(
379379
variant: util.GitHubVariant,
380380
): Promise<CodeQLDefaultVersionInfo> {
381-
return await this.gitHubFeatureFlags.getDefaultCliVersion(variant);
381+
if (supportsFeatureFlags(variant)) {
382+
return await this.gitHubFeatureFlags.getDefaultCliVersionFromFlags();
383+
}
384+
return {
385+
cliVersion: defaults.cliVersion,
386+
tagName: defaults.bundleVersion,
387+
};
382388
}
383389

384390
/**
@@ -524,18 +530,6 @@ class GitHubFeatureFlags {
524530
return version;
525531
}
526532

527-
async getDefaultCliVersion(
528-
variant: util.GitHubVariant,
529-
): Promise<CodeQLDefaultVersionInfo> {
530-
if (supportsFeatureFlags(variant)) {
531-
return await this.getDefaultCliVersionFromFlags();
532-
}
533-
return {
534-
cliVersion: defaults.cliVersion,
535-
tagName: defaults.bundleVersion,
536-
};
537-
}
538-
539533
async getDefaultCliVersionFromFlags(): Promise<CodeQLDefaultVersionInfo> {
540534
const response = await this.getAllFeatures();
541535

0 commit comments

Comments
 (0)