From 5226d2a310145ce86ade6e805d280e6b058dbe03 Mon Sep 17 00:00:00 2001 From: Hank Donnay Date: Wed, 17 May 2023 16:17:27 -0500 Subject: [PATCH] clair: use new `cmd.LoadConfig` Signed-off-by: Hank Donnay --- cmd/clair/main.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/cmd/clair/main.go b/cmd/clair/main.go index c925c36965..1abf83fb46 100644 --- a/cmd/clair/main.go +++ b/cmd/clair/main.go @@ -16,7 +16,6 @@ import ( _ "github.com/quay/claircore/updater/defaults" "github.com/quay/zlog" "golang.org/x/sync/errgroup" - yaml "gopkg.in/yaml.v3" "github.com/quay/clair/v4/cmd" "github.com/quay/clair/v4/health" @@ -55,13 +54,8 @@ func main() { } switch f.Name { case "conf": - cf, err := os.Open(fv) - if err != nil { - golog.Fatalf("failed to open config file: %v", err) - } - defer cf.Close() - if err := yaml.NewDecoder(cf).Decode(&conf); err != nil { - golog.Fatalf("failed to decode yaml config: %v", err) + if err := cmd.LoadConfig(&conf, fv, true); err != nil { + golog.Fatalf("failed loading config: %v", err) } case "mode": if fv == "" {