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

rpmmd/repository: repoconfig pointers

Browse source 
Convert some of the fields in the `RepoConfig` struct
to pointers. Since `RepoConfig` will be used to convert
custom repositories to an array of `osbuild.YumRepository`,
we need to ensure that fields that are not set explicitly
are not saved to the `/etc/yum.repos.d` repository files.
This commit is contained in:
Gianluca Zuccarelli 2023-04-18 19:24:27 +01:00 • committed by Tomáš Hozza
parent 75e2138878
commit d44703cdc8
14 changed files with 78 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/cloudapi/v2/handler.go
View file

@ -1363,7 +1363,7 @@ func genRepoConfig(repo Repository) (*rpmmd.RepoConfig, error) {
}
if repo.CheckGpg != nil {
repoConfig.CheckGPG = *repo.CheckGpg
repoConfig.CheckGPG = repo.CheckGpg
}
if repo.Gpgkey != nil && *repo.Gpgkey != "" {
repoConfig.GPGKeys = []string{*repo.Gpgkey}
@ -1372,10 +1372,10 @@ func genRepoConfig(repo Repository) (*rpmmd.RepoConfig, error) {
repoConfig.IgnoreSSL = *repo.IgnoreSsl
}
if repo.CheckRepoGpg != nil {
repoConfig.CheckRepoGPG = *repo.CheckRepoGpg
repoConfig.CheckRepoGPG = repo.CheckRepoGpg
}
if repoConfig.CheckGPG && len(repoConfig.GPGKeys) == 0 {
if repoConfig.CheckGPG != nil && *repoConfig.CheckGPG && len(repoConfig.GPGKeys) == 0 {
return nil, HTTPError(ErrorNoGPGKey)
}

8
internal/cloudapi/v2/v2_internal_test.go
View file

@ -108,7 +108,7 @@ func TestRepoConfigConversion(t *testing.T) {
Metalink: "",
MirrorList: "",
GPGKeys: []string{"some-kind-of-key"},
CheckGPG: true,
CheckGPG: common.ToPtr(true),
IgnoreSSL: false,
MetadataExpire: "",
RHSM: false,
@ -131,7 +131,7 @@ func TestRepoConfigConversion(t *testing.T) {
BaseURLs: []string{"http://base.url"},
Metalink: "", // since BaseURL is specified, MetaLink is not copied
MirrorList: "", // since BaseURL is specified, MirrorList is not copied
CheckGPG: false,
CheckGPG: nil,
IgnoreSSL: true,
MetadataExpire: "",
RHSM: false,
@ -153,7 +153,7 @@ func TestRepoConfigConversion(t *testing.T) {
Name: "",
Metalink: "", // since MirrorList is specified, MetaLink is not copied
MirrorList: "http://example.org/mirrorlist",
CheckGPG: false,
CheckGPG: nil,
IgnoreSSL: true,
MetadataExpire: "",
RHSM: false,
@ -175,7 +175,7 @@ func TestRepoConfigConversion(t *testing.T) {
Name: "",
Metalink: "http://example.org/metalink",
MirrorList: "",
CheckGPG: false,
CheckGPG: nil,
IgnoreSSL: true,
MetadataExpire: "",
RHSM: true,