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

weldr, store: Add toml fields to SourceConfig

Browse source 
TOML output of the source wasn't using the correct field names or case.
This adds toml tags to the weldr.SourceConfigV0, and store.SourceConfig
structs.
This commit is contained in:
Brian C. Lane 2020-04-03 09:59:45 -07:00 • committed by Tom Gundersen
parent 41e8090e95
commit 58c16f1e6d
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/store/store.go
View file

@ -57,12 +57,12 @@ type Job struct {
}
type SourceConfig struct {
Name string `json:"name"`
Type string `json:"type"`
URL string `json:"url"`
CheckGPG bool `json:"check_gpg"`
CheckSSL bool `json:"check_ssl"`
System bool `json:"system"`
Name string `json:"name" toml:"name"`
Type string `json:"type" toml:"type"`
URL string `json:"url" toml:"url"`
CheckGPG bool `json:"check_gpg" toml:"check_gpg"`
CheckSSL bool `json:"check_ssl" toml:"check_ssl"`
System bool `json:"system" toml:"system"`
}
type NotFoundError struct {

16
internal/weldr/json.go
View file

@ -100,14 +100,14 @@ func (s *SourceInfoV0) SourceConfig(sourceName string) (ssc store.SourceConfig,
// SourceConfigV0 holds the source repository information
type SourceConfigV0 struct {
Name string `json:"name"`
Type string `json:"type"`
URL string `json:"url"`
CheckGPG bool `json:"check_gpg"`
CheckSSL bool `json:"check_ssl"`
System bool `json:"system"`
Proxy string `json:"proxy"`
GPGUrls []string `json:"gpgkey_urls"`
Name string `json:"name" toml:"name"`
Type string `json:"type" toml:"type"`
URL string `json:"url" toml:"url"`
CheckGPG bool `json:"check_gpg" toml:"check_gpg"`
CheckSSL bool `json:"check_ssl" toml:"check_ssl"`
System bool `json:"system" toml:"system"`
Proxy string `json:"proxy" toml:"proxy"`
GPGUrls []string `json:"gpgkey_urls" toml:"gpgkey_urls"`
}
// SourceConfig returns a SourceConfig struct populated with the supported variables