[lxc-devel] [lxd/master] simplestreams: Align JSON struct for index.json

[geaaru on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 608 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190317/93db1ae2/attachment.bin>
-------------- next part --------------
From 4bdb892c2182c4d092b87462c52ccc9611a07368 Mon Sep 17 00:00:00 2001
From: Daniele Rondina <geaaru at sabayonlinux.org>
Date: Sun, 17 Mar 2019 22:07:02 +0100
Subject: [PATCH] simplestreams: Align JSON struct for index.json

Signed-off-by: Daniele Rondina <geaaru at sabayonlinux.org>
---
 shared/simplestreams/simplestreams.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/shared/simplestreams/simplestreams.go b/shared/simplestreams/simplestreams.go
index 7969b64930..cc94c968f0 100644
--- a/shared/simplestreams/simplestreams.go
+++ b/shared/simplestreams/simplestreams.go
@@ -75,10 +75,10 @@ var ssDefaultOS = map[string]string{
 }
 
 type SimpleStreamsManifest struct {
-	Updated  string                                  `json:"updated"`
+	Updated  string                                  `json:"updated,omitempty"`
 	DataType string                                  `json:"datatype"`
 	Format   string                                  `json:"format"`
-	License  string                                  `json:"license"`
+	License  string                                  `json:"license,omitempty"`
 	Products map[string]SimpleStreamsManifestProduct `json:"products"`
 }
 
@@ -303,13 +303,14 @@ type SimpleStreamsManifestProductVersionItem struct {
 type SimpleStreamsIndex struct {
 	Format  string                              `json:"format"`
 	Index   map[string]SimpleStreamsIndexStream `json:"index"`
-	Updated string                              `json:"updated"`
+	Updated string                              `json:"updated,omitempty"`
 }
 
 type SimpleStreamsIndexStream struct {
-	Updated  string   `json:"updated"`
+	Updated  string   `json:"updated,omitempty"`
 	DataType string   `json:"datatype"`
 	Path     string   `json:"path"`
+	Format   string   `json:"format,omitempty"`
 	Products []string `json:"products"`
 }