Upgrade golangci-lint for go1.18 compatibility (#547)

stackrox · Nov 7, 2022 · ac4af15 · ac4af15
1 parent 3cf2981
commit ac4af15
Show file tree

Hide file tree

Showing 83 changed files with 88 additions and 25 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,5 +1,5 @@
 # This runs checks to verify if code is properly formatted and that tests (unit and integration against a mocked environment) are passing.
-name: Lint & Test
+name: Verify & Test
 
 on:
   push:
@@ -57,8 +57,8 @@ env:
   TEST_TIMEOUT: 30m
 
 jobs:
-  lint-test:
-    name: "Lint & Test"
+  verify-test:
+    name: "Verify & Test"
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -100,7 +100,7 @@ jobs:
           echo -n "${{ secrets.POSTGRES_PASSWORD }}" > secrets/db.password
       - name: Run Migration Script
         run: make db/migrate
-      - name: Lint & Test
+      - name: Verify & Test
         run: |
           export GOPATH=$(go env GOPATH)
           export PATH=${PATH}:$GOPATH/bin

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
         args: ["--baseline", ".secrets.baseline"]
         exclude: ^pkg/client/redhatsso/api/
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.46.2
+    rev: v1.50.1
     hooks:
       - id: golangci-lint
   - repo: https://github.com/pre-commit/pre-commit-hooks

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ This Changelog should be updated for:
 
 ### Added
 - Data Plane terraforming scripts migration from BitWarden to Parameter Store
+- Update go version to 1.18
 ### Changed
 ### Deprecated
 ### Removed
diff --git a/Makefile b/Makefile
@@ -88,16 +88,6 @@ LOCAL_BIN_PATH := ${PROJECT_PATH}/bin
 # for `go generate` to use project-level bin directory binaries first
 export PATH := ${LOCAL_BIN_PATH}:$(PATH)
 
-GOLANGCI_LINT ?= $(LOCAL_BIN_PATH)/golangci-lint
-golangci-lint:
-ifeq (, $(shell which $(LOCAL_BIN_PATH)/golangci-lint 2> /dev/null))
-	@{ \
-	set -e ;\
-	VERSION="v1.43.0" ;\
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/$${VERSION}/install.sh | sh -s -- -b ${LOCAL_BIN_PATH} $${VERSION} ;\
-	}
-endif
-
 LOCAL_GOTESTSUM = $(LOCAL_BIN_PATH)/gotestsum
 GOTESTSUM ?= $(LOCAL_GOTESTSUM)
 gotestsum:
@@ -304,17 +294,10 @@ verify: check-gopath openapi/validate
 .PHONY: verify
 
 # Runs linter against go files and .y(a)ml files in the templates directory
-# Requires golangci-lint to be installed @ $(go env GOPATH)/bin/golangci-lint
+# Requires pre-commit to be installed: See https://pre-commit.com/index.html for installation instructions.
 # and spectral installed via npm
-lint: golangci-lint specinstall
-	$(GOLANGCI_LINT) run \
-		./cmd/... \
-		./pkg/... \
-		./internal/... \
-		./test/... \
-		./fleetshard/... \
-		./probe/...
-
+lint: specinstall
+	pre-commit run golangci-lint --all-files
 	spectral lint templates/*.yml templates/*.yaml --ignore-unknown-format --ruleset .validate-templates.yaml
 .PHONY: lint
 

diff --git a/cmd/fleet-manager/main.go b/cmd/fleet-manager/main.go
@@ -1,3 +1,4 @@
+// Package main ...
 package main
 
 import (

diff --git a/e2e/dns/records_loader.go b/e2e/dns/records_loader.go
@@ -1,3 +1,4 @@
+// Package dns ...
 package dns
 
 import (

diff --git a/fleetshard/config/config.go b/fleetshard/config/config.go
@@ -1,3 +1,4 @@
+// Package config ...
 package config
 
 import (

diff --git a/fleetshard/main.go b/fleetshard/main.go
@@ -1,3 +1,4 @@
+// Package main ...
 package main
 
 import (

diff --git a/fleetshard/pkg/central/charts/charts.go b/fleetshard/pkg/central/charts/charts.go
@@ -1,3 +1,4 @@
+// Package charts ...
 package charts
 
 import (

diff --git a/fleetshard/pkg/central/client/client.go b/fleetshard/pkg/central/client/client.go
@@ -1,3 +1,4 @@
+// Package client ...
 package client
 
 import (

diff --git a/fleetshard/pkg/fleetshardmetrics/metrics.go b/fleetshard/pkg/fleetshardmetrics/metrics.go
@@ -1,3 +1,4 @@
+// Package fleetshardmetrics ...
 package fleetshardmetrics
 
 import (

diff --git a/fleetshard/pkg/k8s/client.go b/fleetshard/pkg/k8s/client.go
@@ -1,3 +1,4 @@
+// Package k8s ...
 package k8s
 
 import (

diff --git a/fleetshard/pkg/runtime/runtime.go b/fleetshard/pkg/runtime/runtime.go
@@ -1,3 +1,4 @@
+// Package runtime ...
 package runtime
 
 import (

diff --git a/fleetshard/pkg/testutils/k8s.go b/fleetshard/pkg/testutils/k8s.go
@@ -1,3 +1,4 @@
+// Package testutils ...
 package testutils
 
 import (

diff --git a/fleetshard/pkg/util/hash.go b/fleetshard/pkg/util/hash.go
@@ -1,3 +1,4 @@
+// Package util ...
 package util
 
 import (

diff --git a/internal/dinosaur/compat/compat.go b/internal/dinosaur/compat/compat.go
@@ -1,3 +1,4 @@
+// Package compat ...
 package compat
 
 import (

diff --git a/internal/dinosaur/constants/central.go b/internal/dinosaur/constants/central.go
@@ -1,3 +1,4 @@
+// Package constants ...
 package constants
 
 import (

diff --git a/internal/dinosaur/pkg/api/dbapi/central_request_types.go b/internal/dinosaur/pkg/api/dbapi/central_request_types.go
@@ -1,3 +1,4 @@
+// Package dbapi ...
 package dbapi
 
 import (

diff --git a/internal/dinosaur/pkg/clusters/cluster_builder.go b/internal/dinosaur/pkg/clusters/cluster_builder.go
@@ -1,3 +1,4 @@
+// Package clusters ...
 package clusters
 
 import (

diff --git a/internal/dinosaur/pkg/clusters/types/types.go b/internal/dinosaur/pkg/clusters/types/types.go
@@ -1,3 +1,4 @@
+// Package types ...
 package types
 
 import (

diff --git a/internal/dinosaur/pkg/cmd/observatorium/cmd.go b/internal/dinosaur/pkg/cmd/observatorium/cmd.go
@@ -1,3 +1,4 @@
+// Package observatorium ...
 package observatorium
 
 import (

diff --git a/internal/dinosaur/pkg/config/aws.go b/internal/dinosaur/pkg/config/aws.go
@@ -1,3 +1,4 @@
+// Package config ...
 package config
 
 import (

diff --git a/internal/dinosaur/pkg/converters/cluster.go b/internal/dinosaur/pkg/converters/cluster.go
@@ -1,3 +1,4 @@
+// Package converters ...
 package converters
 
 import (

diff --git a/internal/dinosaur/pkg/defaults/default_central_spec.go b/internal/dinosaur/pkg/defaults/default_central_spec.go
@@ -1,3 +1,4 @@
+// Package defaults ...
 package defaults
 
 import (

diff --git a/internal/dinosaur/pkg/dinosaurs/types/types.go b/internal/dinosaur/pkg/dinosaurs/types/types.go
@@ -1,3 +1,4 @@
+// Package types ...
 package types
 
 import "github.com/stackrox/acs-fleet-manager/pkg/client/ocm"

diff --git a/internal/dinosaur/pkg/environments/development.go b/internal/dinosaur/pkg/environments/development.go
@@ -1,3 +1,4 @@
+// Package environments ...
 package environments
 
 import "github.com/stackrox/acs-fleet-manager/pkg/environments"

diff --git a/internal/dinosaur/pkg/handlers/admin_dinosaur.go b/internal/dinosaur/pkg/handlers/admin_dinosaur.go
@@ -1,3 +1,4 @@
+// Package handlers ...
 package handlers
 
 import (

diff --git a/internal/dinosaur/pkg/metrics/component_versions.go b/internal/dinosaur/pkg/metrics/component_versions.go
@@ -1,3 +1,4 @@
+// Package metrics ...
 package metrics
 
 import (

diff --git a/internal/dinosaur/pkg/migrations/20220114114500_add_centrals.go b/internal/dinosaur/pkg/migrations/20220114114500_add_centrals.go
@@ -1,3 +1,4 @@
+// Package migrations ...
 package migrations
 
 // Migrations should NEVER use types from other packages. Types can change

diff --git a/internal/dinosaur/pkg/presenters/admin_dinosaur.go b/internal/dinosaur/pkg/presenters/admin_dinosaur.go
@@ -1,3 +1,4 @@
+// Package presenters ...
 package presenters
 
 import (

diff --git a/internal/dinosaur/pkg/routes/route_loader.go b/internal/dinosaur/pkg/routes/route_loader.go
@@ -1,3 +1,4 @@
+// Package routes ...
 package routes
 
 import (

diff --git a/internal/dinosaur/pkg/services/cloud_providers.go b/internal/dinosaur/pkg/services/cloud_providers.go
@@ -1,3 +1,4 @@
+// Package services ...
 package services
 
 import (

diff --git a/internal/dinosaur/pkg/services/quota/ams_quota_service.go b/internal/dinosaur/pkg/services/quota/ams_quota_service.go
@@ -1,3 +1,4 @@
+// Package quota ...
 package quota
 
 import (

diff --git a/internal/dinosaur/pkg/workers/clusters_mgr.go b/internal/dinosaur/pkg/workers/clusters_mgr.go
@@ -1,3 +1,4 @@
+// Package workers ...
 package workers
 
 import (

diff --git a/internal/dinosaur/pkg/workers/dinosaurmgrs/accepted_dinosaurs_mgr.go b/internal/dinosaur/pkg/workers/dinosaurmgrs/accepted_dinosaurs_mgr.go
@@ -1,3 +1,4 @@
+// Package dinosaurmgrs ...
 package dinosaurmgrs
 
 import (

diff --git a/internal/dinosaur/providers.go b/internal/dinosaur/providers.go
@@ -1,3 +1,4 @@
+// Package dinosaur ...
 package dinosaur
 
 import (

diff --git a/internal/dinosaur/routes/constants.go b/internal/dinosaur/routes/constants.go
@@ -1,3 +1,4 @@
+// Package routes ...
 package routes
 
 // Version ...

diff --git a/internal/dinosaur/test/common/cluster_pollers.go b/internal/dinosaur/test/common/cluster_pollers.go
@@ -1,3 +1,4 @@
+// Package common ...
 package common
 
 import (

diff --git a/internal/dinosaur/test/helper.go b/internal/dinosaur/test/helper.go
@@ -1,3 +1,4 @@
+// Package test ...
 package test
 
 import (

diff --git a/internal/dinosaur/test/mocks/fleetshardsync/fleetshard-sync.go b/internal/dinosaur/test/mocks/fleetshardsync/fleetshard-sync.go
@@ -1,3 +1,4 @@
+// Package fleetshardsync ...
 package fleetshardsync
 
 import (

diff --git a/pkg/acl/access_control_list.go b/pkg/acl/access_control_list.go
@@ -1,3 +1,4 @@
+// Package acl ...
 package acl
 
 import (

diff --git a/pkg/api/cloud_provider_types.go b/pkg/api/cloud_provider_types.go
@@ -1,3 +1,4 @@
+// Package api ...
 package api
 
 // CloudProvider ...

diff --git a/pkg/api/observability/v1/types.go b/pkg/api/observability/v1/types.go
@@ -1,3 +1,4 @@
+// Package v1 ...
 package v1
 
 import (

diff --git a/pkg/auth/acs_claims.go b/pkg/auth/acs_claims.go
@@ -1,3 +1,4 @@
+// Package auth ...
 package auth
 
 import (

diff --git a/pkg/client/aws/client.go b/pkg/client/aws/client.go
@@ -1,3 +1,4 @@
+// Package aws ...
 package aws
 
 import (

diff --git a/pkg/client/fleetmanager/auth.go b/pkg/client/fleetmanager/auth.go
@@ -1,3 +1,4 @@
+// Package fleetmanager ...
 package fleetmanager
 
 import (

diff --git a/pkg/client/iam/client.go b/pkg/client/iam/client.go
@@ -1,3 +1,4 @@
+// Package iam ...
 package iam
 
 import (

diff --git a/pkg/client/observatorium/api.go b/pkg/client/observatorium/api.go
@@ -1,3 +1,4 @@
+// Package observatorium ...
 package observatorium
 
 import (

diff --git a/pkg/client/ocm/client.go b/pkg/client/ocm/client.go
@@ -1,3 +1,4 @@
+// Package ocm ...
 package ocm
 
 import (

diff --git a/pkg/client/redhatsso/dynamicclients/client.go b/pkg/client/redhatsso/dynamicclients/client.go
@@ -1,3 +1,4 @@
+// Package dynamicclients ...
 package dynamicclients
 
 import (

diff --git a/pkg/client/redhatsso/serviceaccounts/client.go b/pkg/client/redhatsso/serviceaccounts/client.go
@@ -1,3 +1,4 @@
+// Package serviceaccounts ...
 package serviceaccounts
 
 import (

diff --git a/pkg/client/redhatsso/sso_auth_http_client.go b/pkg/client/redhatsso/sso_auth_http_client.go
@@ -1,3 +1,4 @@
+// Package redhatsso ...
 package redhatsso
 
 import (

diff --git a/pkg/cmd/migrate/cmd.go b/pkg/cmd/migrate/cmd.go
@@ -1,3 +1,4 @@
+// Package migrate ...
 package migrate
 
 import (

diff --git a/pkg/cmd/serve/cmd.go b/pkg/cmd/serve/cmd.go
@@ -1,3 +1,4 @@
+// Package serve ...
 package serve
 
 import (

diff --git a/pkg/constants/operators.go b/pkg/constants/operators.go
@@ -1,3 +1,4 @@
+// Package constants ...
 package constants
 
 // CentralOperatorNamespace ...

diff --git a/pkg/db/config.go b/pkg/db/config.go
@@ -1,3 +1,4 @@
+// Package db ...
 package db
 
 import (

diff --git a/pkg/environments/config.go b/pkg/environments/config.go
@@ -1,3 +1,4 @@
+// Package environments ...
 package environments
 
 // EnvName ...

diff --git a/pkg/errors/errors.go b/pkg/errors/errors.go
@@ -1,3 +1,4 @@
+// Package errors ...
 package errors
 
 import (

diff --git a/pkg/handlers/errors.go b/pkg/handlers/errors.go
@@ -1,3 +1,4 @@
+// Package handlers ...
 package handlers
 
 import (

diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go
@@ -1,3 +1,4 @@
+// Package logger ...
 package logger
 
 import (

diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -1,3 +1,4 @@
+// Package metrics ...
 package metrics
 
 import (

diff --git a/pkg/providers/core.go b/pkg/providers/core.go
@@ -1,3 +1,4 @@
+// Package providers ...
 package providers
 
 import (

diff --git a/pkg/quotamanagement/account.go b/pkg/quotamanagement/account.go
@@ -1,3 +1,4 @@
+// Package quotamanagement ...
 package quotamanagement
 
 // Account ...

diff --git a/pkg/server/api_server.go b/pkg/server/api_server.go
@@ -1,3 +1,4 @@
+// Package server ...
 package server
 
 import (

diff --git a/pkg/server/logging/formatter.go b/pkg/server/logging/formatter.go
@@ -1,3 +1,4 @@
+// Package logging ...
 package logging
 
 import "net/http"

diff --git a/pkg/services/account/account_mock.go b/pkg/services/account/account_mock.go
@@ -1,3 +1,4 @@
+// Package account ...
 package account
 
 import (

diff --git a/pkg/services/authorization/authorization.go b/pkg/services/authorization/authorization.go
@@ -1,3 +1,4 @@
+// Package authorization ...
 package authorization
 
 import (