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

cmd/composer: drop koji configuration

Browse source 
Now that all interaciton with the koji API happens in the workers
we can drop koji configuration from composer itself. This means
that composer no longer needs to be provisioned with kerberos
credentials, and does not need to know about which koji servers
the workers support.
This commit is contained in:
Tom Gundersen 2020-11-09 15:45:24 +00:00 • committed by Lars Karlitski
parent 654daf96c1
commit 5dac422b9c
7 changed files with 3 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cmd/osbuild-composer/composer.go
View file

@ -18,7 +18,6 @@ import (
"github.com/osbuild/osbuild-composer/internal/kojiapi"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
"github.com/osbuild/osbuild-composer/internal/store"
"github.com/osbuild/osbuild-composer/internal/upload/koji"
"github.com/osbuild/osbuild-composer/internal/weldr"
"github.com/osbuild/osbuild-composer/internal/worker"
@ -130,17 +129,7 @@ func (c *Composer) InitWeldr(repoPaths []string, weldrListener, localWorkerListe
func (c *Composer) InitAPI(cert, key string, l net.Listener) error {
c.api = cloudapi.NewServer(c.workers, c.rpm, c.distros)
servers := make(map[string]koji.GSSAPICredentials)
for name, creds := range c.config.Koji.Servers {
if creds.Kerberos != nil {
servers[name] = koji.GSSAPICredentials{
Principal: creds.Kerberos.Principal,
KeyTab: creds.Kerberos.KeyTab,
}
}
}
c.koji = kojiapi.NewServer(c.logger, c.workers, c.rpm, c.distros, servers)
c.koji = kojiapi.NewServer(c.logger, c.workers, c.rpm, c.distros)
tlsConfig, err := createTLSConfig(&connectionConfig{
CACertFile: c.config.Koji.CA,

6
cmd/osbuild-composer/config.go
View file

@ -8,12 +8,6 @@ import (
type ComposerConfigFile struct {
Koji struct {
Servers map[string]struct {
Kerberos *struct {
Principal string `toml:"principal"`
KeyTab string `toml:"keytab"`
} `toml:"kerberos,omitempty"`
} `toml:"servers"`
AllowedDomains []string `toml:"allowed_domains"`
CA string `toml:"ca"`
} `toml:"koji"`

7
cmd/osbuild-composer/config_test.go
View file

@ -11,7 +11,6 @@ func TestEmpty(t *testing.T) {
config, err := LoadConfig("testdata/empty-config.toml")
require.NoError(t, err)
require.NotNil(t, config)
require.Empty(t, config.Koji.Servers)
require.Empty(t, config.Koji.AllowedDomains)
require.Empty(t, config.Koji.CA)
require.Empty(t, config.Worker.AllowedDomains)
@ -30,12 +29,6 @@ func TestConfig(t *testing.T) {
require.NoError(t, err)
require.NotNil(t, config)
server, ok := config.Koji.Servers["example.com"]
require.True(t, ok)
require.NotNil(t, server.Kerberos)
require.Equal(t, server.Kerberos.Principal, "example@osbuild.org")
require.Equal(t, server.Kerberos.KeyTab, "/etc/osbuild-composer/osbuild.keytab")
require.Equal(t, config.Koji.AllowedDomains, []string{"osbuild.org"})
require.Equal(t, config.Koji.CA, "/etc/osbuild-composer/ca-crt.pem")

4
cmd/osbuild-composer/testdata/test.toml vendored
View file

@ -2,10 +2,6 @@
allowed_domains = [ "osbuild.org" ]
ca = "/etc/osbuild-composer/ca-crt.pem"
[koji.servers."example.com".kerberos]
principal = "example@osbuild.org"
keytab = "/etc/osbuild-composer/osbuild.keytab"
[worker]
allowed_domains = [ "osbuild.org" ]
ca = "/etc/osbuild-composer/ca-crt.pem"