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

Target/koji: mark optional fields in BuildOutput as omitempty

Browse source 
Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2023-08-25 13:53:16 +02:00 • committed by Tomáš Hozza
parent a610bc3843
commit 27f98ec313
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/osbuild-koji/main.go
View file

@ -98,7 +98,7 @@ func main() {
Checksum: hash,
Type: koji.BuildOutputTypeImage,
RPMs: []rpmmd.RPM{},
Extra: koji.BuildOutputExtra{
Extra: &koji.BuildOutputExtra{
Image: koji.ImageExtraInfo{
Arch: arch,
BootMode: distro.BOOT_NONE.String(), // TODO: put the correct boot mode here

2
cmd/osbuild-worker/jobimpl-koji-finalize.go
View file

@ -198,7 +198,7 @@ func (impl *KojiFinalizeJobImpl) Run(job worker.Job) error {
Checksum: kojiTargetOptions.ImageMD5,
Type: koji.BuildOutputTypeImage,
RPMs: imageRPMs,
Extra: koji.BuildOutputExtra{
Extra: &koji.BuildOutputExtra{
Image: imgOutputExtraInfo,
},
})

18
internal/upload/koji/koji.go
View file

@ -143,15 +143,15 @@ const (
// The output can be a file of various types, which is imported to Koji.
// Examples of types are "image", "log" or other.
type BuildOutput struct {
BuildRootID uint64 `json:"buildroot_id"`
Filename string `json:"filename"`
FileSize uint64 `json:"filesize"`
Arch string `json:"arch"` // can be 'noarch' or a specific arch
ChecksumType ChecksumType `json:"checksum_type"`
Checksum string `json:"checksum"`
Type BuildOutputType `json:"type"`
RPMs []rpmmd.RPM `json:"components"` // TODO: should be omitempty
Extra BuildOutputExtra `json:"extra"` // TODO: should be omitempty
BuildRootID uint64 `json:"buildroot_id"`
Filename string `json:"filename"`
FileSize uint64 `json:"filesize"`
Arch string `json:"arch"` // can be 'noarch' or a specific arch
ChecksumType ChecksumType `json:"checksum_type"`
Checksum string `json:"checksum"`
Type BuildOutputType `json:"type"`
RPMs []rpmmd.RPM `json:"components,omitempty"`
Extra *BuildOutputExtra `json:"extra,omitempty"`
}
// CONTENT GENERATOR METADATA