bib: replace internal/{buildconfig,container,source} with images

This commit removes the internal/{buildconfig,container,source}
packages and replaces them with the (idential but renamed)
versions in the images library.

This needs osbuild/images#1655

Author: mvo5

bib/cmd/bootc-image-builder/image.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 
 	"github.com/osbuild/images/pkg/arch"
+	"github.com/osbuild/images/pkg/bib/osinfo"
 	"github.com/osbuild/images/pkg/blueprint"
 	"github.com/osbuild/images/pkg/container"
 	"github.com/osbuild/images/pkg/customizations/anaconda"
@@ -28,10 +29,8 @@ import (
 	"github.com/osbuild/images/pkg/runner"
 	"github.com/sirupsen/logrus"
 
-	"github.com/osbuild/bootc-image-builder/bib/internal/buildconfig"
 	"github.com/osbuild/bootc-image-builder/bib/internal/distrodef"
 	"github.com/osbuild/bootc-image-builder/bib/internal/imagetypes"
-	"github.com/osbuild/bootc-image-builder/bib/internal/source"
 )
 
 // TODO: Auto-detect this from container image metadata
@@ -45,7 +44,7 @@ type ManifestConfig struct {
 	ImageTypes imagetypes.ImageTypes
 
 	// Build config
-	Config *buildconfig.BuildConfig
+	Config *blueprint.Blueprint
 
 	// CPU architecture of the image
 	Architecture arch.Arch
@@ -58,8 +57,8 @@ type ManifestConfig struct {
 	DistroDefPaths []string
 
 	// Extracted information about the source container image
-	SourceInfo      *source.Info
-	BuildSourceInfo *source.Info
+	SourceInfo      *osinfo.Info
+	BuildSourceInfo *osinfo.Info
 
 	// RootFSType specifies the filesystem type for the root partition
 	RootFSType string
@@ -460,7 +459,7 @@ func manifestForDiskImage(c *ManifestConfig, rng *rand.Rand) (*manifest.Manifest
 	return &mf, nil
 }
 
-func labelForISO(os *source.OSRelease, arch *arch.Arch) string {
+func labelForISO(os *osinfo.OSRelease, arch *arch.Arch) string {
 	switch os.ID {
 	case "fedora":
 		return fmt.Sprintf("Fedora-S-dvd-%s-%s", arch, os.VersionID)
@@ -478,7 +477,7 @@ func labelForISO(os *source.OSRelease, arch *arch.Arch) string {
 	}
 }
 
-func needsRHELLoraxTemplates(si source.OSRelease) bool {
+func needsRHELLoraxTemplates(si osinfo.OSRelease) bool {
 	return si.ID == "rhel" || slices.Contains(si.IDLike, "rhel") || si.VersionID == "eln"
 }
 
@@ -607,7 +606,7 @@ func manifestForISO(c *ManifestConfig, rng *rand.Rand) (*manifest.Manifest, erro
 	return &mf, err
 }
 
-func getDistroAndRunner(osRelease source.OSRelease) (manifest.Distro, runner.Runner, error) {
+func getDistroAndRunner(osRelease osinfo.OSRelease) (manifest.Distro, runner.Runner, error) {
 	switch osRelease.ID {
 	case "fedora":
 		version, err := strconv.ParseUint(osRelease.VersionID, 10, 64)

bib/cmd/bootc-image-builder/image_test.go

@@ -15,8 +15,7 @@ import (
 	"github.com/osbuild/images/pkg/runner"
 
 	bib "github.com/osbuild/bootc-image-builder/bib/cmd/bootc-image-builder"
-	"github.com/osbuild/bootc-image-builder/bib/internal/buildconfig"
-	"github.com/osbuild/bootc-image-builder/bib/internal/source"
+	"github.com/osbuild/images/pkg/bib/osinfo"
 )
 
 func TestGetDistroAndRunner(t *testing.T) {
@@ -46,7 +45,7 @@ func TestGetDistroAndRunner(t *testing.T) {
 
 	for _, c := range cases {
 		t.Run(fmt.Sprintf("%s-%s", c.id, c.versionID), func(t *testing.T) {
-			osRelease := source.OSRelease{
+			osRelease := osinfo.OSRelease{
 				ID:        c.id,
 				VersionID: c.versionID,
 			}
@@ -685,7 +684,7 @@ func TestGenPartitionTableDiskCustomizationSizes(t *testing.T) {
 func TestManifestFilecustomizationsSad(t *testing.T) {
 	config := getBaseConfig()
 	config.ImageTypes = []string{"qcow2"}
-	config.Config = &buildconfig.BuildConfig{
+	config.Config = &blueprint.Blueprint{
 		Customizations: &blueprint.Customizations{
 			Files: []blueprint.FileCustomization{
 				{
@@ -703,7 +702,7 @@ func TestManifestFilecustomizationsSad(t *testing.T) {
 func TestManifestDirCustomizationsSad(t *testing.T) {
 	config := getBaseConfig()
 	config.ImageTypes = []string{"qcow2"}
-	config.Config = &buildconfig.BuildConfig{
+	config.Config = &blueprint.Blueprint{
 		Customizations: &blueprint.Customizations{
 			Directories: []blueprint.DirectoryCustomization{
 				{

bib/cmd/bootc-image-builder/main.go

@@ -19,6 +19,7 @@ import (
 	"golang.org/x/exp/slices"
 
 	"github.com/osbuild/images/pkg/arch"
+	"github.com/osbuild/images/pkg/bib/blueprintload"
 	"github.com/osbuild/images/pkg/cloud"
 	"github.com/osbuild/images/pkg/cloud/awscloud"
 	"github.com/osbuild/images/pkg/container"
@@ -28,10 +29,9 @@ import (
 	"github.com/osbuild/images/pkg/osbuild"
 	"github.com/osbuild/images/pkg/rpmmd"
 
-	"github.com/osbuild/bootc-image-builder/bib/internal/buildconfig"
-	podman_container "github.com/osbuild/bootc-image-builder/bib/internal/container"
 	"github.com/osbuild/bootc-image-builder/bib/internal/imagetypes"
-	"github.com/osbuild/bootc-image-builder/bib/internal/source"
+	podman_container "github.com/osbuild/images/pkg/bib/container"
+	"github.com/osbuild/images/pkg/bib/osinfo"
 
 	"github.com/osbuild/image-builder-cli/pkg/progress"
 	"github.com/osbuild/image-builder-cli/pkg/setup"
@@ -246,7 +246,7 @@ func manifestFromCobra(cmd *cobra.Command, args []string, pbar progress.Progress
 		return nil, nil, fmt.Errorf("cannot detect build types %v: %w", imgTypes, err)
 	}
 
-	config, err := buildconfig.ReadWithFallback(userConfigFile)
+	config, err := blueprintload.LoadWithFallback(userConfigFile)
 	if err != nil {
 		return nil, nil, fmt.Errorf("cannot read config: %w", err)
 	}
@@ -286,7 +286,7 @@ func manifestFromCobra(cmd *cobra.Command, args []string, pbar progress.Progress
 	}
 
 	// Gather some data from the containers distro
-	sourceinfo, err := source.LoadInfo(container.Root())
+	sourceinfo, err := osinfo.Load(container.Root())
 	if err != nil {
 		return nil, nil, err
 	}
@@ -310,7 +310,7 @@ func manifestFromCobra(cmd *cobra.Command, args []string, pbar progress.Progress
 		startedBuildContainer = true
 
 		// Gather some data from the containers distro
-		buildSourceinfo, err = source.LoadInfo(buildContainer.Root())
+		buildSourceinfo, err = osinfo.Load(buildContainer.Root())
 		if err != nil {
 			return nil, nil, err
 		}

bib/cmd/bootc-image-builder/main_test.go

@@ -15,16 +15,15 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/osbuild/images/pkg/arch"
+	"github.com/osbuild/images/pkg/bib/osinfo"
 	"github.com/osbuild/images/pkg/blueprint"
 	"github.com/osbuild/images/pkg/container"
 	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/manifest"
 	"github.com/osbuild/images/pkg/rpmmd"
 
 	main "github.com/osbuild/bootc-image-builder/bib/cmd/bootc-image-builder"
-	"github.com/osbuild/bootc-image-builder/bib/internal/buildconfig"
 	"github.com/osbuild/bootc-image-builder/bib/internal/imagetypes"
-	"github.com/osbuild/bootc-image-builder/bib/internal/source"
 )
 
 func TestCanChownInPathHappy(t *testing.T) {
@@ -75,8 +74,8 @@ func getBaseConfig() *main.ManifestConfig {
 	return &main.ManifestConfig{
 		Architecture: arch.ARCH_X86_64,
 		Imgref:       "testempty",
-		SourceInfo: &source.Info{
-			OSRelease: source.OSRelease{
+		SourceInfo: &osinfo.Info{
+			OSRelease: osinfo.OSRelease{
 				ID:         "fedora",
 				VersionID:  "40",
 				Name:       "Fedora Linux",
@@ -100,7 +99,7 @@ func getUserConfig() *main.ManifestConfig {
 	return &main.ManifestConfig{
 		Architecture: arch.ARCH_X86_64,
 		Imgref:       "testuser",
-		Config: &buildconfig.BuildConfig{
+		Config: &blueprint.Blueprint{
 			Customizations: &blueprint.Customizations{
 				User: []blueprint.UserCustomization{
 					{
@@ -111,8 +110,8 @@ func getUserConfig() *main.ManifestConfig {
 				},
 			},
 		},
-		SourceInfo: &source.Info{
-			OSRelease: source.OSRelease{
+		SourceInfo: &osinfo.Info{
+			OSRelease: osinfo.OSRelease{
 				ID:         "fedora",
 				VersionID:  "40",
 				Name:       "Fedora Linux",