Skip to content

Commit 4c2afc4

Browse files
jbtrystramjlebon
authored andcommitted
schema: update generated code with make schema
In fb222e2 we introduced additionnal images in the schema, update the generated go code to match.
1 parent 9162935 commit 4c2afc4

File tree

2 files changed

+70
-16
lines changed

2 files changed

+70
-16
lines changed

pkg/builds/cosa_v1.go

+21-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package builds
22

33
// generated by 'make schema'
4-
// source hash: 58da31f35c1405d5a752a297d0ee012f577720f810113d38cdabca102ec7edd8
4+
// source hash: 1711aa3ce997c644130139e1318d2683e2a5f11538e2b0528771a8658d62ee64
55

66
type AdvisoryDiff []AdvisoryDiffItems
77

@@ -34,7 +34,7 @@ type Build struct {
3434
Amis []Amis `json:"amis,omitempty"`
3535
Architecture string `json:"coreos-assembler.basearch,omitempty"`
3636
Azure *Cloudartifact `json:"azure,omitempty"`
37-
BaseOsContainer *Image `json:"base-oscontainer,omitempty"`
37+
BaseOsContainer *PrimaryImage `json:"base-oscontainer,omitempty"`
3838
BuildArtifacts *BuildArtifacts `json:"images,omitempty"`
3939
BuildID string `json:"buildid"`
4040
BuildRef string `json:"ref,omitempty"`
@@ -50,7 +50,7 @@ type Build struct {
5050
CosaImageChecksum string `json:"coreos-assembler.image-config-checksum,omitempty"`
5151
CosaImageVersion int `json:"coreos-assembler.image-genver,omitempty"`
5252
Extensions *Extensions `json:"extensions,omitempty"`
53-
ExtensionsContainer *Image `json:"extensions-container,omitempty"`
53+
ExtensionsContainer *PrimaryImage `json:"extensions-container,omitempty"`
5454
FedoraCoreOsParentCommit string `json:"fedora-coreos.parent-commit,omitempty"`
5555
FedoraCoreOsParentVersion string `json:"fedora-coreos.parent-version,omitempty"`
5656
Gcp *Gcp `json:"gcp,omitempty"`
@@ -59,10 +59,10 @@ type Build struct {
5959
ImageInputChecksum string `json:"coreos-assembler.image-input-checksum,omitempty"`
6060
InputHashOfTheRpmOstree string `json:"rpm-ostree-inputhash"`
6161
Koji *Koji `json:"koji,omitempty"`
62-
KubevirtContainer *Image `json:"kubevirt,omitempty"`
62+
KubevirtContainer *PrimaryImage `json:"kubevirt,omitempty"`
6363
MetaStamp float64 `json:"coreos-assembler.meta-stamp,omitempty"`
6464
Name string `json:"name"`
65-
Oscontainer *Image `json:"oscontainer,omitempty"`
65+
Oscontainer *PrimaryImage `json:"oscontainer,omitempty"`
6666
OstreeCommit string `json:"ostree-commit"`
6767
OstreeContentBytesWritten int `json:"ostree-content-bytes-written,omitempty"`
6868
OstreeContentChecksum string `json:"ostree-content-checksum"`
@@ -150,12 +150,14 @@ type Git struct {
150150
}
151151

152152
type Image struct {
153-
Comment string `json:"comment,omitempty"`
154-
Digest string `json:"digest,omitempty"`
155-
Image string `json:"image"`
156-
Tags []Tag `json:"tags,omitempty"`
153+
Comment string `json:"comment,omitempty"`
154+
Digest string `json:"digest,omitempty"`
155+
Image string `json:"image"`
156+
Tags []ImageTag `json:"tags,omitempty"`
157157
}
158158

159+
type ImageTag string
160+
159161
type Koji struct {
160162
BuildRelease string `json:"release,omitempty"`
161163
KojiBuildID float64 `json:"build_id,omitempty"`
@@ -166,10 +168,18 @@ type PackageSetDifferences []PackageSetDifferencesItems
166168

167169
type PackageSetDifferencesItems interface{}
168170

171+
type PrimaryImage struct {
172+
AdditionalImages []interface{} `json:"additional-images,omitempty"`
173+
Comment string `json:"comment,omitempty"`
174+
Digest string `json:"digest,omitempty"`
175+
Image string `json:"image"`
176+
Tags []PrimaryImageTag `json:"tags,omitempty"`
177+
}
178+
179+
type PrimaryImageTag string
180+
169181
type S3 struct {
170182
Bucket string `json:"bucket,omitempty"`
171183
Key string `json:"key,omitempty"`
172184
PublicURL string `json:"public-url,omitempty"`
173185
}
174-
175-
type Tag string

pkg/builds/schema_doc.go

+49-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Generated by ./generate-schema.sh
2-
// Source hash: 58da31f35c1405d5a752a297d0ee012f577720f810113d38cdabca102ec7edd8
2+
// Source hash: 1711aa3ce997c644130139e1318d2683e2a5f11538e2b0528771a8658d62ee64
33
// DO NOT EDIT
44

55
package builds
@@ -91,6 +91,50 @@ var generatedSchemaJSON = `{
9191
}
9292
}
9393
},
94+
"primary-image": {
95+
"type": "object",
96+
"required": [
97+
"image"
98+
],
99+
"optional": [
100+
"digest",
101+
"tags",
102+
"comment",
103+
"additional-images"
104+
],
105+
"properties": {
106+
"digest": {
107+
"$id": "#/image/digest",
108+
"type": "string",
109+
"title": "Digest"
110+
},
111+
"comment": {
112+
"$id": "#/image/comment",
113+
"type": "string",
114+
"title": "Comment"
115+
},
116+
"image": {
117+
"$id": "#/image/image",
118+
"type": "string",
119+
"title": "Image"
120+
},
121+
"tags": {
122+
"$id": "#/image/tags",
123+
"type": "array",
124+
"title": "Tags",
125+
"items": {
126+
"$id": "#/image/tags/item",
127+
"title": "Tag",
128+
"type": "string"
129+
}
130+
},
131+
"additional-images": {
132+
"$id": "#/image",
133+
"type": "array",
134+
"title": "Additional images"
135+
}
136+
}
137+
},
94138
"cloudartifact": {
95139
"type": "object",
96140
"required": [
@@ -708,7 +752,7 @@ var generatedSchemaJSON = `{
708752
"$id": "#/properties/oscontainer",
709753
"type": "object",
710754
"title": "Oscontainer",
711-
"$ref": "#/definitions/image"
755+
"$ref": "#/definitions/primary-image"
712756
},
713757
"extensions": {
714758
"$id": "#/properties/extensions",
@@ -927,13 +971,13 @@ var generatedSchemaJSON = `{
927971
"$id": "#/properties/base-oscontainer",
928972
"type": "object",
929973
"title": "Base OS container",
930-
"$ref": "#/definitions/image"
974+
"$ref": "#/definitions/primary-image"
931975
},
932976
"extensions-container": {
933977
"$id": "#/properties/extensions-container",
934978
"type": "object",
935979
"title": "Extensions container",
936-
"$ref": "#/definitions/image"
980+
"$ref": "#/definitions/primary-image"
937981
},
938982
"gcp": {
939983
"$id": "#/properties/gcp",
@@ -974,7 +1018,7 @@ var generatedSchemaJSON = `{
9741018
"$id": "#/properties/kubevirt",
9751019
"type": "object",
9761020
"title": "Kubevirt container",
977-
"$ref": "#/definitions/image"
1021+
"$ref": "#/definitions/primary-image"
9781022
},
9791023
"ibmcloud": {
9801024
"$id": "#/properties/ibmcloud",

0 commit comments

Comments
 (0)