Skip to content
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

Jump to bottom

Add support for the code_scanning_codeql_java_lombok feature flag #1809

Merged
merged 11 commits into from
Aug 2, 2023
Merged

Add support for the code_scanning_codeql_java_lombok feature flag #1809

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
097823f
Add support for the code_scanning_codeql_java_lombok feature flag
igfoo Jul 27, 2023
cae6b78
Be more consistent
igfoo Jul 27, 2023
a27d3e9
Fix lint suggestions
igfoo Jul 27, 2023
4f6104c
Run "npm run build"
igfoo Jul 27, 2023
c946707
Pass codeql in to check
igfoo Jul 27, 2023
976ada2
Regen
igfoo Jul 27, 2023
34090fe
Lombok: Only do anything if Java is being analysed
igfoo Jul 28, 2023
eea148f
Run "npm run build"
igfoo Jul 28, 2023
7d646d3
Empty commit
angelapwen Aug 2, 2023
c32aadf
Merge branch 'main' into igfoo/code_scanning_codeql_java_lombok
angelapwen Aug 2, 2023
1b6e91d
Autogenerate source map
angelapwen Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/feature-flags.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export interface FeatureEnablement {
*/
export enum Feature {
CliConfigFileEnabled = "cli_config_file_enabled",
CodeqlJavaLombokEnabled = "codeql_java_lombok_enabled",
DisableKotlinAnalysisEnabled = "disable_kotlin_analysis_enabled",
DisablePythonDependencyInstallationEnabled = "disable_python_dependency_installation_enabled",
ExportDiagnosticsEnabled = "export_diagnostics_enabled",
Expand All @@ -58,6 +59,11 @@ export const featureConfig: Record<
Feature,
{ envVar: string; minimumVersion: string | undefined; defaultValue: boolean }
> = {
[Feature.CodeqlJavaLombokEnabled]: {
envVar: "CODEQL_JAVA_LOMBOK_ENABLED",
Copy link
Contributor

Choose a reason for hiding this comment

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

For consistency with the others environment variable overrides for the feature flag!

Suggested change
envVar: "CODEQL_JAVA_LOMBOK_ENABLED",
envVar: "CODEQL_JAVA_LOMBOK",

minimumVersion: "2.14.0",
defaultValue: false,
},
[Feature.DisableKotlinAnalysisEnabled]: {
envVar: "CODEQL_DISABLE_KOTLIN_ANALYSIS",
minimumVersion: undefined,
Expand Down
8 changes: 8 additions & 0 deletions src/init-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,14 @@ async function run() {
core.exportVariable("CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN", "true");
}

if (await features.getValue(Feature.CodeqlJavaLombokEnabled)) {
logger.info("Enabling CodeQL Java Lombok support");
henrymercer marked this conversation as resolved.
Show resolved Hide resolved
core.exportVariable("CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS", "true");
} else {
logger.info("Disabling CodeQL Java Lombok support");
core.exportVariable("CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS", "false");
}

// Disable Python dependency extraction if feature flag set
if (
await features.getValue(
Expand Down