From 5283c3ba5a235eaef87458fb9c44576f6ddf65f8 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Thu, 12 Feb 2026 17:39:03 +0000 Subject: [PATCH] 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 --- lib/analyze-action.js | 17 +++++++---------- lib/autobuild-action.js | 17 +++++++---------- lib/init-action-post.js | 17 +++++++---------- lib/init-action.js | 17 +++++++---------- lib/setup-codeql-action.js | 17 +++++++---------- lib/start-proxy-action.js | 17 +++++++---------- lib/upload-sarif-action.js | 17 +++++++---------- src/feature-flags.ts | 20 +++++++------------- 8 files changed, 56 insertions(+), 83 deletions(-) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 249f7e53d..3142e5d02 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -107805,7 +107805,13 @@ var Features = class { } gitHubFeatureFlags; async getDefaultCliVersion(variant) { - return await this.gitHubFeatureFlags.getDefaultCliVersion(variant); + if (supportsFeatureFlags(variant)) { + return await this.gitHubFeatureFlags.getDefaultCliVersionFromFlags(); + } + return { + cliVersion, + tagName: bundleVersion + }; } /** * @@ -107912,15 +107918,6 @@ var GitHubFeatureFlags = class { } return version; } - async getDefaultCliVersion(variant) { - if (supportsFeatureFlags(variant)) { - return await this.getDefaultCliVersionFromFlags(); - } - return { - cliVersion, - tagName: bundleVersion - }; - } async getDefaultCliVersionFromFlags() { const response = await this.getAllFeatures(); const enabledFeatureFlagCliVersions = Object.entries(response).map( diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 9fa9255ce..dfe8ff14d 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -104138,7 +104138,13 @@ var Features = class { } gitHubFeatureFlags; async getDefaultCliVersion(variant) { - return await this.gitHubFeatureFlags.getDefaultCliVersion(variant); + if (supportsFeatureFlags(variant)) { + return await this.gitHubFeatureFlags.getDefaultCliVersionFromFlags(); + } + return { + cliVersion, + tagName: bundleVersion + }; } /** * @@ -104245,15 +104251,6 @@ var GitHubFeatureFlags = class { } return version; } - async getDefaultCliVersion(variant) { - if (supportsFeatureFlags(variant)) { - return await this.getDefaultCliVersionFromFlags(); - } - return { - cliVersion, - tagName: bundleVersion - }; - } async getDefaultCliVersionFromFlags() { const response = await this.getAllFeatures(); const enabledFeatureFlagCliVersions = Object.entries(response).map( diff --git a/lib/init-action-post.js b/lib/init-action-post.js index daa13ab66..9549831ea 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -165131,7 +165131,13 @@ var Features = class { } gitHubFeatureFlags; async getDefaultCliVersion(variant) { - return await this.gitHubFeatureFlags.getDefaultCliVersion(variant); + if (supportsFeatureFlags(variant)) { + return await this.gitHubFeatureFlags.getDefaultCliVersionFromFlags(); + } + return { + cliVersion, + tagName: bundleVersion + }; } /** * @@ -165238,15 +165244,6 @@ var GitHubFeatureFlags = class { } return version; } - async getDefaultCliVersion(variant) { - if (supportsFeatureFlags(variant)) { - return await this.getDefaultCliVersionFromFlags(); - } - return { - cliVersion, - tagName: bundleVersion - }; - } async getDefaultCliVersionFromFlags() { const response = await this.getAllFeatures(); const enabledFeatureFlagCliVersions = Object.entries(response).map( diff --git a/lib/init-action.js b/lib/init-action.js index 29003aa83..d14f7f8e0 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -105338,7 +105338,13 @@ var Features = class { } gitHubFeatureFlags; async getDefaultCliVersion(variant) { - return await this.gitHubFeatureFlags.getDefaultCliVersion(variant); + if (supportsFeatureFlags(variant)) { + return await this.gitHubFeatureFlags.getDefaultCliVersionFromFlags(); + } + return { + cliVersion, + tagName: bundleVersion + }; } /** * @@ -105445,15 +105451,6 @@ var GitHubFeatureFlags = class { } return version; } - async getDefaultCliVersion(variant) { - if (supportsFeatureFlags(variant)) { - return await this.getDefaultCliVersionFromFlags(); - } - return { - cliVersion, - tagName: bundleVersion - }; - } async getDefaultCliVersionFromFlags() { const response = await this.getAllFeatures(); const enabledFeatureFlagCliVersions = Object.entries(response).map( diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index 2f5f004fb..0e0f72b76 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -104039,7 +104039,13 @@ var Features = class { } gitHubFeatureFlags; async getDefaultCliVersion(variant) { - return await this.gitHubFeatureFlags.getDefaultCliVersion(variant); + if (supportsFeatureFlags(variant)) { + return await this.gitHubFeatureFlags.getDefaultCliVersionFromFlags(); + } + return { + cliVersion, + tagName: bundleVersion + }; } /** * @@ -104146,15 +104152,6 @@ var GitHubFeatureFlags = class { } return version; } - async getDefaultCliVersion(variant) { - if (supportsFeatureFlags(variant)) { - return await this.getDefaultCliVersionFromFlags(); - } - return { - cliVersion, - tagName: bundleVersion - }; - } async getDefaultCliVersionFromFlags() { const response = await this.getAllFeatures(); const enabledFeatureFlagCliVersions = Object.entries(response).map( diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js index 250957241..6b7464505 100644 --- a/lib/start-proxy-action.js +++ b/lib/start-proxy-action.js @@ -120832,7 +120832,13 @@ var Features = class { } gitHubFeatureFlags; async getDefaultCliVersion(variant) { - return await this.gitHubFeatureFlags.getDefaultCliVersion(variant); + if (supportsFeatureFlags(variant)) { + return await this.gitHubFeatureFlags.getDefaultCliVersionFromFlags(); + } + return { + cliVersion, + tagName: bundleVersion + }; } /** * @@ -120939,15 +120945,6 @@ var GitHubFeatureFlags = class { } return version; } - async getDefaultCliVersion(variant) { - if (supportsFeatureFlags(variant)) { - return await this.getDefaultCliVersionFromFlags(); - } - return { - cliVersion, - tagName: bundleVersion - }; - } async getDefaultCliVersionFromFlags() { const response = await this.getAllFeatures(); const enabledFeatureFlagCliVersions = Object.entries(response).map( diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index e97a0aaf7..14e89b9fc 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -106993,7 +106993,13 @@ var Features = class { } gitHubFeatureFlags; async getDefaultCliVersion(variant) { - return await this.gitHubFeatureFlags.getDefaultCliVersion(variant); + if (supportsFeatureFlags(variant)) { + return await this.gitHubFeatureFlags.getDefaultCliVersionFromFlags(); + } + return { + cliVersion, + tagName: bundleVersion + }; } /** * @@ -107100,15 +107106,6 @@ var GitHubFeatureFlags = class { } return version; } - async getDefaultCliVersion(variant) { - if (supportsFeatureFlags(variant)) { - return await this.getDefaultCliVersionFromFlags(); - } - return { - cliVersion, - tagName: bundleVersion - }; - } async getDefaultCliVersionFromFlags() { const response = await this.getAllFeatures(); const enabledFeatureFlagCliVersions = Object.entries(response).map( diff --git a/src/feature-flags.ts b/src/feature-flags.ts index ea8cc1767..ab5798ed3 100644 --- a/src/feature-flags.ts +++ b/src/feature-flags.ts @@ -378,7 +378,13 @@ export class Features implements FeatureEnablement { async getDefaultCliVersion( variant: util.GitHubVariant, ): Promise { - return await this.gitHubFeatureFlags.getDefaultCliVersion(variant); + if (supportsFeatureFlags(variant)) { + return await this.gitHubFeatureFlags.getDefaultCliVersionFromFlags(); + } + return { + cliVersion: defaults.cliVersion, + tagName: defaults.bundleVersion, + }; } /** @@ -524,18 +530,6 @@ class GitHubFeatureFlags { return version; } - async getDefaultCliVersion( - variant: util.GitHubVariant, - ): Promise { - if (supportsFeatureFlags(variant)) { - return await this.getDefaultCliVersionFromFlags(); - } - return { - cliVersion: defaults.cliVersion, - tagName: defaults.bundleVersion, - }; - } - async getDefaultCliVersionFromFlags(): Promise { const response = await this.getAllFeatures();