From 11e16400561bc2c6a675838ba6783da6ed58272c Mon Sep 17 00:00:00 2001
From: Mariano Cano <mariano.cano@gmail.com>
Date: Tue, 24 Oct 2023 12:34:35 -0700
Subject: [PATCH] Fix linter errors
---
Makefile | 10 +++++++---
truststore_darwin.go | 2 +-
truststore_java.go | 2 +-
truststore_linux.go | 2 +-
truststore_nss.go | 2 +-
truststore_others.go | 5 +++--
6 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index ce71140..95a0690 100644
--- a/Makefile
+++ b/Makefile
@@ -47,12 +47,16 @@ race:
fmt:
$Q goimports -local github.com/golangci/golangci-lint -l -w $(SRC)
-lint: SHELL:=/bin/bash
-lint:
+lint: golint govulncheck
+
+golint: SHELL:=/bin/bash
+golint:
$Q LOG_LEVEL=error golangci-lint run --config <(curl -s https://raw.githubusercontent.com/smallstep/workflows/master/.golangci.yml) --timeout=30m
+
+govulncheck:
$Q govulncheck ./...
-.PHONY: fmt lint
+.PHONY: fmt lint golint govulncheck
#########################################
# Clean
diff --git a/truststore_darwin.go b/truststore_darwin.go
index 9f25654..ebc7a58 100644
--- a/truststore_darwin.go
+++ b/truststore_darwin.go
@@ -122,7 +122,7 @@ func installPlatform(filename string, cert *x509.Certificate) error {
return nil
}
-func uninstallPlatform(filename string, cert *x509.Certificate) error {
+func uninstallPlatform(filename string, _ *x509.Certificate) error {
cmd := exec.Command("sudo", "security", "remove-trusted-cert", "-d", filename)
out, err := cmd.CombinedOutput()
if err != nil {
diff --git a/truststore_java.go b/truststore_java.go
index 7051a43..406ad47 100644
--- a/truststore_java.go
+++ b/truststore_java.go
@@ -87,7 +87,7 @@ func (t *JavaTrust) Install(filename string, cert *x509.Certificate) error {
}
// Uninstall implements the Trust interface.
-func (t *JavaTrust) Uninstall(filename string, cert *x509.Certificate) error {
+func (t *JavaTrust) Uninstall(_ string, cert *x509.Certificate) error {
args := []string{
"-delete",
"-alias", uniqueName(cert),
diff --git a/truststore_linux.go b/truststore_linux.go
index 03bb269..8be200c 100644
--- a/truststore_linux.go
+++ b/truststore_linux.go
@@ -82,7 +82,7 @@ func installPlatform(filename string, cert *x509.Certificate) error {
return nil
}
-func uninstallPlatform(filename string, cert *x509.Certificate) error {
+func uninstallPlatform(_ string, cert *x509.Certificate) error {
if SystemTrustCommand == nil {
return ErrNotSupported
}
diff --git a/truststore_nss.go b/truststore_nss.go
index c3c3618..3cb45ee 100644
--- a/truststore_nss.go
+++ b/truststore_nss.go
@@ -80,7 +80,7 @@ func (t *NSSTrust) Install(filename string, cert *x509.Certificate) error {
}
// Uninstall implements the Trust interface.
-func (t *NSSTrust) Uninstall(filename string, cert *x509.Certificate) (err error) {
+func (t *NSSTrust) Uninstall(_ string, cert *x509.Certificate) (err error) {
forEachNSSProfile(func(profile string) {
if err != nil {
return
diff --git a/truststore_others.go b/truststore_others.go
index 3d39fa5..2745169 100644
--- a/truststore_others.go
+++ b/truststore_others.go
@@ -1,3 +1,4 @@
+//go:build !linux && !darwin && !windows && !freebsd
// +build !linux,!darwin,!windows,!freebsd
package truststore
@@ -12,10 +13,10 @@ var (
CertutilInstallHelp = ""
)
-func installPlatform(filename string, cert *x509.Certificate) error {
+func installPlatform(string, *x509.Certificate) error {
return ErrTrustNotSupported
}
-func uninstallPlatform(filename string, cert *x509.Certificate) error {
+func uninstallPlatform(string, *x509.Certificate) error {
return ErrTrustNotSupported
}
--
GitLab