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

blueprint: tag all struct fields for toml

Browse source 
This is repetitive, but there doesn't seem to be another way to export
lower-case field names.
This commit is contained in:
Lars Karlitski 2019-12-04 01:14:10 +01:00
parent 94bfcc518c
commit b1c65bb671
3 changed files with 51 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

33
internal/blueprint/blueprint.go
View file

@ -3,32 +3,35 @@ package blueprint
// A Blueprint is a high-level description of an image.
type Blueprint struct {
Name string `json:"name"`
Description string `json:"description"`
Version string `json:"version,omitempty"`
Packages []Package `json:"packages"`
Modules []Package `json:"modules"`
Groups []Group `json:"groups"`
Customizations *Customizations `json:"customizations,omitempty"`
Name string `json:"name" toml:"name"`
Description string `json:"description" toml:"description"`
Version string `json:"version,omitempty" toml:"version,omitempty"`
Packages []Package `json:"packages" toml:"packages"`
// skip "omitempty" for json, because cockpit-composer chokes when the keys are missing
Modules []Package `json:"modules" toml:"modules,omitempty"`
Groups []Group `json:"groups" toml:"groups,omitempty"`
Customizations *Customizations `json:"customizations,omitempty" toml:"customizations,omitempty"`
}
type Change struct {
Commit string `json:"commit"`
Message string `json:"message"`
Revision *string `json:"revision"`
Timestamp string `json:"timestamp"`
Blueprint Blueprint `json:"-"`
Commit string `json:"commit" toml:"commit"`
Message string `json:"message" toml:"message"`
Revision *string `json:"revision" toml:"revision"`
Timestamp string `json:"timestamp" toml:"timestamp"`
Blueprint Blueprint `json:"-" toml:"-"`
}
// A Package specifies an RPM package.
type Package struct {
Name string `json:"name"`
Version string `json:"version,omitempty"`
Name string `json:"name" toml:"name"`
Version string `json:"version,omitempty" toml:"version,omitempty"`
}
// A group specifies an package group.
type Group struct {
Name string `json:"name"`
Name string `json:"name" toml:"name"`
}
// packages, modules, and groups all resolve to rpm packages right now. This