-
Notifications
You must be signed in to change notification settings - Fork 127
Decouple repository root resolver from internal logic #2957
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.
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
base: main
Are you sure you want to change the base?
Conversation
… and update options in rally and stream runners
// check the file exists | ||
if _, err := repoRoot.Stat(includedFilePathRelFromRoot); err != nil { | ||
return nil, err |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Variable includedFilePathRelFromRoot
could be also a relative path outside repoRoot (something like ../path
).
Would that fail repoRoot.Stat()
in that case?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the included file can be outside the repo root? i thought all files should be within the repo..
includedFilePath
is the absolute path for the included file, taking into account the join of the relative path described inside the link file and the workdir.
includedFilePathRelFromRoot
is then the relative from root, if this is outside root, repoRoot.Stat will fail, as it wont be valid? i would need confirmation of this. Right now is restricted to root
…factor tests and added readme note
@mrodm i've updated the code with your feedback. i usually mark resolved the comments that have been addressed, please re-open if you find anything pending. thanks |
💚 Build Succeeded
History
|
Resolves #2797
This pull request refactors how repository root and links definitions files are discovered and used throughout the codebase, improving consistency, error handling, and test coverage. The main changes include passing the repository root explicitly to functions that need it, updating the logic for finding and reading the links definitions file, and enhancing license file handling during package builds. Comprehensive unit tests have been added for these new behaviors.
Repository root and links file handling:
build
,lint
, and links-related commands incmd/build.go
,cmd/lint.go
,cmd/links.go
) now explicitly locate and pass the repository root usingfiles.FindRepositoryRoot()
, and use this to find the links definitions file viadocs.LinksDefinitionsFilePath(repoRoot)
. This improves reliability and consistency in locating project resources. [1] [2] [3] [4] [5] [6]License file handling during build:
internal/builder/packages.go
now takes the repository root as a parameter and uses it to locate and copy the license file into the package, supporting overrides via environment variable and handling missing files gracefully. The helper functions have been refactored for clarity and improved error handling. [1] [2] [3] [4] [5]Links map logic and API changes:
internal/docs/links_map.go
has been refactored to use pointer receivers, provide clearer error handling, and accept the links file path explicitly. The logic for finding the links definitions file now checks environment variables first and falls back to the default file in the repository root, returning an empty string if not found. [1] [2] [3]Unit tests for new behaviors:
internal/builder/packages_test.go
andinternal/docs/links_map_test.go
cover repository license file discovery, license copying logic, and links file resolution under various scenarios (env var, missing file, default file, YAML parsing). [1] [2]Imports and cleanup: