Add github-codeql-tools repository property for tools input#3766
Add github-codeql-tools repository property for tools input#3766
github-codeql-tools repository property for tools input#3766Conversation
github-codeql-tools repository property for tools input
Co-authored-by: oscarsj <1410188+oscarsj@users.noreply.github.com> Agent-Logs-Url: https://github.com/github/codeql-action/sessions/24ef386a-5e4a-4630-b138-747d6c5729da
5c6b9e8 to
e74c1ee
Compare
There was a problem hiding this comment.
Pull request overview
Adds a new org-managed repository property (github-codeql-tools) that can supply a default tools input value (when the workflow doesn’t set one), enabling organizations to opt into using the toolcache without per-run CLI downloads.
Changes:
- Introduces
RepositoryPropertyName.TOOLS = "github-codeql-tools"and parses it from the repository properties API. - Resolves an effective tools input in
init-action(workflow input wins; otherwise fall back to repository property) and threads an origin flag through to CodeQL setup. - Allows
tools=toolcacheto bypass the existing feature-flag/dynamic-workflow restriction when the value came from the repository property, with targeted log messages and unit tests.
Reviewed changes
Copilot reviewed 19 out of 19 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| src/feature-flags/properties.ts | Adds the new repository property name and parser typing for github-codeql-tools. |
| src/feature-flags/properties.test.ts | Tests loading/parsing of the new github-codeql-tools property. |
| src/init-action.ts | Resolves effective tools input (workflow vs repository property) and passes origin flag into initCodeQL. |
| src/init.ts | Threads toolsInputFromRepositoryProperty into setupCodeQL. |
| src/codeql.ts | Threads toolsInputFromRepositoryProperty into setupCodeQLBundle. |
| src/setup-codeql.ts | Adds toolsInputFromRepositoryProperty parameter and uses it to allow toolcache without FF/dynamic checks. |
| src/setup-codeql.test.ts | Adds tests for toolcache behavior when enabled via repository property (including empty toolcache fallback). |
| lib/* | Generated JS output corresponding to the TS changes (not reviewed). |
| // Determine the effective tools input. | ||
| // The explicit `tools` workflow input takes precedence. If none is provided, | ||
| // fall back to the 'github-codeql-tools' repository property (if set). | ||
| const toolsWorkflowInput = getOptionalInput("tools"); | ||
| const toolsPropertyValue: string | undefined = | ||
| repositoryPropertiesResult.orElse({})[RepositoryPropertyName.TOOLS]; | ||
| const effectiveToolsInput = toolsWorkflowInput ?? toolsPropertyValue; | ||
| const toolsInputFromRepositoryProperty = | ||
| toolsWorkflowInput === undefined && toolsPropertyValue !== undefined; |
There was a problem hiding this comment.
effectiveToolsInput correctly falls back to the repository property, but later status reporting still uses getOptionalInput("tools") (see tools_input field earlier in this file). When github-codeql-tools is set, telemetry/status reports will show an empty tools_input, which makes it hard to debug or measure adoption. Consider reporting the resolved/effective tools value and/or explicitly recording whether it came from workflow input vs repository property.
| // Determine the effective tools input. | ||
| // The explicit `tools` workflow input takes precedence. If none is provided, | ||
| // fall back to the 'github-codeql-tools' repository property (if set). | ||
| const toolsWorkflowInput = getOptionalInput("tools"); | ||
| const toolsPropertyValue: string | undefined = | ||
| repositoryPropertiesResult.orElse({})[RepositoryPropertyName.TOOLS]; | ||
| const effectiveToolsInput = toolsWorkflowInput ?? toolsPropertyValue; | ||
| const toolsInputFromRepositoryProperty = | ||
| toolsWorkflowInput === undefined && toolsPropertyValue !== undefined; |
There was a problem hiding this comment.
The PR description says the github-codeql-tools repository property acts as a default for the tools input (with workflow input taking precedence). In this change it’s only resolved in init-action.ts; setup-codeql-action.ts still uses only the workflow input and never loads repository properties, so users of that action won’t get the org-level default behavior. Either extend the same resolution logic to setup-codeql-action (and any other entrypoints that accept tools) or clarify/adjust the PR description/docs to match the actual scope.
| export async function getCodeQLSource( | ||
| toolsInput: string | undefined, | ||
| defaultCliVersion: CodeQLDefaultVersionInfo, | ||
| apiDetails: api.GitHubApiDetails, | ||
| variant: util.GitHubVariant, | ||
| tarSupportsZstd: boolean, | ||
| features: FeatureEnablement, | ||
| logger: Logger, | ||
| toolsInputFromRepositoryProperty = false, | ||
| ): Promise<CodeQLToolsSource> { |
There was a problem hiding this comment.
toolsInputFromRepositoryProperty is introduced on getCodeQLSource, but it’s only used to special-case the toolcache guard + log messages. If the repository property is ever used for other tools values (e.g. linked, nightly, or a URL), the current logs in other branches still say they were requested by 'tools: …', which can be misleading when no workflow input was provided. Consider generalizing this to an “tools input origin” (workflow vs repo property) and using it consistently in all user-facing log messages about requested tools.
| if (toolsInputFromRepositoryProperty) { | ||
| logger.info( | ||
| `Attempting to use the latest CodeQL CLI version in the toolcache, as requested by the 'github-codeql-tools' repository property.`, | ||
| ); |
There was a problem hiding this comment.
The repository property name is hard-coded in these log messages ('github-codeql-tools'). To avoid drift if the property name ever changes and to keep usage consistent with the rest of the repo-properties system, consider referencing RepositoryPropertyName.TOOLS (or a shared constant) instead of duplicating the string literal in multiple places (including tests).
Large organizations downloading a pinned CodeQL CLI version on every analysis run can hit rate limits. This adds a
github-codeql-toolsrepository property that lets org admins set the tools source at org level, avoiding per-run downloads.What changes
New repository property:
github-codeql-toolsgithub-codeql-tools: toolcache)toolsinput — explicit workflow-leveltoolsinput always takes precedencetoolcachevalue works without requiring theAllowToolcacheInputfeature flag or adynamicworkflow trigger, since the org admin is explicitly opting inImplementation
RepositoryPropertyName.TOOLS = "github-codeql-tools"to the existing property enum/type system insrc/feature-flags/properties.tstoolsInputFromRepositoryPropertyflag through the call chain:initCodeQL→setupCodeQL→setupCodeQLBundle→getCodeQLSourcegetCodeQLSource,toolcachewith this flag set bypasses the feature-flag/dynamic-workflow guard and emits distinct log messages referencing the repository property name rather thantools: toolcacheinit-action.tsresolves the effective tools input: workflow input wins; property is used only when no explicit input is givenRisk assessment
High risk: Not fully under a feature flag — the new code path activates when the repository property is set.
Which use cases does this change impact?
Workflow types:
dynamicworkflows (Default Setup, Code Quality, ...).Products:
analysis-kinds: code-scanning.analysis-kinds: code-quality.Environments:
github.comand/or GitHub Enterprise Cloud with Data Residency.How did/will you validate this change?
.test.tsfiles).If something goes wrong after this change is released, what are the mitigation and rollback strategies?
The repository property must be explicitly set by an org admin; no existing workflows are affected unless they set
github-codeql-tools.How will you know if something goes wrong after this change is released?
Are there any special considerations for merging or releasing this change?
Merge / deployment checklist
⌨️ Start Copilot coding agent tasks without leaving your editor — available in VS Code, Visual Studio, JetBrains IDEs and Eclipse.