particle-os/debian-forge-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

main: show "success" message with output dir when build finishes

Browse source 
This commit adds a "success" message that also contains the output
dir when the build finishes.

Thanks to SimonS for suggesting this!
This commit is contained in:
Michael Vogt 2025-03-10 10:54:27 +01:00
parent 3eecad6b30
commit 06e73caec1
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cmd/image-builder/main.go
View file

@ -268,10 +268,11 @@ func cmdBuild(cmd *cobra.Command, args []string) error {
if err := buildImage(pbar, res, mf.Bytes(), buildOpts); err != nil { if err := buildImage(pbar, res, mf.Bytes(), buildOpts); err != nil {
return err return err
} }
pbar.Stop()
fmt.Fprintf(osStdout, "Image build successful, result in %q\n", outputDir)
if uploader != nil { if uploader != nil {
// XXX: integrate better into the progress, see bib // XXX: integrate better into the progress, see bib
pbar.Stop()
imagePath := filepath.Join(outputDir, res.ImgType.Name(), res.ImgType.Filename()) imagePath := filepath.Join(outputDir, res.ImgType.Name(), res.ImgType.Filename())
if err := uploadImageWithProgress(uploader, imagePath); err != nil { if err := uploadImageWithProgress(uploader, imagePath); err != nil {

6
cmd/image-builder/main_test.go
View file

@ -325,6 +325,10 @@ func TestBuildIntegrationHappy(t *testing.T) {
restore := main.MockNewRepoRegistry(testrepos.New) restore := main.MockNewRepoRegistry(testrepos.New)
defer restore() defer restore()
var fakeStdout bytes.Buffer
restore = main.MockOsStdout(&fakeStdout)
defer restore()
tmpdir := t.TempDir() tmpdir := t.TempDir()
restore = main.MockOsArgs([]string{ restore = main.MockOsArgs([]string{
"build", "build",
@ -342,6 +346,8 @@ func TestBuildIntegrationHappy(t *testing.T) {
err := main.Run() err := main.Run()
assert.NoError(t, err) assert.NoError(t, err)
assert.Contains(t, fakeStdout.String(), `Image build successful, result in "centos-9-qcow2-x86_64"`+"\n")
// ensure osbuild was run exactly one // ensure osbuild was run exactly one
require.Equal(t, 1, len(fakeOsbuildCmd.Calls())) require.Equal(t, 1, len(fakeOsbuildCmd.Calls()))
osbuildCall := fakeOsbuildCmd.Calls()[0] osbuildCall := fakeOsbuildCmd.Calls()[0]