Skip to content

Resolve supported languages using CodeQL CLI #3083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henrymercer merged 4 commits into from
Sep 12, 2025
Merged

Resolve supported languages using CodeQL CLI #3083

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8fb310
Resolve supported languages using CodeQL CLI
henrymercer Aug 28, 2025
d981505
Add log for supported languages
henrymercer Aug 28, 2025
71410c6
Enable feature in CI for testing
henrymercer Sep 5, 2025
ed9d73b
Alphabetically order `ToolsFeature`
henrymercer Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/init-action.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion src/config-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ export function getUnknownLanguagesError(languages: string[]): string {
export async function getSupportedLanguageMap(
codeql: CodeQL,
features: FeatureEnablement,
logger: Logger,
): Promise<Record<string, string>> {
const resolveSupportedLanguagesUsingCli = await features.getValue(
Feature.ResolveSupportedLanguagesUsingCli,
Expand All @@ -313,6 +314,11 @@ export async function getSupportedLanguageMap(
const resolveResult = await codeql.betterResolveLanguages({
filterToLanguagesWithQueries: resolveSupportedLanguagesUsingCli,
});
if (resolveSupportedLanguagesUsingCli) {
logger.debug(
`The CodeQL CLI supports the following languages: ${Object.keys(resolveResult.extractors).join(", ")}`,
);
}
Comment on lines +317 to +321
Copy link
Copy Markdown
Member

@mbg mbg Sep 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor: Since this is a .debug call, we can probably skip the resolveSupportedLanguagesUsingCli check since it wouldn't hurt having this in the debug output either way. Alternatively, I also wouldn't be opposed to making this an info-level message if the resolveSupportedLanguagesUsingCli check is kept.

Copy link
Copy Markdown
Contributor Author

@henrymercer henrymercer Sep 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this info is only relevant if resolveSupportedLanguagesUsingCli is true — otherwise it contains the whole list of extractors including HTML etc

const supportedLanguages: Record<string, string> = {};
// Populate canonical language names
for (const extractor of Object.keys(resolveResult.extractors)) {
Expand Down Expand Up @@ -415,7 +421,7 @@ export async function getLanguages(
logger,
);

const languageMap = await getSupportedLanguageMap(codeql, features);
const languageMap = await getSupportedLanguageMap(codeql, features, logger);
const languagesSet = new Set<Language>();
const unknownLanguages: string[] = [];

Expand Down