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

Rename gpgkey_urls to gpgkeys

Browse source 
This has never been supported in osbuild-composer, so it is safe to
rename in preparation for adding repo metadata gpg signature checking.
This commit is contained in:
Brian C. Lane 2023-01-20 09:52:30 -08:00 • committed by Sanne Raymaekers
parent 7a1d7ae1d7
commit a47375a10d
3 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/weldr/json.go
View file

@ -120,7 +120,7 @@ type SourceConfig interface {
}
// NewSourceConfigV0 converts a store.SourceConfig to a SourceConfigV0
// The store does not support proxy and gpgkey_urls
// The store does not support proxy and gpgkeys
func NewSourceConfigV0(s store.SourceConfig) SourceConfigV0 {
var sc SourceConfigV0
@ -143,7 +143,7 @@ type SourceConfigV0 struct {
CheckSSL bool `json:"check_ssl" toml:"check_ssl"`
System bool `json:"system" toml:"system"`
Proxy string `json:"proxy,omitempty" toml:"proxy,omitempty"`
GPGUrls []string `json:"gpgkey_urls,omitempty" toml:"gpgkey_urls,omitempty"`
GPGKeys []string `json:"gpgkeys,omitempty" toml:"gpgkeys,omitempty"`
}
// Key return the key, .Name in this case
@ -162,7 +162,7 @@ func (s SourceConfigV0) GetType() string {
}
// SourceConfig returns a SourceConfig struct populated with the supported variables
// The store does not support proxy and gpgkey_urls
// The store does not support proxy and gpgkeys
func (s SourceConfigV0) SourceConfig() (ssc store.SourceConfig) {
ssc.Name = s.Name
ssc.Type = s.Type
@ -180,7 +180,7 @@ type SourceInfoResponseV0 struct {
}
// NewSourceConfigV1 converts a store.SourceConfig to a SourceConfigV1
// The store does not support proxy and gpgkey_urls
// The store does not support proxy and gpgkeys
func NewSourceConfigV1(id string, s store.SourceConfig) SourceConfigV1 {
var sc SourceConfigV1
@ -207,7 +207,7 @@ type SourceConfigV1 struct {
CheckSSL bool `json:"check_ssl" toml:"check_ssl"`
System bool `json:"system" toml:"system"`
Proxy string `json:"proxy,omitempty" toml:"proxy,omitempty"`
GPGUrls []string `json:"gpgkey_urls,omitempty" toml:"gpgkey_urls,omitempty"`
GPGKeys []string `json:"gpgkeys,omitempty" toml:"gpgkeys,omitempty"`
Distros []string `json:"distros,omitempty" toml:"distros,omitempty"`
RHSM bool `json:"rhsm" toml:"rhsm"`
}
@ -228,7 +228,7 @@ func (s SourceConfigV1) GetType() string {
}
// SourceConfig returns a SourceConfig struct populated with the supported variables
// The store does not support proxy and gpgkey_urls
// The store does not support proxy and gpgkeys
func (s SourceConfigV1) SourceConfig() (ssc store.SourceConfig) {
ssc.Name = s.Name
ssc.Type = s.Type