Remove all the internal package that are now in the github.com/osbuild/images package and vendor it. A new function in internal/blueprint/ converts from an osbuild-composer blueprint to an images blueprint. This is necessary for keeping the blueprint implementation in both packages. In the future, the images package will change the blueprint (and most likely rename it) and it will only be part of the osbuild-composer internals and interface. The Convert() function will be responsible for converting the blueprint into the new configuration object.
71 lines
1.5 KiB
Go
71 lines
1.5 KiB
Go
package common
|
|
|
|
import (
|
|
"encoding/json"
|
|
)
|
|
|
|
func getStateMapping() []string {
|
|
return []string{"WAITING", "RUNNING", "FINISHED", "FAILED"}
|
|
}
|
|
|
|
type ImageBuildState int
|
|
|
|
const (
|
|
IBWaiting ImageBuildState = iota
|
|
IBRunning
|
|
IBFinished
|
|
IBFailed
|
|
)
|
|
|
|
// CustomJsonConversionError is thrown when parsing strings into enumerations
|
|
type CustomJsonConversionError struct {
|
|
reason string
|
|
}
|
|
|
|
// Error returns the error as a string
|
|
func (err *CustomJsonConversionError) Error() string {
|
|
return err.reason
|
|
}
|
|
|
|
// CustomTypeError is thrown when parsing strings into enumerations
|
|
type CustomTypeError struct {
|
|
reason string
|
|
}
|
|
|
|
// Error returns the error as a string
|
|
func (err *CustomTypeError) Error() string {
|
|
return err.reason
|
|
}
|
|
|
|
// ToString converts ImageBuildState into a human readable string
|
|
func (ibs ImageBuildState) ToString() string {
|
|
return getStateMapping()[int(ibs)]
|
|
}
|
|
|
|
func unmarshalStateHelper(data []byte, mapping []string) (int, error) {
|
|
var stringInput string
|
|
err := json.Unmarshal(data, &stringInput)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
for n, str := range mapping {
|
|
if str == stringInput {
|
|
return n, nil
|
|
}
|
|
}
|
|
return 0, &CustomJsonConversionError{"invalid image build status:" + stringInput}
|
|
}
|
|
|
|
// UnmarshalJSON converts a JSON string into an ImageBuildState
|
|
func (ibs *ImageBuildState) UnmarshalJSON(data []byte) error {
|
|
val, err := unmarshalStateHelper(data, getStateMapping())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
*ibs = ImageBuildState(val)
|
|
return nil
|
|
}
|
|
|
|
func (ibs ImageBuildState) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(getStateMapping()[ibs])
|
|
}
|