pkg/rhcos: merge marketplace with coreos stream

Reworks the logic for fetching the coreos stream to merge a
marketplace.json file (if it exists) with the (rhcos|fcos).json
file before producing the results.

Author: patrickdillon

pkg/rhcos/builds.go

@@ -7,43 +7,69 @@ package rhcos
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"net/url"
 
 	"github.com/coreos/stream-metadata-go/stream"
-	"github.com/pkg/errors"
+	"github.com/coreos/stream-metadata-go/stream/rhcos"
+	"github.com/sirupsen/logrus"
 
 	"github.com/openshift/installer/data"
 )
 
+type marketplaceStream map[string]*rhcos.Marketplace
+
 // FetchRawCoreOSStream returns the raw stream metadata for the
 // bootimages embedded in the installer.
 func FetchRawCoreOSStream(ctx context.Context) ([]byte, error) {
-	file, err := data.Assets.Open(getStreamFileName())
+	st, err := FetchCoreOSBuild(ctx)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to read embedded CoreOS stream metadata")
+		return nil, fmt.Errorf("failed to get combined CoreOS build: %w", err)
 	}
-	defer file.Close()
-
-	body, err := io.ReadAll(file)
+	rawStream, err := json.Marshal(st)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to read CoreOS stream metadata")
+		return nil, fmt.Errorf("failed to marshal combined CoreOS stream: %w", err)
 	}
-	return body, nil
+	return rawStream, nil
 }
 
 // FetchCoreOSBuild returns the pinned version of RHEL/Fedora CoreOS used
 // by the installer to provision the bootstrap node and control plane currently.
 // For more information, see e.g. https://github.com/openshift/enhancements/pull/201
 func FetchCoreOSBuild(ctx context.Context) (*stream.Stream, error) {
-	body, err := FetchRawCoreOSStream(ctx)
+	body, err := fetchRawCoreOSStream(ctx)
 	if err != nil {
 		return nil, err
 	}
 	var st stream.Stream
 	if err := json.Unmarshal(body, &st); err != nil {
-		return nil, errors.Wrap(err, "failed to parse CoreOS stream metadata")
+		return nil, fmt.Errorf("failed to parse CoreOS stream metadata: %w", err)
+	}
+
+	// Merge marketplace json file into stream json file
+	mktBody, err := fetchRawMarketplaceStream()
+	if err != nil {
+		if errors.Is(err, fs.ErrNotExist) {
+			logrus.Debug("No marketplace json file found: skipping merge.")
+			return &st, nil
+		}
+		return nil, err
+	}
+	var mktSt marketplaceStream
+	if err := json.Unmarshal(mktBody, &mktSt); err != nil {
+		return nil, fmt.Errorf("failed to parse marketplace stream: %w", err)
+	}
+
+	for name, arch := range st.Architectures {
+		if mkt, ok := mktSt[name]; ok {
+			if arch.RHELCoreOSExtensions == nil {
+				arch.RHELCoreOSExtensions = &rhcos.Extensions{}
+			}
+			arch.RHELCoreOSExtensions.Marketplace = mkt
+		}
 	}
 	return &st, nil
 }
@@ -87,3 +113,31 @@ func FindArtifactURL(artifacts stream.PlatformArtifacts) (string, error) {
 	}
 	return "", fmt.Errorf("no \"disk\" artifact found")
 }
+
+func fetchRawCoreOSStream(ctx context.Context) ([]byte, error) {
+	file, err := data.Assets.Open(getStreamFileName())
+	if err != nil {
+		return nil, fmt.Errorf("failed to read embedded CoreOS stream metadata: %w", err)
+	}
+	defer file.Close()
+
+	body, err := io.ReadAll(file)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read CoreOS stream metadata: %w", err)
+	}
+	return body, nil
+}
+
+func fetchRawMarketplaceStream() ([]byte, error) {
+	file, err := data.Assets.Open(getMarketplaceStreamFileName())
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+
+	body, err := io.ReadAll(file)
+	if err != nil {
+		return nil, err
+	}
+	return body, nil
+}

pkg/rhcos/stream.go

@@ -5,3 +5,7 @@ package rhcos
 func getStreamFileName() string {
 	return "coreos/rhcos.json"
 }
+
+func getMarketplaceStreamFileName() string {
+	return "coreos/marketplace-rhcos.json"
+}

pkg/rhcos/stream_fcos.go

@@ -5,3 +5,9 @@ package rhcos
 func getStreamFileName() string {
 	return "coreos/fcos.json"
 }
+
+func getMarketplaceStreamFileName() string {
+	// There is no need for OKD marketplace images at this time
+	// so we can skip reading a marketplace stream file.
+	return ""
+}

pkg/rhcos/stream_scos.go

@@ -5,3 +5,10 @@ package rhcos
 func getStreamFileName() string {
 	return "coreos/scos.json"
 }
+
+func getMarketplaceStreamFileName() string {
+	// There is no current need for scos marketplace images,
+	// so this file does not currently exist. The calling
+	// functions will gracefully handle the missing file.
+	return "coreos/marketplace-scos.json"
+}