Skip to content

Commit 257809d

Browse files
jbtrystramjbtrystram
committed
Run make schema
In d20ee10 we introduced additionnal images in the schema, update the generated go code to match. Note that I had to delete entries in `go.sum` as the checksums had changed. Fixes #4043.
1 parent d99eb2f commit 257809d

File tree

9 files changed

+94
-326
lines changed

9 files changed

+94
-326
lines changed

Diff for: ‎go.mod

+11
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,19 @@ require (
2929
github.com/digitalocean/go-qemu v0.0.0-20200529005954-1b453d036a9c
3030
github.com/digitalocean/godo v1.33.0
3131
github.com/frostschutz/go-fibmap v0.0.0-20160825162329-b32c231bfe6a
32+
github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813
3233
github.com/google/uuid v1.6.0
3334
github.com/gophercloud/gophercloud v1.14.1
3435
github.com/gophercloud/utils v0.0.0-20231010081019-80377eca5d56
36+
github.com/idubinskiy/schematyper v0.0.0-20190118213059-f71b40dac30d
3537
github.com/kballard/go-shellquote v0.0.0-20150810074751-d8ec1a69a250
3638
github.com/kylelemons/godebug v1.1.0
3739
github.com/packethost/packngo v0.0.0-20180426081943-80f62d78849d
3840
github.com/pborman/uuid v1.2.0
3941
github.com/pin/tftp v2.1.0+incompatible
4042
github.com/pkg/errors v0.9.1
4143
github.com/sirupsen/logrus v1.9.3
44+
github.com/smartystreets/goconvey v1.8.1
4245
github.com/spf13/cobra v1.5.0
4346
github.com/vincent-petithory/dataurl v1.0.0
4447
github.com/vishvananda/netlink v0.0.0-20150710184826-9cff81214893
@@ -50,6 +53,7 @@ require (
5053
golang.org/x/oauth2 v0.22.0
5154
golang.org/x/term v0.23.0
5255
google.golang.org/api v0.196.0
56+
gopkg.in/alecthomas/kingpin.v2 v2.0.0-00010101000000-000000000000
5357
gopkg.in/yaml.v2 v2.4.0
5458
gopkg.in/yaml.v3 v3.0.1
5559
)
@@ -60,6 +64,7 @@ require (
6064
cloud.google.com/go/compute/metadata v0.5.0 // indirect
6165
github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.1 // indirect
6266
github.com/AzureAD/microsoft-authentication-library-for-go v0.8.1 // indirect
67+
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
6368
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
6469
github.com/clarketm/json v1.17.1 // indirect
6570
github.com/containers/image/v5 v5.28.0 // indirect
@@ -77,21 +82,25 @@ require (
7782
github.com/google/s2a-go v0.1.8 // indirect
7883
github.com/googleapis/enterprise-certificate-proxy v0.3.3 // indirect
7984
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
85+
github.com/gopherjs/gopherjs v1.17.2 // indirect
8086
github.com/hashicorp/go-uuid v1.0.3 // indirect
8187
github.com/inconshreveable/mousetrap v1.0.0 // indirect
8288
github.com/jmespath/go-jmespath v0.4.0 // indirect
8389
github.com/json-iterator/go v1.1.12 // indirect
90+
github.com/jtolds/gls v4.20.0+incompatible // indirect
8491
github.com/mitchellh/go-homedir v1.1.0 // indirect
8592
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8693
github.com/modern-go/reflect2 v1.0.2 // indirect
8794
github.com/opencontainers/go-digest v1.0.0 // indirect
8895
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect
8996
github.com/pmezard/go-difflib v1.0.0 // indirect
9097
github.com/satori/go.uuid v1.2.0 // indirect
98+
github.com/smarty/assertions v1.15.0 // indirect
9199
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
92100
github.com/stretchr/testify v1.9.0 // indirect
93101
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
94102
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
103+
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
95104
go.opencensus.io v0.24.0 // indirect
96105
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
97106
go.opentelemetry.io/otel v1.29.0 // indirect
@@ -106,3 +115,5 @@ require (
106115
google.golang.org/protobuf v1.34.2 // indirect
107116
gopkg.in/ini.v1 v1.66.2 // indirect
108117
)
118+
119+
replace gopkg.in/alecthomas/kingpin.v2 => github.com/alecthomas/kingpin/v2 v2.4.0

Diff for: ‎go.sum

+22-2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ github.com/IBM-Cloud/bluemix-go v0.0.0-20210419045805-b50610722085 h1:/OFh2D1Ped
3131
github.com/IBM-Cloud/bluemix-go v0.0.0-20210419045805-b50610722085/go.mod h1:kqTYO0mts71aa8PVwviaKlCKYud/NbEkFIqU8aHH3/g=
3232
github.com/IBM/ibm-cos-sdk-go v1.6.1 h1:2XG/fsXno8228gBEwxf0u2AFI/Nii3wpk17lkpF0IvA=
3333
github.com/IBM/ibm-cos-sdk-go v1.6.1/go.mod h1:BOqDAOxuJTamCSdAKx2XStknDaeB99nXWaf1PtvW0iY=
34+
github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY=
35+
github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
36+
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
37+
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
3438
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1442 h1:W45RUXYz49qyUhP66Aw9u+IzU1Xg0uts4b7HprWjs14=
3539
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1442/go.mod h1:RcDobYh8k5VP6TNybz9m++gL3ijVI5wueVr0EM10VsU=
3640
github.com/aliyun/aliyun-oss-go-sdk v2.0.3+incompatible h1:724q2AmQ3m1mrdD9kYqK5+1+Zr77vS21jdQ9iF9t4b8=
@@ -48,7 +52,7 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
4852
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
4953
github.com/containers/image/v5 v5.28.0 h1:H4cWbdI88UA/mDb6SxMo3IxpmS1BSs/Kifvhwt9g048=
5054
github.com/containers/image/v5 v5.28.0/go.mod h1:9aPnNkwHNHgGl9VlQxXEshvmOJRbdRAc1rNDD6sP2eU=
51-
github.com/containers/storage v1.50.1 h1:1r5k4N2BNa94WZZFw116tozj08zJg7SxihQZ3iccyCs=
55+
github.com/containers/storage v1.50.1 h1:EuIvHOymFUHOYQ7gJbYkLruVQvw/Ty8a6d1ZyRKRPDM=
5256
github.com/containers/storage v1.50.1/go.mod h1:dpspZsUrcKD8SpTofvKWhwPDHD0MkO4Q7VE+oYdWkiA=
5357
github.com/coreos/butane v0.21.0 h1:GDi6XBheEfvxaq7Ez3wxdN+0IraAz3U7QvpVGcbHd84=
5458
github.com/coreos/butane v0.21.0/go.mod h1:3OKS5qaH58O2yLAKgAtOgBpUQSm7aIOU09IpG+IvmF4=
@@ -94,6 +98,8 @@ github.com/frostschutz/go-fibmap v0.0.0-20160825162329-b32c231bfe6a/go.mod h1:lR
9498
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
9599
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
96100
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
101+
github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813 h1:Uc+IZ7gYqAf/rSGFplbWBSHaGolEQlNLgMgSE3ccnIQ=
102+
github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813/go.mod h1:P+oSoE9yhSRvsmYyZsshflcR6ePWYLql6UU1amW13IM=
97103
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
98104
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
99105
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
@@ -170,7 +176,7 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
170176
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
171177
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
172178
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
173-
github.com/googleapis/enterprise-certificate-proxy v0.3.3 h1:QRje2j5GZimBzlbhGA2V2QlGNgL8G6e+wGo/+/2bWI0=
179+
github.com/googleapis/enterprise-certificate-proxy v0.3.3 h1:G6q7VHBoU74wQHXFsZSLMPl0rFw0ZDrlZ3rt6/aTBII=
174180
github.com/googleapis/enterprise-certificate-proxy v0.3.3/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA=
175181
github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDPT0hH1s=
176182
github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A=
@@ -179,9 +185,13 @@ github.com/gophercloud/gophercloud v1.14.1 h1:DTCNaTVGl8/cFu58O1JwWgis9gtISAFONq
179185
github.com/gophercloud/gophercloud v1.14.1/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
180186
github.com/gophercloud/utils v0.0.0-20231010081019-80377eca5d56 h1:sH7xkTfYzxIEgzq1tDHIMKRh1vThOEOGNsettdEeLbE=
181187
github.com/gophercloud/utils v0.0.0-20231010081019-80377eca5d56/go.mod h1:VSalo4adEk+3sNkmVJLnhHoOyOYYS8sTWLG4mv5BKto=
188+
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
189+
github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
182190
github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
183191
github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
184192
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
193+
github.com/idubinskiy/schematyper v0.0.0-20190118213059-f71b40dac30d h1:sQbbvtUoen3Tfl9G/079tXeqniwPH6TgM/lU4y7lQN8=
194+
github.com/idubinskiy/schematyper v0.0.0-20190118213059-f71b40dac30d/go.mod h1:xVHEhsiSJJnT0jlcQpQUg+GyoLf0i0xciM1kqWTGT58=
185195
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
186196
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
187197
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
@@ -193,6 +203,8 @@ github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqx
193203
github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
194204
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
195205
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
206+
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
207+
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
196208
github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
197209
github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
198210
github.com/kballard/go-shellquote v0.0.0-20150810074751-d8ec1a69a250 h1:QyPDU73WRl/8CnuK3JltZLLuNhL3E4o3BROt4g8nFf0=
@@ -260,6 +272,10 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
260272
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
261273
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
262274
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
275+
github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY=
276+
github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec=
277+
github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY=
278+
github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60=
263279
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
264280
github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU=
265281
github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM=
@@ -273,6 +289,7 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS
273289
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
274290
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
275291
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
292+
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
276293
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
277294
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
278295
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -298,6 +315,8 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
298315
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
299316
github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
300317
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
318+
github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
319+
github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
301320
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
302321
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
303322
go.mongodb.org/mongo-driver v1.4.3/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc=
@@ -455,6 +474,7 @@ gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI=
455474
gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
456475
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
457476
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
477+
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
458478
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
459479
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
460480
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

Diff for: ‎pkg/builds/cosa_v1.go

+9-5
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: 82df4d1caf00be123131e204e58b5a17bb6d0cb2f88538027a86d724fbc02ea8
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"`
@@ -166,6 +166,10 @@ type PackageSetDifferences []PackageSetDifferencesItems
166166

167167
type PackageSetDifferencesItems interface{}
168168

169+
type PrimaryImage struct {
170+
AdditionalImages []interface{} `json:"additional-images,omitempty"`
171+
}
172+
169173
type S3 struct {
170174
Bucket string `json:"bucket,omitempty"`
171175
Key string `json:"key,omitempty"`

Diff for: ‎pkg/builds/schema_doc.go

+19-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: 82df4d1caf00be123131e204e58b5a17bb6d0cb2f88538027a86d724fbc02ea8
33
// DO NOT EDIT
44

55
package builds
@@ -91,6 +91,20 @@ var generatedSchemaJSON = `{
9191
}
9292
}
9393
},
94+
"primary-image": {
95+
"type": "object",
96+
"extends": "#/image",
97+
"optional": [
98+
"additional-images"
99+
],
100+
"properties": {
101+
"additional-images": {
102+
"$id": "#/image",
103+
"type": "array",
104+
"title": "Additional images"
105+
}
106+
}
107+
},
94108
"cloudartifact": {
95109
"type": "object",
96110
"required": [
@@ -708,7 +722,7 @@ var generatedSchemaJSON = `{
708722
"$id": "#/properties/oscontainer",
709723
"type": "object",
710724
"title": "Oscontainer",
711-
"$ref": "#/definitions/image"
725+
"$ref": "#/definitions/primary-image"
712726
},
713727
"extensions": {
714728
"$id": "#/properties/extensions",
@@ -927,13 +941,13 @@ var generatedSchemaJSON = `{
927941
"$id": "#/properties/base-oscontainer",
928942
"type": "object",
929943
"title": "Base OS container",
930-
"$ref": "#/definitions/image"
944+
"$ref": "#/definitions/primary-image"
931945
},
932946
"extensions-container": {
933947
"$id": "#/properties/extensions-container",
934948
"type": "object",
935949
"title": "Extensions container",
936-
"$ref": "#/definitions/image"
950+
"$ref": "#/definitions/primary-image"
937951
},
938952
"gcp": {
939953
"$id": "#/properties/gcp",
@@ -974,7 +988,7 @@ var generatedSchemaJSON = `{
974988
"$id": "#/properties/kubevirt",
975989
"type": "object",
976990
"title": "Kubevirt container",
977-
"$ref": "#/definitions/image"
991+
"$ref": "#/definitions/primary-image"
978992
},
979993
"ibmcloud": {
980994
"$id": "#/properties/ibmcloud",

0 commit comments

Comments
 (0)