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

cloudapi: Add module_hotfixes flag

Browse source 
Allow passing module_hotfixes flag through the cloudapi.
This will enable depsolving on repositories that might be affected by modularity filtering.

Refs HMS-3202
This commit is contained in:
Ondrej Ezr 2023-12-01 16:55:14 +01:00 • committed by Tomáš Hozza
parent 61e6f75281
commit 4b3b942dde
10 changed files with 281 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

21
internal/store/json.go
View file

@ -59,16 +59,17 @@ type imageBuildV0 struct {
}
type sourceV0 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"`
Distros []string `json:"distros"`
RHSM bool `json:"rhsm"`
CheckRepoGPG bool `json:"check_repogpg"`
GPGKeys []string `json:"gpgkeys"`
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"`
Distros []string `json:"distros"`
RHSM bool `json:"rhsm"`
CheckRepoGPG bool `json:"check_repogpg"`
GPGKeys []string `json:"gpgkeys"`
ModuleHotfixes *bool `json:"module_hotfixes,omitempty"`
}
type sourcesV0 map[string]sourceV0

31
internal/store/store.go
View file

@ -57,16 +57,17 @@ type Store struct {
}
type SourceConfig struct {
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"`
Distros []string `json:"distros" toml:"distros"`
RHSM bool `json:"rhsm" toml:"rhsm"`
CheckRepoGPG bool `json:"check_repogpg" toml:"check_repogpg"`
GPGKeys []string `json:"gpgkeys"`
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"`
Distros []string `json:"distros" toml:"distros"`
RHSM bool `json:"rhsm" toml:"rhsm"`
CheckRepoGPG bool `json:"check_repogpg" toml:"check_repogpg"`
GPGKeys []string `json:"gpgkeys"`
ModuleHotfixes *bool `json:"module_hotfixes,omitempty"`
}
type NotFoundError struct {
@ -583,10 +584,11 @@ func (s *Store) GetAllDistroSources(distro string) map[string]SourceConfig {
func NewSourceConfig(repo rpmmd.RepoConfig, system bool) SourceConfig {
sc := SourceConfig{
Name: repo.Name,
System: system,
RHSM: repo.RHSM,
GPGKeys: repo.GPGKeys,
Name: repo.Name,
System: system,
RHSM: repo.RHSM,
GPGKeys: repo.GPGKeys,
ModuleHotfixes: repo.ModuleHotfixes,
}
if repo.CheckGPG != nil {
@ -628,6 +630,7 @@ func (s *SourceConfig) RepoConfig(name string) rpmmd.RepoConfig {
repo.RHSM = s.RHSM
repo.CheckRepoGPG = common.ToPtr(s.CheckRepoGPG)
repo.GPGKeys = s.GPGKeys
repo.ModuleHotfixes = s.ModuleHotfixes
var urls []string
if s.URL != "" {