distro/generic: pass subscription options to bootc disk images

Copy the requested subscription options into the image customizations in
manifestForDisk, so bootc disk images (qcow2, ami, ...) register on first
boot via the machinery added in the previous commit.

Author: lucasgarfield

pkg/distro/generic/bootc_image_test.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/osbuild/blueprint/pkg/blueprint"
 	"github.com/osbuild/image-builder/internal/common"
+	"github.com/osbuild/image-builder/pkg/customizations/subscription"
 	"github.com/osbuild/image-builder/pkg/datasizes"
 	"github.com/osbuild/image-builder/pkg/disk"
 	"github.com/osbuild/image-builder/pkg/disk/partition"
@@ -670,3 +671,24 @@ func TestGenPartitionTableFromOSInfo(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Contains(t, string(manifestJson), "01010101-01011-01011-01011-01010101")
 }
+
+// Each bootc manifestFor* variant hand-copies customizations, so pin that the
+// disk variant does not forget to pass Subscription through.
+func TestManifestSubscriptionCustomization(t *testing.T) {
+	imgType := NewTestBootcImageType(t, "qcow2")
+	imgOpts := distro.ImageOptions{
+		Subscription: &subscription.ImageOptions{
+			Organization:  "2040324",
+			ActivationKey: "my-secret-key",
+		},
+	}
+
+	mf, _, err := imgType.Manifest(&blueprint.Blueprint{}, imgOpts, nil, common.ToPtr(int64(0)))
+	assert.NoError(t, err)
+	manifestJson, err := mf.Serialize(nil, diskContainers, nil, nil, nil)
+	assert.NoError(t, err)
+
+	// assert on names, not stage types: mount units share them
+	assert.Contains(t, string(manifestJson), "osbuild-subscription-register.service")
+	assert.Contains(t, string(manifestJson), "/etc/osbuild-subscription-register.env")
+}

pkg/distro/generic/bootc_imagetype.go

@@ -225,6 +225,7 @@ func (t *bootcImageType) manifestForDisk(bp *blueprint.Blueprint, options distro
 	img.Bootloader = bd.bootloader
 	img.UnifiedKernel = bd.unifiedKernel
 
+	img.OSCustomizations.Subscription = options.Subscription
 	img.OSCustomizations.Users = users.UsersFromBP(customizations.GetUsers())
 
 	groups, err := customizations.GetGroups()