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

target: use the new types from common package

Browse source
This commit is contained in:
Martin Sehnoutka 2020-02-10 09:46:27 +01:00 • committed by Ondřej Budai
parent ab6b6da76c
commit 83afb1f821
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
internal/target/target.go
View file

@ -4,16 +4,17 @@ import (
"encoding/json"
"errors"
"github.com/google/uuid"
"github.com/osbuild/osbuild-composer/internal/common"
"time"
)
type Target struct {
Uuid uuid.UUID `json:"uuid"`
ImageName string `json:"image_name"`
Name string `json:"name"`
Created time.Time `json:"created"`
Status string `json:"status"`
Options TargetOptions `json:"options"`
Uuid uuid.UUID `json:"uuid"`
ImageName string `json:"image_name"`
Name string `json:"name"`
Created time.Time `json:"created"`
Status common.ImageBuildState `json:"status"`
Options TargetOptions `json:"options"`
}
func newTarget(name string, options TargetOptions) *Target {
@ -21,7 +22,7 @@ func newTarget(name string, options TargetOptions) *Target {
Uuid: uuid.New(),
Name: name,
Created: time.Now(),
Status: "WAITING",
Status: common.IBWaiting,
Options: options,
}
}
@ -31,12 +32,12 @@ type TargetOptions interface {
}
type rawTarget struct {
Uuid uuid.UUID `json:"uuid"`
ImageName string `json:"image_name"`
Name string `json:"name"`
Created time.Time `json:"created"`
Status string `json:"status"`
Options json.RawMessage `json:"options"`
Uuid uuid.UUID `json:"uuid"`
ImageName string `json:"image_name"`
Name string `json:"name"`
Created time.Time `json:"created"`
Status common.ImageBuildState `json:"status"`
Options json.RawMessage `json:"options"`
}
func (target *Target) UnmarshalJSON(data []byte) error {