40abb32dec
Completely remove the use of `local` target from all code, which is not required to keep backward compatibility. The target has not been used in composer for some time already, but some unit tests still used its data structures. Mark the target as deprecated and adjust all unit tests that depended on it. The backward compatibility is kept mostly to enable long running osbuild-composer instances, which were upgraded to still read old jobs from the store. While a target with the same intention will be reintroduced, the current `local` target data structures contain many fields which would not be relevant for the new target. In addition, while the "local" target will be ever used only by Weldr API, the name would be a bit misleading. Although the worker usually runs on the same system when using Weldr API, there is no hard requirement enforcing this setup. In reality, the worker will be uploading the image back to the worker server, so there is room for a better name.
97 lines
2.6 KiB
Go
97 lines
2.6 KiB
Go
package target
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/google/uuid"
|
|
"github.com/osbuild/osbuild-composer/internal/common"
|
|
)
|
|
|
|
type TargetName string
|
|
|
|
type Target struct {
|
|
Uuid uuid.UUID `json:"uuid"`
|
|
ImageName string `json:"image_name"` // Desired name of the image in the target environment
|
|
Name TargetName `json:"name"` // Name of the specific target type
|
|
Created time.Time `json:"created"`
|
|
Status common.ImageBuildState `json:"status"`
|
|
Options TargetOptions `json:"options"` // Target type specific options
|
|
}
|
|
|
|
func newTarget(name TargetName, options TargetOptions) *Target {
|
|
return &Target{
|
|
Uuid: uuid.New(),
|
|
Name: name,
|
|
Created: time.Now(),
|
|
Status: common.IBWaiting,
|
|
Options: options,
|
|
}
|
|
}
|
|
|
|
type TargetOptions interface {
|
|
isTargetOptions()
|
|
}
|
|
|
|
type rawTarget struct {
|
|
Uuid uuid.UUID `json:"uuid"`
|
|
ImageName string `json:"image_name"`
|
|
Name TargetName `json:"name"`
|
|
Created time.Time `json:"created"`
|
|
Status common.ImageBuildState `json:"status"`
|
|
Options json.RawMessage `json:"options"`
|
|
}
|
|
|
|
func (target *Target) UnmarshalJSON(data []byte) error {
|
|
var rawTarget rawTarget
|
|
err := json.Unmarshal(data, &rawTarget)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
options, err := UnmarshalTargetOptions(rawTarget.Name, rawTarget.Options)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
target.Uuid = rawTarget.Uuid
|
|
target.ImageName = rawTarget.ImageName
|
|
target.Name = rawTarget.Name
|
|
target.Created = rawTarget.Created
|
|
target.Status = rawTarget.Status
|
|
target.Options = options
|
|
|
|
return nil
|
|
}
|
|
|
|
func UnmarshalTargetOptions(targetName TargetName, rawOptions json.RawMessage) (TargetOptions, error) {
|
|
var options TargetOptions
|
|
switch targetName {
|
|
case TargetNameAzure:
|
|
options = new(AzureTargetOptions)
|
|
case TargetNameAWS:
|
|
options = new(AWSTargetOptions)
|
|
case TargetNameAWSS3:
|
|
options = new(AWSS3TargetOptions)
|
|
case TargetNameGCP:
|
|
options = new(GCPTargetOptions)
|
|
case TargetNameAzureImage:
|
|
options = new(AzureImageTargetOptions)
|
|
// Kept for backward compatibility
|
|
case TargetNameLocal:
|
|
options = new(LocalTargetOptions)
|
|
case TargetNameKoji:
|
|
options = new(KojiTargetOptions)
|
|
case TargetNameVMWare:
|
|
options = new(VMWareTargetOptions)
|
|
case TargetNameOCI:
|
|
options = new(OCITargetOptions)
|
|
case TargetNameContainer:
|
|
options = new(ContainerTargetOptions)
|
|
default:
|
|
return nil, fmt.Errorf("unexpected target name: %s", targetName)
|
|
}
|
|
err := json.Unmarshal(rawOptions, options)
|
|
|
|
return options, err
|
|
}
|