Fix golangci-lint errors for CI

Fixes golangci-lint errors for CI and skips error gosec G402.
shipwright-io · Mar 19, 2024 · 56a5345 · 56a5345
1 parent 31e7555
commit 56a5345
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 20 deletions.
diff --git a/pkg/image/options.go b/pkg/image/options.go
@@ -54,9 +54,8 @@ func GetOptions(ctx context.Context, imageName name.Reference, insecure bool, do
 	transport := http.DefaultTransport.(*http.Transport).Clone()
 
 	if insecure {
-		// #nosec:G402 explicitly requested by user to use insecure registry
 		transport.TLSClientConfig = &tls.Config{
-			InsecureSkipVerify: true,
+			InsecureSkipVerify: true, // #nosec G402 explicitly requested by user to use insecure registry
 		}
 	} else {
 		transport.TLSClientConfig = &tls.Config{

diff --git a/pkg/reconciler/build/controller.go b/pkg/reconciler/build/controller.go
@@ -84,7 +84,7 @@ func add(ctx context.Context, mgr manager.Manager, r reconcile.Reconciler, maxCo
 			// or BuildRunDeletion annotation does not change
 			return o.GetGeneration() != n.GetGeneration() || buildRunDeletionAnnotation
 		},
-		DeleteFunc: func(e event.DeleteEvent) bool {
+		DeleteFunc: func(_ event.DeleteEvent) bool {
 			// Never reconcile on deletion, there is nothing we have to do
 			return false
 		},

diff --git a/pkg/reconciler/buildlimitcleanup/controller.go b/pkg/reconciler/buildlimitcleanup/controller.go
@@ -75,14 +75,14 @@ func add(mgr manager.Manager, r reconcile.Reconciler, maxConcurrentReconciles in
 			}
 			return false
 		},
-		DeleteFunc: func(e event.DeleteEvent) bool {
+		DeleteFunc: func(_ event.DeleteEvent) bool {
 			// Never reconcile on deletion, there is nothing we have to do
 			return false
 		},
 	}
 
 	predBuildRun := predicate.Funcs{
-		CreateFunc: func(e event.CreateEvent) bool {
+		CreateFunc: func(_ event.CreateEvent) bool {
 			// Never reconcile in case of create buildrun event
 			return false
 		},
@@ -106,7 +106,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler, maxConcurrentReconciles in
 			}
 			return false
 		},
-		DeleteFunc: func(e event.DeleteEvent) bool {
+		DeleteFunc: func(_ event.DeleteEvent) bool {
 			// Never reconcile on deletion, there is nothing we have to do
 			return false
 		},

diff --git a/pkg/reconciler/buildrun/controller.go b/pkg/reconciler/buildrun/controller.go
@@ -73,7 +73,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler, maxConcurrentReconciles in
 
 			return false
 		},
-		DeleteFunc: func(e event.DeleteEvent) bool {
+		DeleteFunc: func(_ event.DeleteEvent) bool {
 			// Never reconcile on deletion, there is nothing we have to do
 			return false
 		},

diff --git a/pkg/reconciler/buildrunttlcleanup/controller.go b/pkg/reconciler/buildrunttlcleanup/controller.go
@@ -131,7 +131,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler, maxConcurrentReconciles in
 
 			return false
 		},
-		DeleteFunc: func(e event.DeleteEvent) bool {
+		DeleteFunc: func(_ event.DeleteEvent) bool {
 			// Never reconcile on deletion, there is nothing we have to do
 			return false
 		},

diff --git a/test/utils/v1alpha1/webhook.go b/test/utils/v1alpha1/webhook.go
@@ -55,9 +55,8 @@ func StartBuildWebhook() *http.Server {
 		Transport: &http.Transport{
 			IdleConnTimeout:       5 * time.Second,
 			ResponseHeaderTimeout: 5 * time.Second,
-			// #nosec:G402 test code
 			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
+				InsecureSkipVerify: true, // #nosec G402
 			},
 			TLSHandshakeTimeout: 5 * time.Second,
 		},
@@ -85,9 +84,8 @@ func StopBuildWebhook(webhookServer *http.Server) {
 		Transport: &http.Transport{
 			IdleConnTimeout:       5 * time.Second,
 			ResponseHeaderTimeout: 5 * time.Second,
-			// #nosec:G402 test code
 			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
+				InsecureSkipVerify: true, // #nosec G402
 			},
 			TLSHandshakeTimeout: 5 * time.Second,
 		},

diff --git a/test/utils/v1beta1/webhook.go b/test/utils/v1beta1/webhook.go
@@ -55,9 +55,8 @@ func StartBuildWebhook() *http.Server {
 		Transport: &http.Transport{
 			IdleConnTimeout:       5 * time.Second,
 			ResponseHeaderTimeout: 5 * time.Second,
-			// #nosec:G402 test code
 			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
+				InsecureSkipVerify: true, // #nosec G402
 			},
 			TLSHandshakeTimeout: 5 * time.Second,
 		},
@@ -85,9 +84,8 @@ func StopBuildWebhook(webhookServer *http.Server) {
 		Transport: &http.Transport{
 			IdleConnTimeout:       5 * time.Second,
 			ResponseHeaderTimeout: 5 * time.Second,
-			// #nosec:G402 test code
 			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
+				InsecureSkipVerify: true, // #nosec G402
 			},
 			TLSHandshakeTimeout: 5 * time.Second,
 		},

diff --git a/test/utils/webhook.go b/test/utils/webhook.go
@@ -55,9 +55,8 @@ func StartBuildWebhook() *http.Server {
 		Transport: &http.Transport{
 			IdleConnTimeout:       5 * time.Second,
 			ResponseHeaderTimeout: 5 * time.Second,
-			// #nosec:G402 test code
 			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
+				InsecureSkipVerify: true, // #nosec G402
 			},
 			TLSHandshakeTimeout: 5 * time.Second,
 		},
@@ -85,9 +84,8 @@ func StopBuildWebhook(webhookServer *http.Server) {
 		Transport: &http.Transport{
 			IdleConnTimeout:       5 * time.Second,
 			ResponseHeaderTimeout: 5 * time.Second,
-			// #nosec:G402 test code
 			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
+				InsecureSkipVerify: true, // #nosec G402
 			},
 			TLSHandshakeTimeout: 5 * time.Second,
 		},