main: add osbuild version to version command #332
+24
−13
Conversation
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
This commit refactors the readVersionInfo function to improve code readability and maintainability.
Because I have modified my PATH to include a custom osbuild binary, it
is useful to see which osbuild version is being used by image-builder.
After this change, the output looks like this:
$ go run ./cmd/image-builder --version
image-builder:
version: unknown
commit: unknown
dependencies:
images: v0.197.0
osbuild: osbuild 162
lzap
requested review from
mvo5,
achilleas-k and
thozza
and removed request for
a team
mvo5
reviewed
Sep 26, 2025
| } | ||
|
|
||
| func readVersionFromBinary() *versionDescription { | ||
| var osbuildCmd = "osbuild" |
There was a problem hiding this comment.
Silly question, why is this a var? Given that its not mocked or anything we could as well just hardcode it in line 56?
thozza
requested changes
Sep 29, 2025
Comment on lines
+56
to
+62
| cmd := exec.Command(osbuildCmd, "--version") | ||
| var out bytes.Buffer | ||
| cmd.Stdout = &out | ||
| if err := cmd.Run(); err != nil { | ||
| vd.ImageBuilder.Dependencies.OSBuild = fmt.Sprintf("error: %s", err) | ||
| } | ||
| vd.ImageBuilder.Dependencies.OSBuild = strings.TrimSpace(out.String()) |
There was a problem hiding this comment.
Please use https://github.com/osbuild/images/blob/f52789ed6611ddf9b52ba0f06f7f70d5dd86c939/pkg/osbuild/osbuild-exec.go#L131-L146 instead of implementing it again here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
A very tiny refactoring to improve readability of the function.