From 0ad4ed9e3686e41f7d8f403578b09d45ed564a76 Mon Sep 17 00:00:00 2001
From: "Sascha L. Teichmann" <sascha.teichmann@intevation.de>
Date: Wed, 26 Jul 2023 03:31:00 +0200
Subject: [PATCH] Expose logging as field in AdvisoryFileProcessor to shrink
 constructor signature.

---
 cmd/csaf_aggregator/mirror.go     | 3 +--
 cmd/csaf_downloader/downloader.go | 3 +--
 csaf/advisories.go                | 6 ++----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/cmd/csaf_aggregator/mirror.go b/cmd/csaf_aggregator/mirror.go
index 1b197c4..0fd1de0 100644
--- a/cmd/csaf_aggregator/mirror.go
+++ b/cmd/csaf_aggregator/mirror.go
@@ -76,8 +76,7 @@ func (w *worker) mirrorInternal() (*csaf.AggregatorCSAFProvider, error) {
 		w.client,
 		w.expr,
 		w.metadataProvider,
-		base,
-		nil)
+		base)
 
 	if err := afp.Process(w.mirrorFiles); err != nil {
 		return nil, err
diff --git a/cmd/csaf_downloader/downloader.go b/cmd/csaf_downloader/downloader.go
index 690aa78..cabe2fe 100644
--- a/cmd/csaf_downloader/downloader.go
+++ b/cmd/csaf_downloader/downloader.go
@@ -150,8 +150,7 @@ func (d *downloader) download(ctx context.Context, domain string) error {
 		client,
 		d.eval,
 		lpmd.Document,
-		base,
-		nil)
+		base)
 
 	// Do we need time range based filtering?
 	if d.cfg.Range != nil {
diff --git a/csaf/advisories.go b/csaf/advisories.go
index 1d404a8..5286d23 100644
--- a/csaf/advisories.go
+++ b/csaf/advisories.go
@@ -73,11 +73,11 @@ func (haf HashedAdvisoryFile) SignURL() string { return haf.name(3, ".asc") }
 // advisory file names from a given provider metadata.
 type AdvisoryFileProcessor struct {
 	AgeAccept func(time.Time) bool
+	Log       func(format string, args ...any)
 	client    util.Client
 	expr      *util.PathEval
 	doc       any
 	base      *url.URL
-	log       func(format string, args ...any)
 }
 
 // NewAdvisoryFileProcessor constructs an filename extractor
@@ -87,14 +87,12 @@ func NewAdvisoryFileProcessor(
 	expr *util.PathEval,
 	doc any,
 	base *url.URL,
-	log func(format string, args ...any),
 ) *AdvisoryFileProcessor {
 	return &AdvisoryFileProcessor{
 		client: client,
 		expr:   expr,
 		doc:    doc,
 		base:   base,
-		log:    log,
 	}
 }
 
@@ -113,7 +111,7 @@ func empty(arr []string) bool {
 func (afp *AdvisoryFileProcessor) Process(
 	fn func(TLPLabel, []AdvisoryFile) error,
 ) error {
-	lg := afp.log
+	lg := afp.Log
 	if lg == nil {
 		lg = func(format string, args ...any) {
 			log.Printf("AdvisoryFileProcessor.Process: "+format, args...)