fix: strip stray leading blank line from extracted conda lock file#1082
Open
pinin4fjords wants to merge 1 commit into
Open
fix: strip stray leading blank line from extracted conda lock file#1082pinin4fjords wants to merge 1 commit into
pinin4fjords wants to merge 1 commit into
Conversation
extractCondaLockFile() took the substring right after the >> CONDA_LOCK_START marker but before that BuildKit log line's own trailing newline. Every later line's "#N T.T " prefix gets stripped by the existing regex, but that first newline was never part of a prefix, so it survived as a leading blank line in every extracted conda lock file. Two existing tests had the leading blank line baked into their expected output rather than catching it; updated both.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #1081.
extractCondaLockFile()takes the substring right after the>> CONDA_LOCK_STARTmarker text, but that's still before that BuildKit log line's own trailing newline. Every following line's#N T.Tprefix gets stripped by the existing regex, but that first newline was never part of a prefix, so it survives untouched as a leading blank line in every extracted conda lock file (confirmed present in every.conda-lock/*.txtcurrently in nf-core/modules built through this path).Changes
BuildLogServiceImpl.extractCondaLockFile: added.stripLeading()after the existing prefix-stripping regex.BuildLogsServiceTest: two existing tests ('should extract conda lockfile','should extract conda lockfile from s3') had the leading blank line baked into their expected output — they were written to match the buggy behavior rather than catch it. Updated both.Test plan
./gradlew test --tests "io.seqera.wave.service.logs.BuildLogsServiceTest"— 15/15 passingversion: 6\nenvironments:\n...) as well as the existing@EXPLICIT-style fixture, confirming the fix removes exactly the stray blank line and nothing else