93fd5e3821
Ensure that `UnmarshalTargetResultOptions()` is called only when there are any options to unmarshal in the JSON object. Since results of some Targets don't have any options defined, mark `TargetResult.Options` as optional in the JSON tag.
76 lines
2 KiB
Go
76 lines
2 KiB
Go
package target
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"github.com/osbuild/osbuild-composer/internal/worker/clienterrors"
|
|
)
|
|
|
|
type TargetResult struct {
|
|
Name TargetName `json:"name"`
|
|
Options TargetResultOptions `json:"options,omitempty"`
|
|
TargetError *clienterrors.Error `json:"target_error,omitempty"`
|
|
}
|
|
|
|
func newTargetResult(name TargetName, options TargetResultOptions) *TargetResult {
|
|
return &TargetResult{
|
|
Name: name,
|
|
Options: options,
|
|
}
|
|
}
|
|
|
|
type TargetResultOptions interface {
|
|
isTargetResultOptions()
|
|
}
|
|
|
|
type rawTargetResult struct {
|
|
Name TargetName `json:"name"`
|
|
Options json.RawMessage `json:"options,omitempty"`
|
|
TargetError *clienterrors.Error `json:"target_error,omitempty"`
|
|
}
|
|
|
|
func (targetResult *TargetResult) UnmarshalJSON(data []byte) error {
|
|
var rawTR rawTargetResult
|
|
err := json.Unmarshal(data, &rawTR)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
var options TargetResultOptions
|
|
// No options may be set if there was a target error.
|
|
// In addition, some targets don't set any options.
|
|
if len(rawTR.Options) > 0 {
|
|
options, err = UnmarshalTargetResultOptions(rawTR.Name, rawTR.Options)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
targetResult.Name = rawTR.Name
|
|
targetResult.Options = options
|
|
targetResult.TargetError = rawTR.TargetError
|
|
return nil
|
|
}
|
|
|
|
func UnmarshalTargetResultOptions(trName TargetName, rawOptions json.RawMessage) (TargetResultOptions, error) {
|
|
var options TargetResultOptions
|
|
switch trName {
|
|
case TargetNameAWS:
|
|
options = new(AWSTargetResultOptions)
|
|
case TargetNameAWSS3:
|
|
options = new(AWSS3TargetResultOptions)
|
|
case TargetNameGCP:
|
|
options = new(GCPTargetResultOptions)
|
|
case TargetNameAzureImage:
|
|
options = new(AzureImageTargetResultOptions)
|
|
case TargetNameKoji:
|
|
options = new(KojiTargetResultOptions)
|
|
case TargetNameOCI:
|
|
options = new(OCITargetResultOptions)
|
|
default:
|
|
return nil, fmt.Errorf("unexpected target result name: %s", trName)
|
|
}
|
|
err := json.Unmarshal(rawOptions, options)
|
|
|
|
return options, err
|
|
}
|