Merge pull request #36 from bgilbert/gcp

stream: add release field to `GcpImage`
coreos · Nov 2, 2021 · 226b48f · 226b48f
2 parents 2c28950 + 82e3b5e
commit 226b48f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/release/release.go b/release/release.go
@@ -113,7 +113,7 @@ type CloudImage struct {
 
 // GcpImage represents a GCP cloud image
 type GcpImage struct {
-	Project string `json:"project,omitempty"`
+	Project string `json:"project"`
 	Family  string `json:"family,omitempty"`
-	Name    string `json:"name,omitempty"`
+	Name    string `json:"name"`
 }
diff --git a/release/translate.go b/release/translate.go
@@ -124,6 +124,7 @@ func (releaseArch *Arch) toStreamArch(rel *Release) stream.Arch {
 
 		if releaseArch.Media.Gcp.Image != nil {
 			cloudImages.Gcp = &stream.GcpImage{
+				Release: rel.Release,
 				Name:    releaseArch.Media.Gcp.Image.Name,
 				Family:  releaseArch.Media.Gcp.Image.Family,
 				Project: releaseArch.Media.Gcp.Image.Project,

diff --git a/stream/stream.go b/stream/stream.go
@@ -76,7 +76,8 @@ type AwsRegionImage = RegionImage
 
 // GcpImage represents a GCP cloud image
 type GcpImage struct {
-	Project string `json:"project,omitempty"`
+	Release string `json:"release"`
+	Project string `json:"project"`
 	Family  string `json:"family,omitempty"`
-	Name    string `json:"name,omitempty"`
+	Name    string `json:"name"`
 }