@@ -11,7 +11,10 @@ import (
1111 "github.com/BurntSushi/toml"
1212 "github.com/sirupsen/logrus"
1313
14- "github.com/osbuild/images/pkg/blueprint"
14+ // XXX: eventually there will be only be one importable blueprint, i.e.
15+ // see https://github.com/osbuild/blueprint/issues/3
16+ externalBlueprint "github.com/osbuild/blueprint/pkg/blueprint"
17+ imagesBlueprint "github.com/osbuild/images/pkg/blueprint"
1518)
1619
1720// legacyBuildConfig is the json based configuration that was used in
@@ -22,12 +25,12 @@ type legacyBuildConfig struct {
2225 Blueprint * json.RawMessage `json:"blueprint"`
2326}
2427
25- type BuildConfig blueprint .Blueprint
28+ type BuildConfig imagesBlueprint .Blueprint
2629
2730// configRootDir is only overriden in tests
2831var configRootDir = "/"
2932
30- func decodeJsonBuildConfig (r io.Reader , what string ) (* BuildConfig , error ) {
33+ func decodeJsonBuildConfig (r io.Reader , what string ) (* externalBlueprint. Blueprint , error ) {
3134 content , err := io .ReadAll (r )
3235 if err != nil && err != io .EOF {
3336 return nil , fmt .Errorf ("cannot read %q: %w" , what , err )
@@ -45,7 +48,7 @@ func decodeJsonBuildConfig(r io.Reader, what string) (*BuildConfig, error) {
4548 dec := json .NewDecoder (bytes .NewBuffer (content ))
4649 dec .DisallowUnknownFields ()
4750
48- var conf BuildConfig
51+ var conf externalBlueprint. Blueprint
4952 if err := dec .Decode (& conf ); err != nil {
5053 return nil , fmt .Errorf ("cannot decode %q: %w" , what , err )
5154 }
@@ -55,10 +58,10 @@ func decodeJsonBuildConfig(r io.Reader, what string) (*BuildConfig, error) {
5558 return & conf , nil
5659}
5760
58- func decodeTomlBuildConfig (r io.Reader , what string ) (* BuildConfig , error ) {
61+ func decodeTomlBuildConfig (r io.Reader , what string ) (* externalBlueprint. Blueprint , error ) {
5962 dec := toml .NewDecoder (r )
6063
61- var conf BuildConfig
64+ var conf externalBlueprint. Blueprint
6265 _ , err := dec .Decode (& conf )
6366 if err != nil {
6467 return nil , fmt .Errorf ("cannot decode %q: %w" , what , err )
@@ -69,7 +72,7 @@ func decodeTomlBuildConfig(r io.Reader, what string) (*BuildConfig, error) {
6972
7073var osStdin = os .Stdin
7174
72- func loadConfig (path string ) (* BuildConfig , error ) {
75+ func loadConfig (path string ) (* externalBlueprint. Blueprint , error ) {
7376 var fp * os.File
7477 var err error
7578
@@ -93,7 +96,7 @@ func loadConfig(path string) (*BuildConfig, error) {
9396 }
9497}
9598
96- func ReadWithFallback (userConfig string ) (* BuildConfig , error ) {
99+ func readWithFallback (userConfig string ) (* externalBlueprint. Blueprint , error ) {
97100 // user asked for an explicit config
98101 if userConfig != "" {
99102 return loadConfig (userConfig )
@@ -111,8 +114,17 @@ func ReadWithFallback(userConfig string) (*BuildConfig, error) {
111114 }
112115 }
113116 if foundConfig == "" {
114- return & BuildConfig {}, nil
117+ return & externalBlueprint. Blueprint {}, nil
115118 }
116119
117120 return loadConfig (foundConfig )
118121}
122+
123+ func ReadWithFallback (userConfig string ) (* BuildConfig , error ) {
124+ externalBp , err := readWithFallback (userConfig )
125+ if err != nil {
126+ return nil , err
127+ }
128+ internalBp := BuildConfig (externalBlueprint .Convert (* externalBp ))
129+ return & internalBp , nil
130+ }
0 commit comments