Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
99 changes: 98 additions & 1 deletion src/main/java/io/github/guacsec/trustifyda/impl/ExhortApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import io.github.guacsec.trustifyda.tools.Ecosystem;
import io.github.guacsec.trustifyda.tools.Operations;
import io.github.guacsec.trustifyda.utils.Environment;
import io.github.guacsec.trustifyda.utils.PyprojectTomlUtils;
import io.github.guacsec.trustifyda.utils.WorkspaceUtils;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMultipart;
Expand All @@ -49,8 +50,10 @@
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.PathMatcher;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.AbstractMap;
Expand All @@ -66,8 +69,12 @@
import java.util.concurrent.CompletionException;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.tomlj.TomlArray;
import org.tomlj.TomlParseResult;
import org.tomlj.TomlTable;

/** Concrete implementation of the Exhort {@link Api} Service. */
public final class ExhortApi implements Api {
Expand Down Expand Up @@ -842,7 +849,7 @@ int resolveBatchConcurrency() {
}

private static final Set<String> DEFAULT_WORKSPACE_DISCOVERY_IGNORE =
Set.of("**/node_modules/**", "**/.git/**");
Set.of("**/node_modules/**", "**/.git/**", "**/__pycache__/**", "**/.venv/**");

/** Merges default ignore patterns, env var overrides, and caller-provided patterns. */
Set<String> resolveIgnorePatterns(Set<String> callerPatterns) {
Expand Down Expand Up @@ -875,6 +882,15 @@ List<Path> discoverWorkspaceManifests(Path workspaceDir, Set<String> ignorePatte
return discoverCargoManifests(workspaceDir, ignorePatterns);
}

// uv workspace: pyproject.toml with [tool.uv.workspace] + uv.lock
if (Files.isRegularFile(workspaceDir.resolve("pyproject.toml"))
&& Files.isRegularFile(workspaceDir.resolve("uv.lock"))) {
List<Path> uvManifests = discoverUvWorkspaceMembers(workspaceDir, ignorePatterns);
if (!uvManifests.isEmpty()) {
return uvManifests;
}
}

// JS workspace: require package.json + a lock file
Path packageJson = workspaceDir.resolve("package.json");
boolean hasJsLock =
Expand Down Expand Up @@ -930,6 +946,87 @@ private List<Path> discoverCargoManifests(Path workspaceDir, Set<String> ignoreP
}
}

/**
* Discover all pyproject.toml manifest paths in a uv workspace. Parses the root pyproject.toml
* for {@code [tool.uv.workspace]} member and exclude globs, then walks the filesystem to find
* matching member directories.
*/
private List<Path> discoverUvWorkspaceMembers(Path workspaceDir, Set<String> ignorePatterns) {
try {
Path rootPyproject = workspaceDir.resolve("pyproject.toml");
TomlParseResult toml = PyprojectTomlUtils.parseToml(rootPyproject);

TomlTable workspaceConfig = toml.getTable("tool.uv.workspace");
if (workspaceConfig == null) {
return Collections.emptyList();
}

TomlArray membersArray = workspaceConfig.getArray("members");
if (membersArray == null || membersArray.isEmpty()) {
return Collections.emptyList();
}

List<String> memberPatterns = new ArrayList<>();
for (int i = 0; i < membersArray.size(); i++) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The TomlArray-to-string extraction loop appears twice (for members and exclude) with identical null/blank filtering. Consider extracting a small helper

Suggested change
for (int i = 0; i < membersArray.size(); i++) {
static List<String> toStringList(TomlArray array) {
if (array == null) return List.of();
List<String> result = new ArrayList<>();
for (int i = 0; i < array.size(); i++) {
String s = array.getString(i);
if (s != null && !s.isBlank()) {
result.add(s.trim());
}
}
return result;

String pattern = membersArray.getString(i);
if (pattern != null && !pattern.isBlank()) {
memberPatterns.add(pattern.trim());
}
}
if (memberPatterns.isEmpty()) {
return Collections.emptyList();
}

Set<String> excludePatterns = new java.util.HashSet<>();
TomlArray excludeArray = workspaceConfig.getArray("exclude");
if (excludeArray != null) {
for (int i = 0; i < excludeArray.size(); i++) {
String pattern = excludeArray.getString(i);
if (pattern != null && !pattern.isBlank()) {
excludePatterns.add(pattern.trim());
}
}
}

List<PathMatcher> memberMatchers =
memberPatterns.stream()
.map(p -> FileSystems.getDefault().getPathMatcher("glob:" + p))
.toList();

List<PathMatcher> excludeMatchers =
excludePatterns.stream()
.map(p -> FileSystems.getDefault().getPathMatcher("glob:" + p))
.toList();

List<Path> manifests = new ArrayList<>();
try (var stream = Files.walk(workspaceDir)) {
stream
.filter(p -> p.getFileName().toString().equals("pyproject.toml"))
.filter(p -> !p.equals(rootPyproject))
.forEach(
p -> {
Path relative = workspaceDir.relativize(p.getParent());
boolean matchesMember =
memberMatchers.stream().anyMatch(m -> m.matches(relative));
boolean matchesExclude =
excludeMatchers.stream().anyMatch(m -> m.matches(relative));
if (matchesMember && !matchesExclude) {
manifests.add(p);
}
});
}

if (PyprojectTomlUtils.getProjectName(toml) != null) {
manifests.addFirst(rootPyproject);
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
}

return WorkspaceUtils.filterByIgnorePatterns(workspaceDir, manifests, ignorePatterns);
} catch (Exception e) {
LOG.log(Level.WARNING, "Failed to discover uv workspace members", e);
return Collections.emptyList();
}
}

/**
* Checks whether a package.json has "private": true, meaning it should not be analyzed as a
* publishable package.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,17 @@ public static List<Path> filterByIgnorePatterns(

List<PathMatcher> matchers =
ignorePatterns.stream()
.map(p -> FileSystems.getDefault().getPathMatcher("glob:" + p))
.flatMap(
p -> {
var fs = FileSystems.getDefault();
java.util.stream.Stream.Builder<PathMatcher> b =
java.util.stream.Stream.builder();
b.add(fs.getPathMatcher("glob:" + p));
if (p.startsWith("**/")) {
b.add(fs.getPathMatcher("glob:" + p.substring(3)));
}
return b.build();
})
.toList();

return manifests.stream()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
/*
* Copyright 2023-2025 Trustify Dependency Analytics Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
*
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.github.guacsec.trustifyda.impl;

import static org.assertj.core.api.Assertions.assertThat;

import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.List;
import java.util.Set;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

class UvWorkspaceDiscoveryTest {

private static final Path UV_FIXTURES = Path.of("src/test/resources/tst_manifests/workspace/uv");

@Test
void discoverWorkspaceManifests_uvRootPackageWorkspace() throws IOException {
Path workspaceDir = UV_FIXTURES.resolve("uv_workspace").toAbsolutePath().normalize();

ExhortApi api = new ExhortApi(Mockito.mock(java.net.http.HttpClient.class));
List<Path> manifests = api.discoverWorkspaceManifests(workspaceDir, Set.of());

assertThat(manifests).hasSize(3);
assertThat(manifests).allMatch(p -> p.toString().endsWith("pyproject.toml"));
assertThat(manifests.getFirst()).isEqualTo(workspaceDir.resolve("pyproject.toml"));
Comment thread
Strum355 marked this conversation as resolved.
assertThat(manifests)
.anyMatch(
p ->
p.toString()
.contains(
"packages"
+ File.separator
+ "mid-pkg"
+ File.separator
+ "pyproject.toml"));
assertThat(manifests)
.anyMatch(
p ->
p.toString()
.contains(
"packages"
+ File.separator
+ "sub-pkg"
+ File.separator
+ "pyproject.toml"));
}

@Test
void discoverWorkspaceManifests_uvVirtualWorkspace() throws IOException {
Path workspaceDir = UV_FIXTURES.resolve("uv_workspace_virtual").toAbsolutePath().normalize();

ExhortApi api = new ExhortApi(Mockito.mock(java.net.http.HttpClient.class));
List<Path> manifests = api.discoverWorkspaceManifests(workspaceDir, Set.of());

assertThat(manifests).hasSize(2);
assertThat(manifests).allMatch(p -> p.toString().endsWith("pyproject.toml"));
assertThat(manifests).noneMatch(p -> p.equals(workspaceDir.resolve("pyproject.toml")));
assertThat(manifests).anyMatch(p -> p.toString().contains("pkg-a"));
assertThat(manifests).anyMatch(p -> p.toString().contains("pkg-b"));
}

@Test
void discoverWorkspaceManifests_uvExcludePatterns() throws IOException {
Path workspaceDir = UV_FIXTURES.resolve("uv_workspace_exclude").toAbsolutePath().normalize();

ExhortApi api = new ExhortApi(Mockito.mock(java.net.http.HttpClient.class));
List<Path> manifests = api.discoverWorkspaceManifests(workspaceDir, Set.of());

assertThat(manifests).anyMatch(p -> p.toString().contains("core"));
assertThat(manifests).noneMatch(p -> p.toString().contains("internal"));
}

@Test
void discoverWorkspaceManifests_uvNestedMultiplePatterns() throws IOException {
Path workspaceDir = UV_FIXTURES.resolve("uv_workspace_nested").toAbsolutePath().normalize();

ExhortApi api = new ExhortApi(Mockito.mock(java.net.http.HttpClient.class));
List<Path> manifests = api.discoverWorkspaceManifests(workspaceDir, Set.of());

assertThat(manifests)
.anyMatch(
p ->
p.toString()
.contains(
"apps" + File.separator + "backend" + File.separator + "pyproject.toml"));
assertThat(manifests)
.anyMatch(
p ->
p.toString()
.contains(
"libs" + File.separator + "core" + File.separator + "pyproject.toml"));
}

@Test
void discoverWorkspaceManifests_uvNoLockFile() throws IOException {
Path workspaceDir = UV_FIXTURES.resolve("uv_workspace_no_lock").toAbsolutePath().normalize();

ExhortApi api = new ExhortApi(Mockito.mock(java.net.http.HttpClient.class));
List<Path> manifests = api.discoverWorkspaceManifests(workspaceDir, Set.of());

assertThat(manifests).isEmpty();
}

@Test
void discoverWorkspaceManifests_uvNoWorkspaceConfig() throws IOException {
Path workspaceDir = UV_FIXTURES.resolve("uv_workspace_no_config").toAbsolutePath().normalize();

ExhortApi api = new ExhortApi(Mockito.mock(java.net.http.HttpClient.class));
List<Path> manifests = api.discoverWorkspaceManifests(workspaceDir, Set.of());

assertThat(manifests).isEmpty();
}

@Test
void discoverWorkspaceManifests_uvIgnorePatternFiltering() throws IOException {
Path workspaceDir = UV_FIXTURES.resolve("uv_workspace_nested").toAbsolutePath().normalize();

ExhortApi api = new ExhortApi(Mockito.mock(java.net.http.HttpClient.class));
List<Path> manifests = api.discoverWorkspaceManifests(workspaceDir, Set.of("**/libs/**"));

assertThat(manifests).anyMatch(p -> p.toString().contains("backend"));
assertThat(manifests)
.noneMatch(p -> p.toString().contains(File.separator + "libs" + File.separator));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[project]
name = "mid-pkg"
version = "0.1.0"
dependencies = [
"sub-pkg",
]

[tool.uv.sources]
sub-pkg = { workspace = true }
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[project]
name = "sub-pkg"
version = "0.1.0"
dependencies = [
"requests>=2.0",
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[project]
name = "uv-mono"
version = "0.1.0"
dependencies = [
"mid-pkg",
"flask==2.0.3"
]

[tool.uv.sources]
mid-pkg = { workspace = true }

[tool.uv.workspace]
members = ["packages/*"]

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[project]
name = "core"
version = "0.1.0"
dependencies = []
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[project]
name = "internal"
version = "0.1.0"
dependencies = []
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[project]
name = "exclude-workspace"
version = "0.1.0"
dependencies = []

[tool.uv.workspace]
members = ["packages/*"]
exclude = ["packages/internal"]

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[project]
name = "backend"
version = "0.1.0"
dependencies = []
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[project]
name = "core"
version = "0.1.0"
dependencies = []
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[project]
name = "nested-workspace"
version = "0.1.0"
dependencies = []

[tool.uv.workspace]
members = ["apps/*", "libs/*"]

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[project]
name = "no-config"
version = "0.1.0"
dependencies = ["requests>=2.0"]

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[project]
name = "no-lock-workspace"
version = "0.1.0"
dependencies = []

[tool.uv.workspace]
members = ["packages/*"]
Loading
Loading