From 0c2768b71190cb5034a24c096263dac9f62adae4 Mon Sep 17 00:00:00 2001
From: "Sascha L. Teichmann" <sascha.teichmann@intevation.de>
Date: Fri, 24 Mar 2023 13:40:31 +0100
Subject: [PATCH] Fix header client. Simplify code.

---
 cmd/csaf_checker/processor.go   | 8 ++++----
 cmd/csaf_provider/controller.go | 2 +-
 cmd/csaf_provider/files.go      | 5 +----
 csaf/models.go                  | 5 +----
 csaf/remotevalidation.go        | 5 +----
 util/client.go                  | 2 +-
 6 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/cmd/csaf_checker/processor.go b/cmd/csaf_checker/processor.go
index a1ff8c0..05dbc60 100644
--- a/cmd/csaf_checker/processor.go
+++ b/cmd/csaf_checker/processor.go
@@ -916,7 +916,7 @@ func (p *processor) checkChanges(base string, mask whereType) error {
 	return p.integrity(files, base, mask, p.badChanges.add)
 }
 
-func (p *processor) processROLIEFeeds(domain string, feeds [][]csaf.Feed) error {
+func (p *processor) processROLIEFeeds(feeds [][]csaf.Feed) error {
 
 	base, err := url.Parse(p.pmdURL)
 	if err != nil {
@@ -953,7 +953,7 @@ func empty(arr []string) bool {
 	return true
 }
 
-func (p *processor) checkCSAFs(domain string) error {
+func (p *processor) checkCSAFs(_ string) error {
 	// Check for ROLIE
 	rolie, err := p.expr.Eval("$.distributions[*].rolie.feeds", p.pmd)
 	if err != nil {
@@ -967,7 +967,7 @@ func (p *processor) checkCSAFs(domain string) error {
 		var feeds [][]csaf.Feed
 		if err := util.ReMarshalJSON(&feeds, rolie); err != nil {
 			p.badProviderMetadata.error("ROLIE feeds are not compatible: %v.", err)
-		} else if err := p.processROLIEFeeds(domain, feeds); err != nil {
+		} else if err := p.processROLIEFeeds(feeds); err != nil {
 			if err != errContinue {
 				return err
 			}
@@ -1299,7 +1299,7 @@ func (p *processor) checkWellknownSecurityDNS(domain string) error {
 // the the remotely keys and compares the fingerprints.
 // As a result of these a respective error messages are passed to badPGP method
 // in case of errors. It returns nil if all checks are passed.
-func (p *processor) checkPGPKeys(domain string) error {
+func (p *processor) checkPGPKeys(_ string) error {
 
 	p.badPGPs.use()
 
diff --git a/cmd/csaf_provider/controller.go b/cmd/csaf_provider/controller.go
index c78f59f..c8680ff 100644
--- a/cmd/csaf_provider/controller.go
+++ b/cmd/csaf_provider/controller.go
@@ -147,7 +147,7 @@ func (c *controller) failed(rw http.ResponseWriter, tmpl string, err error) {
 }
 
 // index calls the "render" function and passes the "index.html" and c.cfg to it.
-func (c *controller) index(rw http.ResponseWriter, r *http.Request) {
+func (c *controller) index(rw http.ResponseWriter, _ *http.Request) {
 	c.render(rw, "index.html", map[string]any{
 		"Config": c.cfg,
 	})
diff --git a/cmd/csaf_provider/files.go b/cmd/csaf_provider/files.go
index fc7c73f..edc3142 100644
--- a/cmd/csaf_provider/files.go
+++ b/cmd/csaf_provider/files.go
@@ -30,8 +30,5 @@ func writeHashedFile(fname, name string, data []byte, armored string) error {
 		return err
 	}
 	// Write signature.
-	if err := os.WriteFile(fname+".asc", []byte(armored), 0644); err != nil {
-		return err
-	}
-	return nil
+	return os.WriteFile(fname+".asc", []byte(armored), 0644)
 }
diff --git a/csaf/models.go b/csaf/models.go
index efc2229..8a4284a 100644
--- a/csaf/models.go
+++ b/csaf/models.go
@@ -298,10 +298,7 @@ func (acp *AggregatorCSAFProvider) Validate() error {
 	if acp == nil {
 		return errors.New("aggregator.csaf_providers[] not allowed to be nil")
 	}
-	if err := acp.Metadata.Validate(); err != nil {
-		return err
-	}
-	return nil
+	return acp.Metadata.Validate()
 }
 
 // Validate validates the current state of the Aggregator.
diff --git a/csaf/remotevalidation.go b/csaf/remotevalidation.go
index ac494df..66816c8 100644
--- a/csaf/remotevalidation.go
+++ b/csaf/remotevalidation.go
@@ -163,10 +163,7 @@ func prepareCache(config string) (cache, error) {
 			if err != nil {
 				return err
 			}
-			if err := b.Put(cacheVersionKey, cacheVersion); err != nil {
-				return err
-			}
-			return nil
+			return b.Put(cacheVersionKey, cacheVersion)
 		}
 
 		b := tx.Bucket(validationsBucket)
diff --git a/util/client.go b/util/client.go
index 60a5bd0..2f54032 100644
--- a/util/client.go
+++ b/util/client.go
@@ -83,7 +83,7 @@ func (hc *HeaderClient) Head(url string) (*http.Response, error) {
 
 // Post implements the respective method of the [Client] interface.
 func (hc *HeaderClient) Post(url, contentType string, body io.Reader) (*http.Response, error) {
-	req, err := http.NewRequest(http.MethodPost, url, nil)
+	req, err := http.NewRequest(http.MethodPost, url, body)
 	if err != nil {
 		return nil, err
 	}