Support non-standard Maven POM file names

PiperOrigin-RevId: 963202719

Author: cuixq

guidedremediation/internal/manifest/maven/pomxml.go

@@ -199,12 +199,6 @@ func GetReadWriter(client *datasource.MavenRegistryAPIClient, projectRoot string
 		if err != nil {
 			return nil, fmt.Errorf("failed to get absolute path for project root %q: %w", projectRoot, err)
 		}
-		stat, err := os.Stat(absProjectRoot)
-		if err == nil && stat.IsDir() {
-			// Assume the root manifest file is named pom.xml.
-			// Downstream DiscoverModules expects a file path.
-			absProjectRoot = filepath.Join(absProjectRoot, "pom.xml")
-		}
 		vol := filepath.VolumeName(absProjectRoot) + "/"
 		projectRoot, err = filepath.Rel(vol, absProjectRoot)
 		if err != nil {
@@ -224,13 +218,44 @@ func (r readWriter) SupportedStrategies() []strategy.Strategy {
 	return []strategy.Strategy{strategy.StrategyOverride}
 }
 
+// isPOMFile returns true if the given path is a Maven POM file.
+// It matches "pom.xml", "pom-*.xml", and "*-pom.xml".
+func isPOMFile(path string) bool {
+	base := strings.ToLower(filepath.Base(path))
+	if base == "pom.xml" {
+		return true
+	}
+	if !strings.HasSuffix(base, ".xml") {
+		return false
+	}
+	name := strings.TrimSuffix(base, ".xml")
+	return strings.HasPrefix(name, "pom-") || strings.HasSuffix(name, "-pom")
+}
+
 // Read parses the manifest from the given file.
 func (r readWriter) Read(path string, fsys scalibrfs.FS) (manifest.Manifest, error) {
 	ctx := context.Background()
 	path = filepath.ToSlash(path)
 	scanPaths := []string{path}
 	if r.projectRoot != "" {
-		scanPaths = append(scanPaths, filepath.ToSlash(r.projectRoot))
+		resolvedProjectRoot := filepath.ToSlash(r.projectRoot)
+		stat, err := fsys.Stat(resolvedProjectRoot)
+		if err != nil {
+			return nil, fmt.Errorf("failed to stat project root %q: %w", resolvedProjectRoot, err)
+		}
+		if !stat.IsDir() {
+			return nil, fmt.Errorf("project root %q is not a directory", resolvedProjectRoot)
+		}
+		entries, err := fsys.ReadDir(resolvedProjectRoot)
+		if err != nil {
+			return nil, fmt.Errorf("failed to read project root directory %q: %w", resolvedProjectRoot, err)
+		}
+		for _, entry := range entries {
+			if !entry.IsDir() && isPOMFile(entry.Name()) {
+				// Add all found POM files to the scan paths.
+				scanPaths = append(scanPaths, filepath.ToSlash(filepath.Join(resolvedProjectRoot, entry.Name())))
+			}
+		}
 	}
 	mavenutil.DiscoverModules(&scalibrfs.ScanRoot{FS: fsys, Path: ""}, scanPaths, r.MavenRegistryAPIClient)
 	f, err := fsys.Open(path)

guidedremediation/internal/manifest/maven/pomxml_test.go

@@ -1172,3 +1172,145 @@ func Test_generatePropertyPatches(t *testing.T) {
 		}
 	}
 }
+
+func TestRead_MultiModuleDiscovery_NonStandardPOM(t *testing.T) {
+	dir := t.TempDir()
+
+	// Create root/pom-conventions.xml
+	rootPOM := `
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.example</groupId>
+  <artifactId>root</artifactId>
+  <version>1.0.0</version>
+  <packaging>pom</packaging>
+  <modules>
+    <module>module-a</module>
+    <module>module-b</module>
+  </modules>
+</project>`
+	if err := os.WriteFile(filepath.Join(dir, "pom-conventions.xml"), []byte(rootPOM), 0644); err != nil {
+		t.Fatalf("failed to write root pom-conventions.xml: %v", err)
+	}
+
+	if err := os.MkdirAll(filepath.Join(dir, "module-a"), 0755); err != nil {
+		t.Fatalf("failed to create module-a dir: %v", err)
+	}
+	if err := os.MkdirAll(filepath.Join(dir, "module-b"), 0755); err != nil {
+		t.Fatalf("failed to create module-b dir: %v", err)
+	}
+
+	// Create module-b/pom.xml
+	moduleBPOM := `
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.example</groupId>
+  <artifactId>module-b</artifactId>
+  <version>1.0.0</version>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.12</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+</project>`
+	if err := os.WriteFile(filepath.Join(dir, "module-b", "pom.xml"), []byte(moduleBPOM), 0644); err != nil {
+		t.Fatalf("failed to write module-b pom.xml: %v", err)
+	}
+
+	// Create module-a/pom.xml
+	moduleAPOM := `
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.example</groupId>
+  <artifactId>module-a</artifactId>
+  <version>1.0.0</version>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.example</groupId>
+        <artifactId>module-b</artifactId>
+        <version>1.0.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+  </dependencies>
+</project>`
+	if err := os.WriteFile(filepath.Join(dir, "module-a", "pom.xml"), []byte(moduleAPOM), 0644); err != nil {
+		t.Fatalf("failed to write module-a pom.xml: %v", err)
+	}
+
+	client, _ := datasource.NewDefaultMavenRegistryAPIClient(t.Context(), "")
+
+	// Test WITH projectRoot (which is dir, containing pom-conventions.xml)
+	mavenRW, err := GetReadWriter(client, dir)
+	if err != nil {
+		t.Fatalf("error creating ReadWriter: %v", err)
+	}
+
+	vol := filepath.VolumeName(dir) + "/"
+	fsys := scalibrfs.DirFS(vol)
+	relPOM, err := filepath.Rel(vol, filepath.Join(dir, "module-a", "pom.xml"))
+	if err != nil {
+		t.Fatalf("error getting relative path: %v", err)
+	}
+	got, err := mavenRW.Read(filepath.ToSlash(relPOM), fsys)
+	if err != nil {
+		t.Fatalf("error reading manifest: %v", err)
+	}
+
+	// Verify that junit has version 4.12 (imported from module-b)
+	found := false
+	for _, req := range got.Requirements() {
+		if req.Name == "junit:junit" {
+			if req.Version == "4.12" {
+				found = true
+				break
+			}
+		}
+	}
+	if !found {
+		t.Errorf("expected to find junit:junit with version 4.12, got requirements: %v", got.Requirements())
+	}
+}
+
+func Test_isPOMFile(t *testing.T) {
+	tests := []struct {
+		path string
+		want bool
+	}{
+		{"pom.xml", true},
+		{"POM.XML", true},
+		{"pom-conventions.xml", true},
+		{"pom-conventions.XML", true},
+		{"pom-.xml", true},
+		{"pom-abc.xml", true},
+		{"parent-pom.xml", true},
+		{"common-pom.xml", true},
+		{"pom-conventions-pom.xml", true},
+		{"not-pom.xml", true}, // Matches *-pom.xml
+		{"my-app.pom", false},
+		{"not-a-pom-file.xml", false},
+		{"pom.xml.bak", false},
+		{"apom.xml", false},
+		{"pom", false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.path, func(t *testing.T) {
+			got := isPOMFile(tt.path)
+			if got != tt.want {
+				t.Errorf("isPOMFile(%q) = %v, want %v", tt.path, got, tt.want)
+			}
+		})
+	}
+}