cloudapi: use osbuild v2 result struct to extract metadata

Reading stage metadata using osbuild's v2 result format.
For RPM stages we only want the core (OS) RPMs (not the build root
RPMs). Skip the build pipeline by name, but this should be handled
better since names are arbitrary.

Using type switch to convert metadata types instead of relying on the
type string of the stage result.

The rpmmd helper function isn't used anymore since that requires two
conversion passes (osbuild.StageMetadata -> rpmmd.RPM ->
cloudapi.PackageMetadata).

Signed-off-by: Achilleas Koutsou <achilleas@koutsou.net>

internal/cloudapi/v1/v1.go

@@ -9,7 +9,6 @@ import (
 	"math"
 	"math/big"
 	"net/http"
-	"strings"
 	"time"
 
 	"github.com/google/uuid"
@@ -18,7 +17,7 @@ import (
 	"github.com/osbuild/osbuild-composer/internal/blueprint"
 	"github.com/osbuild/osbuild-composer/internal/distro"
 	"github.com/osbuild/osbuild-composer/internal/distroregistry"
-	"github.com/osbuild/osbuild-composer/internal/osbuild1"
+	osbuild "github.com/osbuild/osbuild-composer/internal/osbuild2"
 	"github.com/osbuild/osbuild-composer/internal/ostree"
 	"github.com/osbuild/osbuild-composer/internal/prometheus"
 	"github.com/osbuild/osbuild-composer/internal/rpmmd"
@@ -527,70 +526,52 @@ func (h *apiHandlers) ComposeMetadata(ctx echo.Context, id string) error {
 		return ctx.JSON(200, ComposeMetadata{})
 	}
 
-	manifestVer, err := job.Manifest.Version()
+	var ostreeCommitMetadata *osbuild.OSTreeCommitStageMetadata
-	if err != nil {
+	var rpmStagesMd []osbuild.RPMStageMetadata // collect non-build rpm stage metadata
-		panic("Failed to parse manifest version: " + err.Error())
+	for plName, plMd := range result.OSBuildOutput.Metadata {
-	}
+		if plName == "build" {
-
+			// skip build pipeline
-	var rpms []rpmmd.RPM
+			continue
-	var ostreeCommitResult *osbuild1.StageResult
-	var coreStages []osbuild1.StageResult
-	switch manifestVer {
-	case "1":
-		coreStages = result.OSBuildOutput.Stages
-		if assemblerResult := result.OSBuildOutput.Assembler; assemblerResult.Name == "org.osbuild.ostree.commit" {
-			ostreeCommitResult = result.OSBuildOutput.Assembler
 		}
-	case "2":
+		for _, stageMd := range plMd {
-		// v2 manifest results store all stage output in the main stages
+			switch md := stageMd.(type) {
-		// here we filter out the build stages to collect only the RPMs for the
+			case *osbuild.RPMStageMetadata:
-		// core stages
+				rpmStagesMd = append(rpmStagesMd, *md)
-		// the filtering relies on two assumptions:
+			case *osbuild.OSTreeCommitStageMetadata:
-		// 1. the build pipeline is named "build"
+				ostreeCommitMetadata = md
-		// 2. the stage results from v2 manifests when converted to v1 are
-		// named by prefixing the pipeline name
-		for _, stage := range result.OSBuildOutput.Stages {
-			if !strings.HasPrefix(stage.Name, "build") {
-				coreStages = append(coreStages, stage)
 			}
 		}
-		// find the ostree.commit stage
-		for idx, stage := range result.OSBuildOutput.Stages {
-			if strings.HasSuffix(stage.Name, "org.osbuild.ostree.commit") {
-				ostreeCommitResult = &result.OSBuildOutput.Stages[idx]
-				break
-			}
-		}
-	default:
-		panic("Unknown manifest version: " + manifestVer)
 	}
 
-	rpms = rpmmd.OSBuildStagesToRPMs(coreStages)
+	packages := stagesToPackageMetadata(rpmStagesMd)
-
-	packages := make([]PackageMetadata, len(rpms))
-	for idx, rpm := range rpms {
-		packages[idx] = PackageMetadata{
-			Type:      rpm.Type,
-			Name:      rpm.Name,
-			Version:   rpm.Version,
-			Release:   rpm.Release,
-			Epoch:     rpm.Epoch,
-			Arch:      rpm.Arch,
-			Sigmd5:    rpm.Sigmd5,
-			Signature: rpm.Signature,
-		}
-	}
 
 	resp := new(ComposeMetadata)
 	resp.Packages = &packages
 
-	if ostreeCommitResult != nil && ostreeCommitResult.Metadata != nil {
+	if ostreeCommitMetadata != nil {
-		commitMetadata, ok := ostreeCommitResult.Metadata.(*osbuild1.OSTreeCommitStageMetadata)
+		resp.OstreeCommit = &ostreeCommitMetadata.Compose.OSTreeCommit
-		if !ok {
-			panic("Failed to convert ostree commit stage metadata")
-		}
-		resp.OstreeCommit = &commitMetadata.Compose.OSTreeCommit
 	}
 
 	return ctx.JSON(200, resp)
 }
+
+func stagesToPackageMetadata(stages []osbuild.RPMStageMetadata) []PackageMetadata {
+	packages := make([]PackageMetadata, 0)
+	for _, md := range stages {
+		for _, rpm := range md.Packages {
+			packages = append(packages,
+				PackageMetadata{
+					Type:      "rpm",
+					Name:      rpm.Name,
+					Version:   rpm.Version,
+					Release:   rpm.Release,
+					Epoch:     rpm.Epoch,
+					Arch:      rpm.Arch,
+					Sigmd5:    rpm.SigMD5,
+					Signature: rpmmd.PackageMetadataToSignature(rpm),
+				},
+			)
+		}
+	}
+	return packages
+}

internal/weldr/api.go

@@ -33,7 +33,7 @@ import (
 	"github.com/osbuild/osbuild-composer/internal/distro"
 	"github.com/osbuild/osbuild-composer/internal/distroregistry"
 	"github.com/osbuild/osbuild-composer/internal/jobqueue"
-	osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1"
+	osbuild "github.com/osbuild/osbuild-composer/internal/osbuild2"
 	"github.com/osbuild/osbuild-composer/internal/ostree"
 	"github.com/osbuild/osbuild-composer/internal/reporegistry"
 	"github.com/osbuild/osbuild-composer/internal/rpmmd"

internal/worker/json.go

@@ -2,7 +2,7 @@ package worker
 
 import (
 	"github.com/osbuild/osbuild-composer/internal/distro"
-	osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1"
+	osbuild "github.com/osbuild/osbuild-composer/internal/osbuild2"
 	"github.com/osbuild/osbuild-composer/internal/rpmmd"
 	"github.com/osbuild/osbuild-composer/internal/target"
 )