particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

blueprint: don't set omitempty for toml groups and modules

Browse source 
The integration tests expect the empty arrays to be there.
This commit is contained in:
Lars Karlitski 2019-12-08 00:01:25 +01:00 • committed by Tom Gundersen
parent 0718766fbc
commit ea70d9dfc5
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/blueprint/blueprint.go
View file

@ -7,11 +7,8 @@ type Blueprint struct {
Description string `json:"description" toml:"description"` Description string `json:"description" toml:"description"`
Version string `json:"version,omitempty" toml:"version,omitempty"` Version string `json:"version,omitempty" toml:"version,omitempty"`
Packages []Package `json:"packages" toml:"packages"` Packages []Package `json:"packages" toml:"packages"`
Modules []Package `json:"modules" toml:"modules"`
// skip "omitempty" for json, because cockpit-composer chokes when the keys are missing Groups []Group `json:"groups" toml:"groups"`
Modules []Package `json:"modules" toml:"modules,omitempty"`
Groups []Group `json:"groups" toml:"groups,omitempty"`
Customizations *Customizations `json:"customizations,omitempty" toml:"customizations,omitempty"` Customizations *Customizations `json:"customizations,omitempty" toml:"customizations,omitempty"`
} }

2
internal/weldr/api_test.go
View file

@ -170,6 +170,8 @@ func TestBlueprintsInfoToml(t *testing.T) {
Packages: []blueprint.Package{ Packages: []blueprint.Package{
{"httpd", "2.4.*"}, {"httpd", "2.4.*"},
}, },
Groups: []blueprint.Group{},
Modules: []blueprint.Package{},
} }
if diff := cmp.Diff(got, expected); diff != "" { if diff := cmp.Diff(got, expected); diff != "" {
t.Fatalf("received unexpected blueprint: %s", diff) t.Fatalf("received unexpected blueprint: %s", diff)