distro/rhel9: add the edge-ami image type based on edgeRawImage

Creates the 'edge-ami' image type based on edgeRawImage, which generates
a raw image (x86_64, aarch64) ready to upload to AWS EC2.

This 'edge-ami' image type has Ignition support.

Signed-off-by: Irene Diez <idiez@redhat.com>

internal/distro/distro_test_common/distro_test_common.go

@@ -253,6 +253,7 @@ func TestDistro_KernelOption(t *testing.T, d distro.Distro) {
 		"edge-simplified-installer": true,
 		"iot-raw-image":             true,
 		"edge-raw-image":            true,
+		"edge-ami":                  true,
 
 		// the tar image type is a minimal image type which is not expected to
 		// be usable without a blueprint (see commit 83a63aaf172f556f6176e6099ffaa2b5357b58f5).

internal/distro/fedora/distro.go

@@ -144,6 +144,7 @@ var (
 		name:        "iot-raw-image",
 		nameAliases: []string{"fedora-iot-raw-image"},
 		filename:    "image.raw.xz",
+		compression: "xz",
 		mimeType:    "application/xz",
 		packageSets: map[string]packageSetFunc{},
 		defaultImageConfig: &distro.ImageConfig{

internal/distro/fedora/images.go

@@ -447,6 +447,7 @@ func iotRawImage(workload workload.Workload,
 	img.PartitionTable = pt
 
 	img.Filename = t.Filename()
+	img.Compression = t.compression
 
 	return img, nil
 }

internal/distro/fedora/imagetype.go

@@ -33,6 +33,7 @@ type imageType struct {
 	name               string
 	nameAliases        []string
 	filename           string
+	compression        string
 	mimeType           string
 	packageSets        map[string]packageSetFunc
 	defaultImageConfig *distro.ImageConfig

internal/distro/rhel8/edge.go

@@ -62,6 +62,7 @@ func edgeRawImgType() imageType {
 		name:                "edge-raw-image",
 		nameAliases:         []string{"rhel-edge-raw-image"},
 		filename:            "image.raw.xz",
+		compression:         "xz",
 		mimeType:            "application/xz",
 		packageSets:         nil,
 		defaultSize:         10 * common.GibiByte,

internal/distro/rhel8/images.go

@@ -461,6 +461,7 @@ func edgeRawImage(workload workload.Workload,
 	img.PartitionTable = pt
 
 	img.Filename = t.Filename()
+	img.Compression = t.compression
 
 	return img, nil
 }

internal/distro/rhel9/distro.go

@@ -318,6 +318,7 @@ func newDistro(name string, minor int) *distribution {
 		edgeInstallerImgType,
 		edgeRawImgType,
 		imageInstaller,
+		edgeAMIImgType,
 	)
 
 	x86_64.addImageTypes(
@@ -361,6 +362,7 @@ func newDistro(name string, minor int) *distribution {
 		edgeInstallerImgType,
 		edgeSimplifiedInstallerImgType,
 		imageInstaller,
+		edgeAMIImgType,
 	)
 	aarch64.addImageTypes(
 		&platform.Aarch64{

internal/distro/rhel9/distro_test.go

@@ -196,6 +196,14 @@ func TestFilenameFromType(t *testing.T) {
 				mimeType: "application/gzip",
 			},
 		},
+		{
+			name: "edge-ami",
+			args: args{"edge-ami"},
+			want: wantResult{
+				filename: "image.raw",
+				mimeType: "application/octet-stream",
+			},
+		},
 		{
 			name: "invalid-output-type",
 			args: args{"foobar"},
@@ -461,8 +469,8 @@ func TestDistro_ManifestError(t *testing.T) {
 			_, _, err := imgType.Manifest(&bp, imgOpts, nil, 0)
 			if imgTypeName == "edge-commit" || imgTypeName == "edge-container" {
 				assert.EqualError(t, err, "kernel boot parameter customizations are not supported for ostree types")
-			} else if imgTypeName == "edge-raw-image" {
+			} else if imgTypeName == "edge-raw-image" || imgTypeName == "edge-ami" {
-				assert.EqualError(t, err, "edge raw images require specifying a URL from which to retrieve the OSTree commit")
+				assert.EqualError(t, err, fmt.Sprintf("\"%s\" images require specifying a URL from which to retrieve the OSTree commit", imgTypeName))
 			} else if imgTypeName == "edge-installer" || imgTypeName == "edge-simplified-installer" {
 				assert.EqualError(t, err, fmt.Sprintf("boot ISO image type \"%s\" requires specifying a URL from which to retrieve the OSTree commit", imgTypeName))
 			} else {
@@ -496,6 +504,7 @@ func TestArchitecture_ListImageTypes(t *testing.T) {
 				"edge-installer",
 				"edge-raw-image",
 				"edge-simplified-installer",
+				"edge-ami",
 				"gce",
 				"gce-rhui",
 				"tar",
@@ -515,6 +524,7 @@ func TestArchitecture_ListImageTypes(t *testing.T) {
 				"edge-installer",
 				"edge-simplified-installer",
 				"edge-raw-image",
+				"edge-ami",
 				"tar",
 				"image-installer",
 				"vhd",
@@ -634,7 +644,7 @@ func TestDistro_CustomFileSystemManifestError(t *testing.T) {
 			_, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0)
 			if imgTypeName == "edge-commit" || imgTypeName == "edge-container" {
 				assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types")
-			} else if imgTypeName == "edge-installer" || imgTypeName == "edge-simplified-installer" || imgTypeName == "edge-raw-image" {
+			} else if imgTypeName == "edge-installer" || imgTypeName == "edge-simplified-installer" || imgTypeName == "edge-raw-image" || imgTypeName == "edge-ami" {
 				continue
 			} else {
 				assert.EqualError(t, err, "The following custom mountpoints are not supported [\"/etc\"]")
@@ -662,7 +672,7 @@ func TestDistro_TestRootMountPoint(t *testing.T) {
 			_, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0)
 			if imgTypeName == "edge-commit" || imgTypeName == "edge-container" {
 				assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types")
-			} else if imgTypeName == "edge-installer" || imgTypeName == "edge-simplified-installer" || imgTypeName == "edge-raw-image" {
+			} else if imgTypeName == "edge-installer" || imgTypeName == "edge-simplified-installer" || imgTypeName == "edge-raw-image" || imgTypeName == "edge-ami" {
 				continue
 			} else {
 				assert.NoError(t, err)
@@ -796,7 +806,7 @@ func TestDistro_CustomFileSystemPatternMatching(t *testing.T) {
 			_, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0)
 			if imgTypeName == "edge-commit" || imgTypeName == "edge-container" {
 				assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types")
-			} else if imgTypeName == "edge-installer" || imgTypeName == "edge-simplified-installer" || imgTypeName == "edge-raw-image" {
+			} else if imgTypeName == "edge-installer" || imgTypeName == "edge-simplified-installer" || imgTypeName == "edge-raw-image" || imgTypeName == "edge-ami" {
 				continue
 			} else {
 				assert.EqualError(t, err, "The following custom mountpoints are not supported [\"/variable\" \"/variable/log/audit\"]")
@@ -824,7 +834,7 @@ func TestDistro_CustomUsrPartitionNotLargeEnough(t *testing.T) {
 			_, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0)
 			if imgTypeName == "edge-commit" || imgTypeName == "edge-container" {
 				assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types")
-			} else if imgTypeName == "edge-installer" || imgTypeName == "edge-simplified-installer" || imgTypeName == "edge-raw-image" {
+			} else if imgTypeName == "edge-installer" || imgTypeName == "edge-simplified-installer" || imgTypeName == "edge-raw-image" || imgTypeName == "edge-ami" {
 				continue
 			} else {
 				assert.NoError(t, err)

internal/distro/rhel9/edge.go

@@ -6,6 +6,7 @@ import (
 	"github.com/osbuild/osbuild-composer/internal/common"
 	"github.com/osbuild/osbuild-composer/internal/disk"
 	"github.com/osbuild/osbuild-composer/internal/distro"
+	"github.com/osbuild/osbuild-composer/internal/environment"
 	"github.com/osbuild/osbuild-composer/internal/platform"
 	"github.com/osbuild/osbuild-composer/internal/rpmmd"
 )
@@ -58,6 +59,7 @@ var (
 		name:        "edge-raw-image",
 		nameAliases: []string{"rhel-edge-raw-image"},
 		filename:    "image.raw.xz",
+		compression: "xz",
 		mimeType:    "application/xz",
 		packageSets: nil,
 		defaultImageConfig: &distro.ImageConfig{
@@ -130,6 +132,27 @@ var (
 		basePartitionTables: edgeBasePartitionTables,
 	}
 
+	edgeAMIImgType = imageType{
+		name:        "edge-ami",
+		filename:    "image.raw",
+		mimeType:    "application/octet-stream",
+		packageSets: nil,
+
+		defaultImageConfig: &distro.ImageConfig{
+			Locale: common.ToPtr("en_US.UTF-8"),
+		},
+		defaultSize:         10 * common.GibiByte,
+		rpmOstree:           true,
+		bootable:            true,
+		bootISO:             false,
+		image:               edgeRawImage,
+		buildPipelines:      []string{"build"},
+		payloadPipelines:    []string{"ostree-deployment", "image"},
+		exports:             []string{"image"},
+		basePartitionTables: edgeBasePartitionTables,
+		environment:         &environment.EC2{},
+	}
+
 	// Shared Services
 	edgeServices = []string{
 		// TODO(runcom): move fdo-client-linuxapp.service to presets?

internal/distro/rhel9/images.go

@@ -428,6 +428,7 @@ func edgeRawImage(workload workload.Workload,
 	img.PartitionTable = pt
 
 	img.Filename = t.Filename()
+	img.Compression = t.compression
 
 	return img, nil
 }

internal/distro/rhel9/imagetype.go

@@ -341,10 +341,10 @@ func (t *imageType) checkOptions(bp *blueprint.Blueprint, options distro.ImageOp
 		}
 	}
 
-	if t.name == "edge-raw-image" {
+	if t.name == "edge-raw-image" || t.name == "edge-ami" {
 		// check the checksum instead of the URL, because the URL should have been used to resolve the checksum and we need both
 		if ostreeChecksum == "" {
-			return warnings, fmt.Errorf("edge raw images require specifying a URL from which to retrieve the OSTree commit")
+			return warnings, fmt.Errorf("%q images require specifying a URL from which to retrieve the OSTree commit", t.name)
 		}
 
 		allowed := []string{"Ignition", "Kernel", "User", "Group"}

internal/image/ostree_raw.go

@@ -1,6 +1,7 @@
 package image
 
 import (
+	"fmt"
 	"math/rand"
 
 	"github.com/osbuild/osbuild-composer/internal/artifact"
@@ -38,6 +39,8 @@ type OSTreeRawImage struct {
 
 	Filename string
 
+	Compression string
+
 	Ignition bool
 
 	Directories []*fsnode.Directory
@@ -52,6 +55,15 @@ func NewOSTreeRawImage(commit ostree.CommitSpec) *OSTreeRawImage {
 }
 
 func ostreeCompressedImagePipelines(img *OSTreeRawImage, m *manifest.Manifest, buildPipeline *manifest.Build) *manifest.XZ {
+	imagePipeline := baseRawOstreeImage(img, m, buildPipeline)
+
+	xzPipeline := manifest.NewXZ(m, buildPipeline, imagePipeline)
+	xzPipeline.Filename = img.Filename
+
+	return xzPipeline
+}
+
+func baseRawOstreeImage(img *OSTreeRawImage, m *manifest.Manifest, buildPipeline *manifest.Build) *manifest.RawOSTreeImage {
 	osPipeline := manifest.NewOSTreeDeployment(m, buildPipeline, img.Commit, img.OSName, img.Ignition, img.Platform)
 	osPipeline.PartitionTable = img.PartitionTable
 	osPipeline.Remote = img.Remote
@@ -68,12 +80,7 @@ func ostreeCompressedImagePipelines(img *OSTreeRawImage, m *manifest.Manifest, b
 	osPipeline.EnabledServices = img.Workload.GetServices()
 	osPipeline.DisabledServices = img.Workload.GetDisabledServices()
 
-	imagePipeline := manifest.NewRawOStreeImage(m, buildPipeline, img.Platform, osPipeline)
+	return manifest.NewRawOStreeImage(m, buildPipeline, img.Platform, osPipeline)
-
-	xzPipeline := manifest.NewXZ(m, buildPipeline, imagePipeline)
-	xzPipeline.Filename = img.Filename
-
-	return xzPipeline
 }
 
 func (img *OSTreeRawImage) InstantiateManifest(m *manifest.Manifest,
@@ -83,8 +90,18 @@ func (img *OSTreeRawImage) InstantiateManifest(m *manifest.Manifest,
 	buildPipeline := manifest.NewBuild(m, runner, repos)
 	buildPipeline.Checkpoint()
 
-	xzPipeline := ostreeCompressedImagePipelines(img, m, buildPipeline)
+	var art *artifact.Artifact
+	switch img.Compression {
+	case "xz":
+		ostreeCompressed := ostreeCompressedImagePipelines(img, m, buildPipeline)
+		art = ostreeCompressed.Export()
+	case "":
+		ostreeBase := baseRawOstreeImage(img, m, buildPipeline)
+		ostreeBase.Filename = img.Filename
+		art = ostreeBase.Export()
+	default:
+		panic(fmt.Sprintf("unsupported compression type %q on %q", img.Compression, img.name))
+	}
 
-	art := xzPipeline.Export()
 	return art, nil
 }

tools/test-case-generators/format-request-map.json

@@ -866,6 +866,22 @@
       "blueprint": {}
     },
     "overrides": {}
+  },
+    "edge-ami": {
+    "compose-request": {
+      "distro": "",
+      "arch": "",
+      "image-type": "edge-ami",
+      "repositories": [],
+      "filename": "image.raw",
+      "ostree": {
+        "ref": "test/edge",
+        "url": "http://edge.example.com/repo",
+        "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      },
+      "blueprint": {}
+    },
+    "overrides": {}
   },
   "oci": {
     "compose-request": {