File tree Expand file tree Collapse file tree 4 files changed +5
-26
lines changed
Expand file tree Collapse file tree 4 files changed +5
-26
lines changed Original file line number Diff line number Diff line change @@ -254,10 +254,6 @@ func GetCommandBuildableArtifacts() []string {
254254func (build * Build ) artifacts () map [string ]* Artifact {
255255 ret := make (map [string ]* Artifact )
256256
257- // Special case Extensions
258- // technically extentions are an artifact, albeit the meta-data located
259- // as a top level entry.
260- ret ["extensions" ] = build .Extensions .toArtifact ()
261257
262258 var ba BuildArtifacts = * build .BuildArtifacts
263259 rv := reflect .TypeOf (ba )
@@ -307,17 +303,6 @@ func IsMetaJSON(path string) bool {
307303 return reMetaJSON .Match ([]byte (b ))
308304}
309305
310- // toArtifact converts an Extension to an Artifact
311- func (e * Extensions ) toArtifact () * Artifact {
312- if e == nil {
313- return new (Artifact )
314- }
315- return & Artifact {
316- Path : e .Path ,
317- Sha256 : e .Sha256 ,
318- }
319- }
320-
321306func FetchAndParseBuild (url string ) (* Build , error ) {
322307 res , err := http .Get (url )
323308 if err != nil {
Original file line number Diff line number Diff line change 11package builds
22
33// generated by 'make schema'
4- // source hash: 4bb2fd8591ae1cc9179181b9efcb550542137a01c9544fd048e66794e0fb176a
4+ // source hash: df5e6afe6c1ac8eeb378d216bc14251fb95803185458408adc37c8f2dfd23316
55
66type AdvisoryDiff []AdvisoryDiffItems
77
@@ -129,9 +129,9 @@ type Cloudartifact struct {
129129
130130type Extensions struct {
131131 Manifest map [string ]interface {} `json:"manifest"`
132- Path string `json:"path"`
133- RpmOstreeState string `json:"rpm-ostree-state"`
134- Sha256 string `json:"sha256"`
132+ Path string `json:"path,omitempty "`
133+ RpmOstreeState string `json:"rpm-ostree-state,omitempty "`
134+ Sha256 string `json:"sha256,omitempty "`
135135}
136136
137137type Gcp struct {
Original file line number Diff line number Diff line change 11// Generated by ./generate-schema.sh
2- // Source hash: 4bb2fd8591ae1cc9179181b9efcb550542137a01c9544fd048e66794e0fb176a
2+ // Source hash: df5e6afe6c1ac8eeb378d216bc14251fb95803185458408adc37c8f2dfd23316
33// DO NOT EDIT
44
55package builds
@@ -708,9 +708,6 @@ var generatedSchemaJSON = `{
708708 "type": "object",
709709 "title": "Extensions",
710710 "required": [
711- "path",
712- "sha256",
713- "rpm-ostree-state",
714711 "manifest"
715712 ],
716713 "properties": {
Original file line number Diff line number Diff line change 702702 "type" : " object" ,
703703 "title" : " Extensions" ,
704704 "required" : [
705- " path" ,
706- " sha256" ,
707- " rpm-ostree-state" ,
708705 " manifest"
709706 ],
710707 "properties" : {
You can’t perform that action at this time.
0 commit comments