particle-os/debian-forge-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

image-builder: use github.com/osbuild/blueprint

Browse source 
Drop using the "images" library blueprint types and use the ones
from github.com/osbuild/blueprint/pkg/blueprint instead.

This also moves to the images library to v0.172.0 and the blueprints
library to v1.12.0 as this is required for this to work.
This commit is contained in:
Michael Vogt 2025-08-07 09:43:22 +02:00 • committed by Gianluca Zuccarelli
parent 6169260dcd
commit 5fb17b967e
5 changed files with 82 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

29
internal/blueprintload/blueprintload.go
View file

@ -9,18 +9,14 @@ import (
"github.com/BurntSushi/toml"
// XXX: there should only be one importable blueprint, i.e.
// importing the external and passing it to images, if
// images needs its own it should not be public
externalBlueprint "github.com/osbuild/blueprint/pkg/blueprint"
imagesBlueprint "github.com/osbuild/images/pkg/blueprint"
"github.com/osbuild/blueprint/pkg/blueprint"
)
// XXX: move this helper into images, share with bib
func decodeToml(r io.Reader, what string) (*externalBlueprint.Blueprint, error) {
func decodeToml(r io.Reader, what string) (*blueprint.Blueprint, error) {
dec := toml.NewDecoder(r)
var conf externalBlueprint.Blueprint
var conf blueprint.Blueprint
metadata, err := dec.Decode(&conf)
if err != nil {
return nil, fmt.Errorf("cannot decode %q: %w", what, err)
@ -32,11 +28,11 @@ func decodeToml(r io.Reader, what string) (*externalBlueprint.Blueprint, error)
return &conf, nil
}
func decodeJson(r io.Reader, what string) (*externalBlueprint.Blueprint, error) {
func decodeJson(r io.Reader, what string) (*blueprint.Blueprint, error) {
dec := json.NewDecoder(r)
dec.DisallowUnknownFields()
var conf externalBlueprint.Blueprint
var conf blueprint.Blueprint
if err := dec.Decode(&conf); err != nil {
return nil, fmt.Errorf("cannot decode %q: %w", what, err)
}
@ -46,13 +42,13 @@ func decodeJson(r io.Reader, what string) (*externalBlueprint.Blueprint, error)
return &conf, nil
}
func load(path string) (*externalBlueprint.Blueprint, error) {
func Load(path string) (*blueprint.Blueprint, error) {
var fp io.ReadCloser
var err error
switch path {
case "":
return &externalBlueprint.Blueprint{}, nil
return &blueprint.Blueprint{}, nil
case "-":
fp = os.Stdin
default:
@ -72,14 +68,3 @@ func load(path string) (*externalBlueprint.Blueprint, error) {
return nil, fmt.Errorf("unsupported file extension for %q (please use .toml or .json)", path)
}
}
func Load(path string) (*imagesBlueprint.Blueprint, error) {
externalBp, err := load(path)
if err != nil {
return nil, err
}
// XXX: make convert a method on "Blueprint"
// XXX2: make Convert() take a pointer
imagesBp := externalBlueprint.Convert(*externalBp)
return &imagesBp, nil
}

2
internal/blueprintload/blueprintload_test.go
View file

@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/osbuild/images/pkg/blueprint"
"github.com/osbuild/blueprint/pkg/blueprint"
"github.com/osbuild/image-builder-cli/internal/blueprintload"
)