wip: executor with logging

Author: croissanne

cmd/osbuild-worker/jobimpl-osbuild.go

@@ -525,7 +525,7 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
 		ExtraEnv:   extraEnv,
 		JSONOutput: true,
 	}
-	osbuildJobResult.OSBuildOutput, err = executor.RunOSBuild(jobArgs.Manifest, exports, nil, os.Stderr, opts)
+	osbuildJobResult.OSBuildOutput, err = executor.RunOSBuild(jobArgs.Manifest, exports, nil, os.Stderr, logWithId, opts)
 	// First handle the case when "running" osbuild failed
 	if err != nil {
 		osbuildJobResult.JobError = clienterrors.New(clienterrors.ErrorBuildJob, "osbuild build failed", err.Error())

go.mod

@@ -237,3 +237,5 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+replace github.com/osbuild/images => github.com/croissanne/images v0.0.0-20251027100746-72ef9ec548c0

go.sum

@@ -171,6 +171,8 @@ github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5z
 github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/croissanne/images v0.0.0-20251027100746-72ef9ec548c0 h1:OZKU0+4qnZAQG0ggWNv/wtHrZn+EWpSBqLCwDQhBWbo=
+github.com/croissanne/images v0.0.0-20251027100746-72ef9ec548c0/go.mod h1:tZqcrs3eNUA0VPs1h3YCnbnpAskVVfo36CIi2USSfDs=
 github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 h1:uX1JmpONuD549D73r6cgnxyUu18Zb7yHAy5AYU0Pm4Q=
 github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467/go.mod h1:uzvlm1mxhHkdfqitSA92i7Se+S9ksOn3a3qmv/kyOCw=
 github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
@@ -520,8 +522,6 @@ github.com/oracle/oci-go-sdk/v54 v54.0.0 h1:CDLjeSejv2aDpElAJrhKpi6zvT/zhZCZuXch
 github.com/oracle/oci-go-sdk/v54 v54.0.0/go.mod h1:+t+yvcFGVp+3ZnztnyxqXfQDsMlq8U25faBLa+mqCMc=
 github.com/osbuild/blueprint v1.16.0 h1:f/kHih+xpeJ1v7wtIfzdHPZTsiXsqKeDQ1+rrue6298=
 github.com/osbuild/blueprint v1.16.0/go.mod h1:HPlJzkEl7q5g8hzaGksUk7ifFAy9QFw9LmzhuFOAVm4=
-github.com/osbuild/images v0.209.0 h1:9BRf+N0op1WbQkc+7zVRBZxg4dqS4lty3i2stF3G9lo=
-github.com/osbuild/images v0.209.0/go.mod h1:tZqcrs3eNUA0VPs1h3YCnbnpAskVVfo36CIi2USSfDs=
 github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d h1:r9BFPDv0uuA9k1947Jybcxs36c/pTywWS1gjeizvtcQ=
 github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d/go.mod h1:zR1iu/hOuf+OQNJlk70tju9IqzzM4ycq0ectkFBm94U=
 github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=

internal/osbuildexecutor/osbuild-executor.go

@@ -3,9 +3,11 @@ package osbuildexecutor
 import (
 	"io"
 
+	"github.com/sirupsen/logrus"
+
 	"github.com/osbuild/images/pkg/osbuild"
 )
 
 type Executor interface {
-	RunOSBuild(manifest []byte, exports, checkpoints []string, errorWriter io.Writer, opts *osbuild.OSBuildOptions) (*osbuild.Result, error)
+	RunOSBuild(manifest []byte, exports, checkpoints []string, errorWriter io.Writer, logger *logrus.Entry, opts *osbuild.OSBuildOptions) (*osbuild.Result, error)
 }

internal/osbuildexecutor/runner-impl-aws-ec2.go

@@ -13,10 +13,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/sirupsen/logrus"
 	"golang.org/x/exp/slices"
 
 	"github.com/osbuild/images/pkg/osbuild"
-	"github.com/sirupsen/logrus"
 
 	"github.com/osbuild/osbuild-composer/internal/cloud/awscloud"
 )
@@ -28,9 +28,9 @@ type awsEC2Executor struct {
 	tmpDir     string
 }
 
-func prepareSources(manifest []byte, errorWriter io.Writer, opts *osbuild.OSBuildOptions) error {
+func prepareSources(manifest []byte, errorWriter io.Writer, logger *logrus.Entry, opts *osbuild.OSBuildOptions) error {
 	hostExecutor := NewHostExecutor()
-	_, err := hostExecutor.RunOSBuild(manifest, nil, nil, errorWriter, opts)
+	_, err := hostExecutor.RunOSBuild(manifest, nil, nil, errorWriter, logger, opts)
 	return err
 }
 
@@ -243,8 +243,8 @@ func extractOutputArchive(outputDirectory, outputTar string) error {
 
 }
 
-func (ec2e *awsEC2Executor) RunOSBuild(manifest []byte, exports, checkpoints []string, errorWriter io.Writer, opts *osbuild.OSBuildOptions) (*osbuild.Result, error) {
-	err := prepareSources(manifest, errorWriter, opts)
+func (ec2e *awsEC2Executor) RunOSBuild(manifest []byte, exports, checkpoints []string, errorWriter io.Writer, logger *logrus.Entry, opts *osbuild.OSBuildOptions) (*osbuild.Result, error) {
+	err := prepareSources(manifest, errorWriter, logger, opts)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to prepare sources: %w", err)
 	}

internal/osbuildexecutor/runner-impl-host.go

@@ -1,15 +1,55 @@
 package osbuildexecutor
 
 import (
+	"fmt"
 	"io"
 
+	"github.com/sirupsen/logrus"
+
 	"github.com/osbuild/images/pkg/osbuild"
 )
 
 type hostExecutor struct{}
 
-func (he *hostExecutor) RunOSBuild(manifest []byte, exports, checkpoints []string, errorWriter io.Writer, opts *osbuild.OSBuildOptions) (*osbuild.Result, error) {
-	return osbuild.RunOSBuild(manifest, exports, checkpoints, errorWriter, opts)
+func (he *hostExecutor) RunOSBuild(manifest []byte, exports, checkpoints []string, errorWriter io.Writer, logger *logrus.Entry, opts *osbuild.OSBuildOptions) (*osbuild.Result, error) {
+	opts.Monitor = osbuild.MonitorJSONSeq
+
+	cmd := osbuild.NewOSBuildCmd(manifest, exports, checkpoints, opts)
+	stdOut, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, err
+	}
+	defer stdOut.Close()
+	cmd.Stderr = errorWriter
+
+	osbuildStatus := osbuild.NewStatusScanner(stdOut)
+	if err := cmd.Start(); err != nil {
+		return nil, fmt.Errorf("error starting osbuild: %v", err)
+	}
+	for {
+		st, err := osbuildStatus.Status()
+		if err != nil {
+			return nil, fmt.Errorf(`error parsing osbuild status, please report a bug: %w`, err)
+		}
+		if st == nil {
+			break
+		}
+
+		if st.Progress != nil {
+			// TODO
+			logger.Infof("%s (step %d out of %d)", st.Message, st.Progress.Done, st.Progress.Total)
+		}
+	}
+
+	if err := cmd.Wait(); err != nil {
+		return nil, fmt.Errorf("error running osbuild: %w", err)
+	}
+
+	result, err := osbuildStatus.Result()
+	if err != nil {
+		return nil, fmt.Errorf("unable to construct osbuild result: %w", err)
+	}
+	return result, nil
 }
 
 func NewHostExecutor() Executor {