Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: coreos/coreos-assembler
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c61bd5617912ae77495fc546d697a3eb16844908
Choose a base ref
..
head repository: coreos/coreos-assembler
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 117ba698ad212d242950f04787da4181ae2fa1ea
Choose a head ref
Showing with 78 additions and 12 deletions.
  1. +14 −8 pkg/builds/cosa_v1.go
  2. +32 −2 pkg/builds/schema_doc.go
  3. +1 −1 src/cmd-coreos-prune
  4. +31 −1 src/v1.json
22 changes: 14 additions & 8 deletions pkg/builds/cosa_v1.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package builds

// generated by 'make schema'
// source hash: 82df4d1caf00be123131e204e58b5a17bb6d0cb2f88538027a86d724fbc02ea8
// source hash: 1711aa3ce997c644130139e1318d2683e2a5f11538e2b0528771a8658d62ee64

type AdvisoryDiff []AdvisoryDiffItems

@@ -150,12 +150,14 @@ type Git struct {
}

type Image struct {
Comment string `json:"comment,omitempty"`
Digest string `json:"digest,omitempty"`
Image string `json:"image"`
Tags []Tag `json:"tags,omitempty"`
Comment string `json:"comment,omitempty"`
Digest string `json:"digest,omitempty"`
Image string `json:"image"`
Tags []ImageTag `json:"tags,omitempty"`
}

type ImageTag string

type Koji struct {
BuildRelease string `json:"release,omitempty"`
KojiBuildID float64 `json:"build_id,omitempty"`
@@ -167,13 +169,17 @@ type PackageSetDifferences []PackageSetDifferencesItems
type PackageSetDifferencesItems interface{}

type PrimaryImage struct {
AdditionalImages []interface{} `json:"additional-images,omitempty"`
AdditionalImages []interface{} `json:"additional-images,omitempty"`
Comment string `json:"comment,omitempty"`
Digest string `json:"digest,omitempty"`
Image string `json:"image"`
Tags []PrimaryImageTag `json:"tags,omitempty"`
}

type PrimaryImageTag string

type S3 struct {
Bucket string `json:"bucket,omitempty"`
Key string `json:"key,omitempty"`
PublicURL string `json:"public-url,omitempty"`
}

type Tag string
34 changes: 32 additions & 2 deletions pkg/builds/schema_doc.go
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Generated by ./generate-schema.sh
// Source hash: 82df4d1caf00be123131e204e58b5a17bb6d0cb2f88538027a86d724fbc02ea8
// Source hash: 1711aa3ce997c644130139e1318d2683e2a5f11538e2b0528771a8658d62ee64
// DO NOT EDIT

package builds
@@ -93,11 +93,41 @@ var generatedSchemaJSON = `{
},
"primary-image": {
"type": "object",
"extends": "#/image",
"required": [
"image"
],
"optional": [
"digest",
"tags",
"comment",
"additional-images"
],
"properties": {
"digest": {
"$id": "#/image/digest",
"type": "string",
"title": "Digest"
},
"comment": {
"$id": "#/image/comment",
"type": "string",
"title": "Comment"
},
"image": {
"$id": "#/image/image",
"type": "string",
"title": "Image"
},
"tags": {
"$id": "#/image/tags",
"type": "array",
"title": "Tags",
"items": {
"$id": "#/image/tags/item",
"title": "Tag",
"type": "string"
}
},
"additional-images": {
"$id": "#/image",
"type": "array",
2 changes: 1 addition & 1 deletion src/cmd-coreos-prune
View file
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ Build = collections.namedtuple("Build", ["id", "images", "arch", "meta_json"])
# set metadata caching to 5m
CACHE_MAX_AGE_METADATA = 60 * 5
# These lists are up to date as of schema hash
# 82df4d1caf00be123131e204e58b5a17bb6d0cb2f88538027a86d724fbc02ea8. If changing
# 1711aa3ce997c644130139e1318d2683e2a5f11538e2b0528771a8658d62ee64. If changing
# this hash, ensure that the list of SUPPORTED and UNSUPPORTED artifacts below
# is up to date.
SUPPORTED = ["amis", "gcp"]
32 changes: 31 additions & 1 deletion src/v1.json
View file
Original file line number Diff line number Diff line change
@@ -87,11 +87,41 @@
},
"primary-image": {
"type": "object",
"extends": "#/image",
"required": [
"image"
],
"optional": [
"digest",
"tags",
"comment",
"additional-images"
],
"properties": {
"digest": {
"$id": "#/image/digest",
"type": "string",
"title": "Digest"
},
"comment": {
"$id": "#/image/comment",
"type": "string",
"title": "Comment"
},
"image": {
"$id": "#/image/image",
"type": "string",
"title": "Image"
},
"tags": {
"$id": "#/image/tags",
"type": "array",
"title": "Tags",
"items": {
"$id": "#/image/tags/item",
"title": "Tag",
"type": "string"
}
},
"additional-images": {
"$id": "#/image",
"type": "array",