From cfaba0b1c3a24903be398c0727f7c106a1f8428b Mon Sep 17 00:00:00 2001
From: Malte Poll <1780588+malt3@users.noreply.github.com>
Date: Fri, 10 May 2024 13:53:01 +0200
Subject: [PATCH] misc: update golangci-lint related changes

---
 .golangci.yml                                   | 8 +++++---
 image/upload/internal/cmd/measurementsupload.go | 2 +-
 internal/attestation/aws/snp/validator.go       | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 2998b1416..7a24624c4 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -4,11 +4,11 @@ run:
     - integration
     - e2e
   modules-download-mode: readonly
-  skip-dirs:
-    - 3rdparty/node-maintenance-operator
 
 output:
-  format: tab
+  formats:
+    - format: tab
+      path: stdout
   sort-results: true
 
 linters:
@@ -38,6 +38,8 @@ linters:
 issues:
   max-issues-per-linter: 0
   max-same-issues: 20
+  exclude-dirs:
+    - 3rdparty/node-maintenance-operator
   include:
     - EXC0012
     - EXC0014
diff --git a/image/upload/internal/cmd/measurementsupload.go b/image/upload/internal/cmd/measurementsupload.go
index 720864c78..c16137d05 100644
--- a/image/upload/internal/cmd/measurementsupload.go
+++ b/image/upload/internal/cmd/measurementsupload.go
@@ -61,7 +61,7 @@ func runMeasurementsUpload(cmd *cobra.Command, _ []string) error {
 	}
 	defer func() {
 		if err := uploadCClose(cmd.Context()); err != nil {
-			log.Error("closing upload client: %v", err)
+			log.Error("closing upload client", "error", err)
 		}
 	}()
 
diff --git a/internal/attestation/aws/snp/validator.go b/internal/attestation/aws/snp/validator.go
index 873851c73..c05c35cc6 100644
--- a/internal/attestation/aws/snp/validator.go
+++ b/internal/attestation/aws/snp/validator.go
@@ -31,7 +31,7 @@ import (
 
 // Validator for AWS TPM attestation.
 type Validator struct {
-	// Embed variant to identify the Validator using varaint.OID().
+	// Embed variant to identify the Validator using variant.OID().
 	variant.AWSSEVSNP
 	// Embed validator to implement Validate method for aTLS handshake.
 	*vtpm.Validator