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

Include osbuild-composer version in Manifest job result

Browse source 
Extend the Manifest job result structure to hold information about
osbuild-composer version, which produced the manifest. This will be
useful for other job types which depend on it and can then push this
information further as needed.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2023-09-21 15:10:36 +02:00 • committed by Tomáš Hozza
parent e63472ef44
commit 8866391d88
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/cloudapi/v2/server.go
View file

@ -414,6 +414,9 @@ func serializeManifest(ctx context.Context, manifestSource *manifest.Manifest, w
jobResult := &worker.ManifestJobByIDResult{
Manifest: nil,
ManifestInfo: worker.ManifestInfo{
OSBuildComposerVersion: common.BuildVersion(),
},
}
defer func() {

11
internal/worker/json.go
View file

@ -265,9 +265,16 @@ type DepsolveJobResult struct {
type ManifestJobByID struct{}
// ManifestInfo contains information about the environment in which
// the manifest was produced and which could affect its content.
type ManifestInfo struct {
OSBuildComposerVersion string `json:"osbuild_composer_version"`
}
type ManifestJobByIDResult struct {
Manifest manifest.OSBuildManifest `json:"data,omitempty"`
Error string `json:"error"`
Manifest manifest.OSBuildManifest `json:"data,omitempty"`
ManifestInfo ManifestInfo `json:"info,omitempty"`
Error string `json:"error"`
JobResult
}