Skip to content

Always build ci workspace without trailing separator #8788

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
daniel-mohedano merged 6 commits into from
May 9, 2025
Merged

Always build ci workspace without trailing separator #8788

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26b8dda
normalize repo path before building git info
daniel-mohedano May 8, 2025
4522409
unit test and usage of Paths to avoid issues with root directory
daniel-mohedano May 8, 2025
6060bb4
spotless
daniel-mohedano May 8, 2025
9cc396e
sanitize ciworkspace instead of using Path
daniel-mohedano May 9, 2025
53f52c0
fix spotless
daniel-mohedano May 9, 2025
de21bd1
add unit tests and take into account root path
daniel-mohedano May 9, 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
4 changes: 3 additions & 1 deletion internal-api/src/main/java/datadog/trace/api/git/GitInfoProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ public GitInfo getGitInfo(@Nullable String repositoryPath) {
if (repositoryPath == null) {
repositoryPath = NULL_PATH_STRING;
}
return gitInfoCache.computeIfAbsent(repositoryPath, this::buildGitInfo);

// normalize path to avoid creating two entries in the cache
return gitInfoCache.computeIfAbsent(Paths.get(repositoryPath).toString(), this::buildGitInfo);
}

private GitInfo buildGitInfo(String repositoryPath) {
Expand Down
19 changes: 19 additions & 0 deletions internal-api/src/test/groovy/datadog/trace/api/git/GitInfoProviderTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,25 @@ class GitInfoProviderTest extends Specification {
actualGitInfo.repositoryURL == "http://usefulUrl"
}

def "test caches git info regardless of path normalization"() {
setup:
def gitInfo = new GitInfo("repoUrl", "branch", "tag", new CommitInfo("sha"))
def gitInfoBuilder = Mock(GitInfoBuilder)
gitInfoBuilder.order() >> 1
gitInfoBuilder.providerAsExpected() >> GitProviderExpected.USER_SUPPLIED
gitInfoBuilder.providerAsDiscrepant() >> GitProviderDiscrepant.USER_SUPPLIED

def gitInfoProvider = new GitInfoProvider()
gitInfoProvider.registerGitInfoBuilder(gitInfoBuilder)

when:
gitInfoProvider.getGitInfo(REPO_PATH)
gitInfoProvider.getGitInfo(REPO_PATH + File.separator)

then:
1 * gitInfoBuilder.build(REPO_PATH) >> gitInfo
}

private GitInfoBuilder givenABuilderReturning(GitInfo gitInfo) {
givenABuilderReturning(gitInfo, 1)
}
Expand Down
Loading