refactor: use RelationshipWorkspace instead on Module field

aquasecurity · Nov 28, 2024 · c0c4bf1 · c0c4bf1
1 parent 775ae7f
commit c0c4bf1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/pkg/dependency/parser/java/pom/artifact.go b/pkg/dependency/parser/java/pom/artifact.go
@@ -32,7 +32,6 @@ type artifact struct {
 
 	Exclusions map[string]struct{}
 
-	Module       bool
 	Relationship ftypes.Relationship
 
 	Locations ftypes.Locations

diff --git a/pkg/dependency/parser/java/pom/parse.go b/pkg/dependency/parser/java/pom/parse.go
@@ -125,8 +125,7 @@ func (p *Parser) parseRoot(root artifact, uniqModules map[string]struct{}) ([]ft
 	// Prepare a queue for dependencies
 	queue := newArtifactQueue()
 
-	// Enqueue root POM
-	root.Module = false
+	// Enqueue root/module POM
 	queue.enqueue(root)
 
 	var (
@@ -143,7 +142,7 @@ func (p *Parser) parseRoot(root artifact, uniqModules map[string]struct{}) ([]ft
 
 		// Modules should be handled separately so that they can have independent dependencies.
 		// It means multi-module allows for duplicate dependencies.
-		if art.Module {
+		if art.Relationship == ftypes.RelationshipWorkspace {
 			if _, ok := uniqModules[art.String()]; ok {
 				continue
 			}
@@ -288,7 +287,6 @@ func (p *Parser) parseModule(currentPath, relativePath string) (artifact, error)
 	}
 
 	moduleArtifact := module.artifact()
-	moduleArtifact.Module = true
 	moduleArtifact.Relationship = ftypes.RelationshipWorkspace
 
 	p.cache.put(moduleArtifact, result)