SystemSh0cker/gocsaf
1
0
Fork 0
mirror of https://github.com/gocsaf/csaf.git synced 2025-12-22 18:15:42 +01:00
Code Issues Releases Activity Actions

Fix version config and make aggreator use new command line parser. (#416)

Browse source 
* Fix version config and make aggreator use new command line parser.

* Replace old error check with check from the library.
This commit is contained in:
Sascha L. Teichmann 2023-08-15 17:54:56 +02:00 • committed by GitHub
parent 8aed2c034e
commit d42db07bec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

53
cmd/csaf_aggregator/config.go
View file

@ -18,15 +18,14 @@ import (
"sync"
"time"
"github.com/BurntSushi/toml"
"github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/csaf-poc/csaf_distribution/v2/csaf"
"github.com/csaf-poc/csaf_distribution/v2/internal/options"
"github.com/csaf-poc/csaf_distribution/v2/util"
"golang.org/x/time/rate"
)
const (
defaultConfigPath = "aggregator.toml"
defaultWorkers = 10
defaultFolder = "/var/www"
defaultWeb = "/var/www/html"
@ -74,7 +73,8 @@ type config struct {
LockFile *string `toml:"lock_file"`
// Interim performs an interim scan.
Interim bool `toml:"interim"`
Interim bool `short:"i" long:"interim" description:"Perform an interim scan" toml:"interim"`
Version bool `long:"version" description:"Display version of the binary" toml:"-"`
// InterimYears is numbers numbers of years to look back
// for interim advisories. Less/equal zero means forever.
@ -90,11 +90,34 @@ type config struct {
// 'update_interval'.
UpdateInterval *string `toml:"update_interval"`
Config string `short:"c" long:"config" description:"Path to config TOML file" value-name:"TOML-FILE" toml:"-"`
keyMu sync.Mutex
key *crypto.Key
keyErr error
}
// configPaths are the potential file locations of the config file.
var configPaths = []string{
// TODO: Make symmetric to checker and downloader.
"aggregator.toml",
}
// parseArgsConfig parse the command arguments and loads configuration
// from a configuration file.
func parseArgsConfig() ([]string, *config, error) {
p := options.Parser[config]{
DefaultConfigLocations: configPaths,
ConfigLocation: func(cfg *config) string {
return cfg.Config
},
HasVersion: func(cfg *config) bool { return cfg.Version },
// Establish default values if not set.
EnsureDefaults: (*config).setDefaults,
}
return p.Parse()
}
// tooOldForInterims returns a function that tells if a given
// time is too old for the configured interims interval.
func (c *config) tooOldForInterims() func(time.Time) bool {
@ -299,27 +322,3 @@ func (c *config) check() error {
return c.checkMirror()
}
func loadConfig(path string) (*config, error) {
if path == "" {
path = defaultConfigPath
}
var cfg config
md, err := toml.DecodeFile(path, &cfg)
if err != nil {
return nil, err
}
if undecoded := md.Undecoded(); len(undecoded) != 0 {
return nil, fmt.Errorf("could not parse %q from config.toml", undecoded)
}
cfg.setDefaults()
if err := cfg.check(); err != nil {
return nil, err
}
return &cfg, nil
}