diff --git a/lib/analyze-action.js b/lib/analyze-action.js index a041e3f48..d97d19c51 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -106382,11 +106382,7 @@ function isDynamicWorkflow() { return getWorkflowEventName() === "dynamic"; } function isDefaultSetup() { - return isDynamicWorkflow() && !isCCR(); -} -var CCR_KEY_PREFIX = "dynamic/copilot-pull-request-reviewer"; -function isCCR() { - return process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]?.startsWith(CCR_KEY_PREFIX) || false; + return isDynamicWorkflow(); } function prettyPrintInvocation(cmd, args) { return [cmd, ...args].map((x) => x.includes(" ") ? `'${x}'` : x).join(" "); @@ -108192,11 +108188,6 @@ function initFeatures(gitHubVersion, repositoryNwo, tempDir, logger) { "Not running against github.com. Using default values for all features." ); return new OfflineFeatures(logger); - } else if (isCCR()) { - logger.debug( - "Querying feature flags is not currently supported in Copilot Code Review. Using offline data for all features." - ); - return new OfflineFeatures(logger); } else { return new Features(repositoryNwo, tempDir, logger); } diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 16c47dcf9..d39e63400 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -103148,10 +103148,6 @@ function getWorkflowRunAttempt() { function isSelfHostedRunner() { return process.env.RUNNER_ENVIRONMENT === "self-hosted"; } -var CCR_KEY_PREFIX = "dynamic/copilot-pull-request-reviewer"; -function isCCR() { - return process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]?.startsWith(CCR_KEY_PREFIX) || false; -} function prettyPrintInvocation(cmd, args) { return [cmd, ...args].map((x) => x.includes(" ") ? `'${x}'` : x).join(" "); } @@ -104482,11 +104478,6 @@ function initFeatures(gitHubVersion, repositoryNwo, tempDir, logger) { "Not running against github.com. Using default values for all features." ); return new OfflineFeatures(logger); - } else if (isCCR()) { - logger.debug( - "Querying feature flags is not currently supported in Copilot Code Review. Using offline data for all features." - ); - return new OfflineFeatures(logger); } else { return new Features(repositoryNwo, tempDir, logger); } diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 0844ce15b..f4bc19ecf 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -163954,11 +163954,7 @@ function isDynamicWorkflow() { return getWorkflowEventName() === "dynamic"; } function isDefaultSetup() { - return isDynamicWorkflow() && !isCCR(); -} -var CCR_KEY_PREFIX = "dynamic/copilot-pull-request-reviewer"; -function isCCR() { - return process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]?.startsWith(CCR_KEY_PREFIX) || false; + return isDynamicWorkflow(); } function prettyPrintInvocation(cmd, args) { return [cmd, ...args].map((x) => x.includes(" ") ? `'${x}'` : x).join(" "); @@ -165559,11 +165555,6 @@ function initFeatures(gitHubVersion, repositoryNwo, tempDir, logger) { "Not running against github.com. Using default values for all features." ); return new OfflineFeatures(logger); - } else if (isCCR()) { - logger.debug( - "Querying feature flags is not currently supported in Copilot Code Review. Using offline data for all features." - ); - return new OfflineFeatures(logger); } else { return new Features(repositoryNwo, tempDir, logger); } diff --git a/lib/init-action.js b/lib/init-action.js index ccd6d267c..ca0b47a85 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -103758,11 +103758,7 @@ function isDynamicWorkflow() { return getWorkflowEventName() === "dynamic"; } function isDefaultSetup() { - return isDynamicWorkflow() && !isCCR(); -} -var CCR_KEY_PREFIX = "dynamic/copilot-pull-request-reviewer"; -function isCCR() { - return process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]?.startsWith(CCR_KEY_PREFIX) || false; + return isDynamicWorkflow(); } function prettyPrintInvocation(cmd, args) { return [cmd, ...args].map((x) => x.includes(" ") ? `'${x}'` : x).join(" "); @@ -105709,11 +105705,6 @@ function initFeatures(gitHubVersion, repositoryNwo, tempDir, logger) { "Not running against github.com. Using default values for all features." ); return new OfflineFeatures(logger); - } else if (isCCR()) { - logger.debug( - "Querying feature flags is not currently supported in Copilot Code Review. Using offline data for all features." - ); - return new OfflineFeatures(logger); } else { return new Features(repositoryNwo, tempDir, logger); } @@ -106289,7 +106280,7 @@ async function initConfig(features, inputs) { throw e; } } - if (await features.getValue("ignore_generated_files" /* IgnoreGeneratedFiles */) && isCCR()) { + if (await features.getValue("ignore_generated_files" /* IgnoreGeneratedFiles */) && isDynamicWorkflow()) { try { const generatedFilesCheckStartedAt = import_perf_hooks.performance.now(); const generatedFiles = await getGeneratedFiles(inputs.sourceRoot); diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index 3b83c5acf..95a380ab4 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -103265,10 +103265,6 @@ function isSelfHostedRunner() { function isDynamicWorkflow() { return getWorkflowEventName() === "dynamic"; } -var CCR_KEY_PREFIX = "dynamic/copilot-pull-request-reviewer"; -function isCCR() { - return process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]?.startsWith(CCR_KEY_PREFIX) || false; -} function prettyPrintInvocation(cmd, args) { return [cmd, ...args].map((x) => x.includes(" ") ? `'${x}'` : x).join(" "); } @@ -104382,11 +104378,6 @@ function initFeatures(gitHubVersion, repositoryNwo, tempDir, logger) { "Not running against github.com. Using default values for all features." ); return new OfflineFeatures(logger); - } else if (isCCR()) { - logger.debug( - "Querying feature flags is not currently supported in Copilot Code Review. Using offline data for all features." - ); - return new OfflineFeatures(logger); } else { return new Features(repositoryNwo, tempDir, logger); } diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js index 739f4bf93..e7d387120 100644 --- a/lib/start-proxy-action.js +++ b/lib/start-proxy-action.js @@ -120284,10 +120284,6 @@ function getWorkflowRunAttempt() { function isSelfHostedRunner() { return process.env.RUNNER_ENVIRONMENT === "self-hosted"; } -var CCR_KEY_PREFIX = "dynamic/copilot-pull-request-reviewer"; -function isCCR() { - return process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]?.startsWith(CCR_KEY_PREFIX) || false; -} var persistedInputsKey = "persisted_inputs"; var persistInputs = function() { const inputEnvironmentVariables = Object.entries(process.env).filter( @@ -121174,11 +121170,6 @@ function initFeatures(gitHubVersion, repositoryNwo, tempDir, logger) { "Not running against github.com. Using default values for all features." ); return new OfflineFeatures(logger); - } else if (isCCR()) { - logger.debug( - "Querying feature flags is not currently supported in Copilot Code Review. Using offline data for all features." - ); - return new OfflineFeatures(logger); } else { return new Features(repositoryNwo, tempDir, logger); } diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 96291b5f5..fcec315ba 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -106068,11 +106068,7 @@ function isDynamicWorkflow() { return getWorkflowEventName() === "dynamic"; } function isDefaultSetup() { - return isDynamicWorkflow() && !isCCR(); -} -var CCR_KEY_PREFIX = "dynamic/copilot-pull-request-reviewer"; -function isCCR() { - return process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]?.startsWith(CCR_KEY_PREFIX) || false; + return isDynamicWorkflow(); } function prettyPrintInvocation(cmd, args) { return [cmd, ...args].map((x) => x.includes(" ") ? `'${x}'` : x).join(" "); diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index e21817a19..071fe3b0c 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -106099,11 +106099,7 @@ function isDynamicWorkflow() { return getWorkflowEventName() === "dynamic"; } function isDefaultSetup() { - return isDynamicWorkflow() && !isCCR(); -} -var CCR_KEY_PREFIX = "dynamic/copilot-pull-request-reviewer"; -function isCCR() { - return process.env["CODEQL_ACTION_ANALYSIS_KEY" /* ANALYSIS_KEY */]?.startsWith(CCR_KEY_PREFIX) || false; + return isDynamicWorkflow(); } function prettyPrintInvocation(cmd, args) { return [cmd, ...args].map((x) => x.includes(" ") ? `'${x}'` : x).join(" "); @@ -107366,11 +107362,6 @@ function initFeatures(gitHubVersion, repositoryNwo, tempDir, logger) { "Not running against github.com. Using default values for all features." ); return new OfflineFeatures(logger); - } else if (isCCR()) { - logger.debug( - "Querying feature flags is not currently supported in Copilot Code Review. Using offline data for all features." - ); - return new OfflineFeatures(logger); } else { return new Features(repositoryNwo, tempDir, logger); } diff --git a/src/actions-util.test.ts b/src/actions-util.test.ts index ba5591a41..68b5c6319 100644 --- a/src/actions-util.test.ts +++ b/src/actions-util.test.ts @@ -5,14 +5,13 @@ import { fixCodeQualityCategory, getPullRequestBranches, isAnalyzingPullRequest, - isCCR, isDefaultSetup, isDynamicWorkflow, } from "./actions-util"; import { computeAutomationID } from "./api-client"; import { EnvVar } from "./environment"; import { getRunnerLogger } from "./logging"; -import { mockCCR, setupTests } from "./testing-utils"; +import { setupTests } from "./testing-utils"; import { initializeEnvironment } from "./util"; setupTests(test); @@ -257,16 +256,8 @@ test("isDynamicWorkflow() returns true if event name is `dynamic`", (t) => { t.false(isDynamicWorkflow()); }); -test("isCCR() returns true when expected", (t) => { - mockCCR(); - - t.assert(isCCR()); - t.false(isDefaultSetup()); -}); - test("isDefaultSetup() returns true when expected", (t) => { process.env.GITHUB_EVENT_NAME = "dynamic"; process.env[EnvVar.ANALYSIS_KEY] = "dynamic/github-code-scanning"; t.assert(isDefaultSetup()); - t.false(isCCR()); }); diff --git a/src/actions-util.ts b/src/actions-util.ts index 25f08359f..736d35d0f 100644 --- a/src/actions-util.ts +++ b/src/actions-util.ts @@ -8,7 +8,6 @@ import * as io from "@actions/io"; import { JSONSchemaForNPMPackageJsonFiles } from "@schemastore/package"; import type { Config } from "./config-utils"; -import { EnvVar } from "./environment"; import { Logger } from "./logging"; import { doesDirectoryExist, @@ -255,15 +254,7 @@ export function isDynamicWorkflow(): boolean { /** Determines whether we are running in default setup. */ export function isDefaultSetup(): boolean { - return isDynamicWorkflow() && !isCCR(); -} - -/* The analysis key prefix used for CCR. */ -const CCR_KEY_PREFIX = "dynamic/copilot-pull-request-reviewer"; - -/** Determines whether we are running in CCR. */ -export function isCCR(): boolean { - return process.env[EnvVar.ANALYSIS_KEY]?.startsWith(CCR_KEY_PREFIX) || false; + return isDynamicWorkflow(); } export function prettyPrintInvocation(cmd: string, args: string[]): string { diff --git a/src/config-utils.ts b/src/config-utils.ts index c35bad33b..491feb35c 100644 --- a/src/config-utils.ts +++ b/src/config-utils.ts @@ -7,7 +7,7 @@ import * as yaml from "js-yaml"; import { getActionVersion, isAnalyzingPullRequest, - isCCR, + isDynamicWorkflow, } from "./actions-util"; import { AnalysisConfig, @@ -964,10 +964,13 @@ export async function initConfig( } } - // If we are in CCR or the corresponding FF is enabled, try to determine + // If we are in a dynamic workflow or the corresponding FF is enabled, try to determine // which files in the repository are marked as generated and add them to // the `paths-ignore` configuration. - if ((await features.getValue(Feature.IgnoreGeneratedFiles)) && isCCR()) { + if ( + (await features.getValue(Feature.IgnoreGeneratedFiles)) && + isDynamicWorkflow() + ) { try { const generatedFilesCheckStartedAt = performance.now(); const generatedFiles = await getGeneratedFiles(inputs.sourceRoot); diff --git a/src/feature-flags.test.ts b/src/feature-flags.test.ts index 96e019347..8b7a0c7d5 100644 --- a/src/feature-flags.test.ts +++ b/src/feature-flags.test.ts @@ -21,7 +21,6 @@ import { getRecordingLogger, initializeFeatures, LoggedMessage, - mockCCR, mockCodeQLVersion, mockFeatureFlagApiEndpoint, setupTests, @@ -535,12 +534,3 @@ test("initFeatures returns a `Features` instance by default", async (t) => { t.is("Features", features.constructor.name); }); }); - -test("initFeatures returns an `OfflineFeatures` instance in CCR", async (t) => { - await withTmpDir(async (tmpDir) => { - mockCCR(); - - const features = setUpFeatureFlagTests(tmpDir); - t.is("OfflineFeatures", features.constructor.name); - }); -}); diff --git a/src/feature-flags.ts b/src/feature-flags.ts index e05c1e2af..f2a6c90a2 100644 --- a/src/feature-flags.ts +++ b/src/feature-flags.ts @@ -3,7 +3,6 @@ import * as path from "path"; import * as semver from "semver"; -import { isCCR } from "./actions-util"; import { getApiClient } from "./api-client"; import type { CodeQL } from "./codeql"; import * as defaults from "./defaults.json"; @@ -818,11 +817,6 @@ export function initFeatures( "Not running against github.com. Using default values for all features.", ); return new OfflineFeatures(logger); - } else if (isCCR()) { - logger.debug( - "Querying feature flags is not currently supported in Copilot Code Review. Using offline data for all features.", - ); - return new OfflineFeatures(logger); } else { return new Features(repositoryNwo, tempDir, logger); } diff --git a/src/feature-flags/offline-features.test.ts b/src/feature-flags/offline-features.test.ts index 433d80644..2870ef3b8 100644 --- a/src/feature-flags/offline-features.test.ts +++ b/src/feature-flags/offline-features.test.ts @@ -6,10 +6,9 @@ import { checkExpectedLogMessages, getRecordingLogger, LoggedMessage, - mockCCR, setupTests, } from "../testing-utils"; -import { initializeEnvironment, withTmpDir } from "../util"; +import { GitHubVariant, initializeEnvironment, withTmpDir } from "../util"; import { assertAllFeaturesHaveDefaultValues, @@ -20,14 +19,16 @@ setupTests(test); test.beforeEach(() => { initializeEnvironment("1.2.3"); - mockCCR(); }); test("OfflineFeatures makes no API requests", async (t) => { await withTmpDir(async (tmpDir) => { const loggedMessages: LoggedMessage[] = []; const logger = getRecordingLogger(loggedMessages); - const features = setUpFeatureFlagTests(tmpDir, logger); + const features = setUpFeatureFlagTests(tmpDir, logger, { + type: GitHubVariant.GHES, + version: "3.0.0", + }); t.is("OfflineFeatures", features.constructor.name); sinon @@ -36,7 +37,7 @@ test("OfflineFeatures makes no API requests", async (t) => { await assertAllFeaturesHaveDefaultValues(t, features); checkExpectedLogMessages(t, loggedMessages, [ - "Querying feature flags is not currently supported in Copilot Code Review. Using offline data for all features.", + "Not running against github.com. Using default values for all features.", ]); }); }); diff --git a/src/testing-utils.ts b/src/testing-utils.ts index 752a23988..8765738e4 100644 --- a/src/testing-utils.ts +++ b/src/testing-utils.ts @@ -14,7 +14,6 @@ import { CachingKind } from "./caching-utils"; import * as codeql from "./codeql"; import { Config } from "./config-utils"; import * as defaults from "./defaults.json"; -import { EnvVar } from "./environment"; import { CodeQLDefaultVersionInfo, Feature, @@ -505,9 +504,3 @@ export function makeTestToken(length: number = 36) { "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; return chars.repeat(Math.ceil(length / chars.length)).slice(0, length); } - -/** Sets the environment variables needed for isCCR() to be `true`. */ -export function mockCCR() { - process.env.GITHUB_EVENT_NAME = "dynamic"; - process.env[EnvVar.ANALYSIS_KEY] = "dynamic/copilot-pull-request-reviewer"; -}