SystemSh0cker/gocsaf
1
0
Fork 0
mirror of https://github.com/gocsaf/csaf.git synced 2025-12-22 05:40:11 +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

43
cmd/csaf_aggregator/main.go
View file

@ -11,30 +11,13 @@ package main
import (
"fmt"
"log"
"os"
"path/filepath"
"github.com/csaf-poc/csaf_distribution/v2/util"
"github.com/csaf-poc/csaf_distribution/v2/internal/options"
"github.com/gofrs/flock"
"github.com/jessevdk/go-flags"
)
type options struct {
Config string `short:"c" long:"config" description:"File name of the configuration file" value-name:"CFG-FILE" default:"aggregator.toml"`
Version bool `long:"version" description:"Display version of the binary"`
Interim bool `short:"i" long:"interim" description:"Perform an interim scan"`
}
func errCheck(err error) {
if err != nil {
if flags.WroteHelp(err) {
os.Exit(0)
}
log.Fatalf("error: %v\n", err)
}
}
func lock(lockFile *string, fn func() error) error {
if lockFile == nil {
// No locking configured.
@ -60,25 +43,9 @@ func lock(lockFile *string, fn func() error) error {
}
func main() {
opts := new(options)
_, err := flags.Parse(opts)
errCheck(err)
if opts.Version {
fmt.Println(util.SemVersion)
return
}
interim := opts.Interim
cfg, err := loadConfig(opts.Config)
errCheck(err)
if interim {
cfg.Interim = true
}
_, cfg, err := parseArgsConfig()
options.ErrorCheck(err)
options.ErrorCheck(cfg.check())
p := processor{cfg: cfg}
errCheck(lock(cfg.LockFile, p.process))
options.ErrorCheck(lock(cfg.LockFile, p.process))
}