Skip to content

fix(gradle): Correct Configuration Filtering Logic (IDETECT-4853) #1570

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
merged 7 commits into from
Oct 14, 2025
+13 −8
Merged

fix(gradle): Correct Configuration Filtering Logic (IDETECT-4853) #1570

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
78f10b7
Correctly parse wildcard configuration properties
bd-samratmuk Oct 8, 2025
1eedd03
Resolves the parsing issue for all relevant filters.
bd-samratmuk Oct 8, 2025
fe3393d
fix config filtering issue
bd-samratmuk Oct 11, 2025
55731d4
handle single quote issues in ftl
bd-samratmuk Oct 13, 2025
447aaa8
conditional quoting logic applied to all identified variables
bd-samratmuk Oct 13, 2025
268e27f
remove println statements
bd-samratmuk Oct 13, 2025
e71278d
escaping single quotes
bd-samratmuk Oct 14, 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
21 changes: 13 additions & 8 deletions src/main/resources/init-script-gradle.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import org.gradle.api.Task
import org.gradle.api.execution.TaskExecutionListener
import org.gradle.api.tasks.TaskState

Set<String> projectNameExcludeFilter = convertStringToSet('${excludedProjectNames}')
Set<String> projectNameIncludeFilter = convertStringToSet('${includedProjectNames}')
Set<String> projectPathExcludeFilter = convertStringToSet('${excludedProjectPaths}')
Set<String> projectPathIncludeFilter = convertStringToSet('${includedProjectPaths}')
Set<String> projectNameExcludeFilter = convertStringToSet('${excludedProjectNames?replace("\\", "\\\\")?replace("\'", "\\\'")}')
Set<String> projectNameIncludeFilter = convertStringToSet('${includedProjectNames?replace("\\", "\\\\")?replace("\'", "\\\'")}')
Set<String> projectPathExcludeFilter = convertStringToSet('${excludedProjectPaths?replace("\\", "\\\\")?replace("\'", "\\\'")}')
Set<String> projectPathIncludeFilter = convertStringToSet('${includedProjectPaths?replace("\\", "\\\\")?replace("\'", "\\\'")}')
Boolean rootOnly = Boolean.parseBoolean("${rootOnlyOption}")

gradle.allprojects {
Expand Down Expand Up @@ -47,9 +47,11 @@ gradle.allprojects {
def projectVersion = currentProject.version.toString()
def projectParent = currentProject.parent ? currentProject.parent.toString() : "none"

// Prepare configuration names
// Prepare configuration names (handles single quotes issues )
def configurationNames = getFilteredConfigurationNames(currentProject,
'${excludedConfigurationNames}', '${includedConfigurationNames}')
'${excludedConfigurationNames?replace("\\", "\\\\")?replace("\'", "\\\'")}',
'${includedConfigurationNames?replace("\\", "\\\\")?replace("\'", "\\\'")}'
)

def selectedConfigs = []
configurationNames.each { name ->
Expand All @@ -64,11 +66,14 @@ gradle.allprojects {
}
}

// Check if the project should be included in results
def shouldIncludeProject = (rootOnly && isRootProject) ||
// Check if the project should be included based on project-level filters
def projectMatchesFilters = (rootOnly && isRootProject) ||
(!rootOnly && shouldInclude(projectNameExcludeFilter, projectNameIncludeFilter, projectName) &&
shouldInclude(projectPathExcludeFilter, projectPathIncludeFilter, projectPath))

// A project is only included if it matches project filters AND has configurations that match config filters.
def shouldIncludeProject = projectMatchesFilters && !selectedConfigs.isEmpty()

// Capture output file path during configuration
def projectFilePathConfig = computeProjectFilePath(projectPath, extractionDir, rootProject)

Expand Down