osbuild/osbuild-exec: move exports and checkpoints into options

Author: croissanne

cmd/build/main.go

@@ -136,10 +136,12 @@ func run() error {
 	fmt.Printf("Building manifest: %s\n", manifestPath)
 
 	jobOutput := filepath.Join(outputDir, buildName)
-	_, err = osbuild.RunOSBuild(mf, imgType.Exports(), checkpoints, os.Stderr, &osbuild.OSBuildOptions{
-		StoreDir:   osbuildStore,
-		OutputDir:  jobOutput,
-		JSONOutput: false,
+	_, err = osbuild.RunOSBuild(mf, nil, &osbuild.OSBuildOptions{
+		StoreDir:    osbuildStore,
+		OutputDir:   jobOutput,
+		Exports:     imgType.Exports(),
+		Checkpoints: checkpoints,
+		JSONOutput:  false,
 	})
 	if err != nil {
 		return err

cmd/osbuild-playground/playground.go

@@ -57,10 +57,12 @@ func RunPlayground(img image.ImageKind, d distro.Distro, arch distro.Arch, repos
 
 	store := path.Join(state_dir, "osbuild-store")
 
-	_, err = osbuild.RunOSBuild(bytes, manifest.GetExports(), manifest.GetCheckpoints(), os.Stdout, &osbuild.OSBuildOptions{
-		StoreDir:   store,
-		OutputDir:  "./",
-		JSONOutput: false,
+	_, err = osbuild.RunOSBuild(bytes, nil, &osbuild.OSBuildOptions{
+		StoreDir:    store,
+		OutputDir:   "./",
+		Exports:     manifest.GetExports(),
+		Checkpoints: manifest.GetCheckpoints(),
+		JSONOutput:  false,
 	})
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "could not run osbuild: %s", err.Error())

pkg/osbuild/osbuild-exec.go

@@ -29,7 +29,10 @@ var osbuildCmd = "osbuild"
 type OSBuildOptions struct {
 	StoreDir  string
 	OutputDir string
-	ExtraEnv  []string
+
+	Exports     []string
+	Checkpoints []string
+	ExtraEnv    []string
 
 	Monitor   MonitorType
 	MonitorFD uintptr
@@ -39,7 +42,7 @@ type OSBuildOptions struct {
 	CacheMaxSize int64
 }
 
-func NewOSBuildCmd(manifest []byte, exports, checkpoints []string, optsPtr *OSBuildOptions) *exec.Cmd {
+func NewOSBuildCmd(manifest []byte, optsPtr *OSBuildOptions) *exec.Cmd {
 	opts := common.ValueOrEmpty(optsPtr)
 
 	cacheMaxSize := int64(20 * datasizes.GiB)
@@ -56,11 +59,11 @@ func NewOSBuildCmd(manifest []byte, exports, checkpoints []string, optsPtr *OSBu
 		"-",
 	)
 
-	for _, export := range exports {
+	for _, export := range opts.Exports {
 		cmd.Args = append(cmd.Args, "--export", export)
 	}
 
-	for _, checkpoint := range checkpoints {
+	for _, checkpoint := range opts.Checkpoints {
 		cmd.Args = append(cmd.Args, "--checkpoint", checkpoint)
 	}
 
@@ -84,7 +87,7 @@ func NewOSBuildCmd(manifest []byte, exports, checkpoints []string, optsPtr *OSBu
 // Note that osbuild returns non-zero when the pipeline fails. This function
 // does not return an error in this case. Instead, the failure is communicated
 // with its corresponding logs through osbuild.Result.
-func RunOSBuild(manifest []byte, exports, checkpoints []string, errorWriter io.Writer, optsPtr *OSBuildOptions) (*Result, error) {
+func RunOSBuild(manifest []byte, errorWriter io.Writer, optsPtr *OSBuildOptions) (*Result, error) {
 	opts := common.ValueOrEmpty(optsPtr)
 
 	if err := CheckMinimumOSBuildVersion(); err != nil {
@@ -93,7 +96,7 @@ func RunOSBuild(manifest []byte, exports, checkpoints []string, errorWriter io.W
 
 	var stdoutBuffer bytes.Buffer
 	var res Result
-	cmd := NewOSBuildCmd(manifest, exports, checkpoints, &opts)
+	cmd := NewOSBuildCmd(manifest, &opts)
 
 	if opts.JSONOutput {
 		cmd.Stdout = &stdoutBuffer
@@ -106,8 +109,8 @@ func RunOSBuild(manifest []byte, exports, checkpoints []string, errorWriter io.W
 	if err != nil {
 		return nil, fmt.Errorf("error starting osbuild: %v", err)
 	}
-
 	err = cmd.Wait()
+
 	if opts.JSONOutput {
 		// try to decode the output even though the job could have failed
 		if stdoutBuffer.Len() == 0 {

pkg/osbuild/osbuild-exec_test.go

@@ -22,7 +22,7 @@ func makeFakeOsbuild(t *testing.T, content string) string {
 
 func TestNewOSBuildCmdNilOptions(t *testing.T) {
 	mf := []byte(`{"real": "manifest"}`)
-	cmd := osbuild.NewOSBuildCmd(mf, nil, nil, nil)
+	cmd := osbuild.NewOSBuildCmd(mf, nil)
 	assert.NotNil(t, cmd)
 
 	assert.Equal(
@@ -48,17 +48,14 @@ func TestNewOSBuildCmdFullOptions(t *testing.T) {
 	mf := []byte(`{"real": "manifest"}`)
 	cmd := osbuild.NewOSBuildCmd(
 		mf,
-		[]string{
-			"export-1",
-			"export-2",
-		},
-		[]string{
-			"checkpoint-1",
-			"checkpoint-2",
-		},
 		&osbuild.OSBuildOptions{
-			StoreDir:     "store",
-			OutputDir:    "output",
+			StoreDir:  "store",
+			OutputDir: "output",
+			Exports: []string{
+				"export-1",
+				"export-2",
+			},
+			Checkpoints:  []string{"checkpoint-1", "checkpoint-2"},
 			ExtraEnv:     []string{"EXTRA_ENV_1=1", "EXTRA_ENV_2=2"},
 			Monitor:      osbuild.MonitorLog,
 			MonitorFD:    10,
@@ -115,7 +112,7 @@ fi
 	opts := &osbuild.OSBuildOptions{
 		JSONOutput: true,
 	}
-	result, err := osbuild.RunOSBuild([]byte(`{"fake":"manifest"}`), nil, nil, nil, opts)
+	result, err := osbuild.RunOSBuild([]byte(`{"fake":"manifest"}`), nil, opts)
 	assert.NoError(t, err)
 	assert.NotNil(t, result)
 	assert.True(t, result.Success)