ci: upgrade golangci-lint to v2 (#746)

Signed-off-by: Roman Dmytrenko <[email protected]>

Author: erka

.golangci.yaml

@@ -1,2 +1,46 @@
+---
+version: "2"
+
+formatters:
+  enable: []
+    # - gofumpt
+    # - gci
+
+linters:
+  default: none
+  enable:
+    - copyloopvar
+    - dupword
+    - errcheck
+    - govet
+    - ineffassign
+    - intrange
+    - misspell
+    - staticcheck
+    # - unused
+  settings:
+    staticcheck:
+      checks:
+        - "all"
+        - "-ST1000" # package comment
+        - "-ST1003" # incorrect identifier
+        - "-ST1005" # incorrectly formatted error
+        - "-QF1008" # omit embedded field from selector expression
+        - "-SA1019" # using deprecated
+  exclusions:
+    paths:
+      - tests/flagd
+
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
+
 run:
   timeout: 3m
+  build-tags:
+    - testtools
+  modules-download-mode: readonly
+
+output:
+  sort-order:
+    - file

Makefile

@@ -2,6 +2,8 @@ ALL_GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | s
 MODULE_TYPE ?= providers
 FLAGD_TESTBED = flagd-testbed
 FLAGD_SYNC = sync-testbed
+GOLANGCI_LINT_VERSION := v2.4.0
+GOBIN := $(shell go env GOBIN)
 
 workspace-init:
 	go work init
@@ -18,8 +20,8 @@ e2e:
 	go clean -testcache && go list -f '{{.Dir}}/...' -m | xargs -I{} go test -timeout=1m -tags=e2e {}
 
 lint:
-	go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
-	$(foreach module, $(ALL_GO_MOD_DIRS), ${GOPATH}/bin/golangci-lint run $(module)/...;)
+	go install -v github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
+	$(foreach module, $(ALL_GO_MOD_DIRS), ${GOBIN}/golangci-lint run $(module)/...;)
 
 new-provider:
 	mkdir ./providers/$(MODULE_NAME)

providers/flagd/pkg/configuration.go

@@ -379,7 +379,7 @@ func WithCustomSyncProvider(customSyncProvider sync.ISync) ProviderOption {
 	return WithCustomSyncProviderAndUri(customSyncProvider, defaultCustomSyncProviderUri)
 }
 
-// WithCustomSyncProvider provides a custom implementation of the sync.ISync interface used by the inProcess Service
+// WithCustomSyncProviderAndUri provides a custom implementation of the sync.ISync interface used by the inProcess Service
 // This is only useful with inProcess resolver type
 func WithCustomSyncProviderAndUri(customSyncProvider sync.ISync, customSyncProviderUri string) ProviderOption {
 	return func(p *ProviderConfiguration) {

providers/flagd/pkg/provider.go

@@ -46,7 +46,8 @@ func NewProvider(opts ...ProviderOption) (*Provider, error) {
 		provider.providerConfiguration.log)
 
 	var service IService
-	if provider.providerConfiguration.Resolver == rpc {
+	switch provider.providerConfiguration.Resolver {
+	case rpc:
 		service = rpcService.NewService(
 			rpcService.Configuration{
 				Host:            provider.providerConfiguration.Host,
@@ -59,7 +60,7 @@ func NewProvider(opts ...ProviderOption) (*Provider, error) {
 			cacheService,
 			provider.providerConfiguration.log,
 			provider.providerConfiguration.EventStreamConnectionMaxAttempts)
-	} else if provider.providerConfiguration.Resolver == inProcess {
+	case inProcess:
 		service = process.NewInProcessService(process.Configuration{
 			Host:                    provider.providerConfiguration.Host,
 			Port:                    provider.providerConfiguration.Port,
@@ -73,7 +74,7 @@ func NewProvider(opts ...ProviderOption) (*Provider, error) {
 			CustomSyncProviderUri:   provider.providerConfiguration.CustomSyncProviderUri,
 			GrpcDialOptionsOverride: provider.providerConfiguration.GrpcDialOptionsOverride,
 		})
-	} else {
+	default:
 		service = process.NewInProcessService(process.Configuration{
 			OfflineFlagSource: provider.providerConfiguration.OfflineFlagSourcePath,
 		})

providers/flagd/pkg/service/in_process/do_nothing_custom_sync_provider.go

@@ -6,7 +6,7 @@ import (
 	"github.com/open-feature/flagd/core/pkg/sync"
 )
 
-// Fake implementation of sync.ISync. Does not conform to the contract because it does not send any events to the DataSync.
+// DoNothingCustomSyncProvider is fake implementation of sync.ISync. Does not conform to the contract because it does not send any events to the DataSync.
 // Only used for unit tests.
 type DoNothingCustomSyncProvider struct {
 }
@@ -27,7 +27,7 @@ func (fps DoNothingCustomSyncProvider) ReSync(ctx context.Context, dataSync chan
 	return nil
 }
 
-// Returns an implementation of sync.ISync interface that does nothing at all.
+// NewDoNothingCustomSyncProvider returns an implementation of sync.ISync interface that does nothing at all.
 // The returned implementation does not conform to the sync.DataSync contract.
 // This is useful only for unit tests.
 func NewDoNothingCustomSyncProvider() DoNothingCustomSyncProvider {

providers/flagd/pkg/service/rpc/service.go

@@ -20,7 +20,6 @@ import (
 	flagdService "github.com/open-feature/flagd/core/pkg/service"
 	"github.com/open-feature/go-sdk-contrib/providers/flagd/internal/cache"
 	"github.com/open-feature/go-sdk-contrib/providers/flagd/internal/logger"
-	"github.com/open-feature/go-sdk/openfeature"
 	of "github.com/open-feature/go-sdk/openfeature"
 	"golang.org/x/net/context"
 	"google.golang.org/protobuf/types/known/structpb"
@@ -115,7 +114,7 @@ func (s *Service) ResolveBoolean(ctx context.Context, key string, defaultValue b
 	if s.cache.IsEnabled() {
 		fromCache, ok := s.cache.GetCache().Get(key)
 		if ok {
-			fromCacheResDetail, ok := fromCache.(openfeature.BoolResolutionDetail)
+			fromCacheResDetail, ok := fromCache.(of.BoolResolutionDetail)
 			if ok {
 				fromCacheResDetail.Reason = ReasonCached
 				return fromCacheResDetail
@@ -174,7 +173,7 @@ func (s *Service) ResolveString(ctx context.Context, key string, defaultValue st
 	if s.cache.IsEnabled() {
 		fromCache, ok := s.cache.GetCache().Get(key)
 		if ok {
-			fromCacheResDetail, ok := fromCache.(openfeature.StringResolutionDetail)
+			fromCacheResDetail, ok := fromCache.(of.StringResolutionDetail)
 			if ok {
 				fromCacheResDetail.Reason = ReasonCached
 				return fromCacheResDetail
@@ -233,7 +232,7 @@ func (s *Service) ResolveFloat(ctx context.Context, key string, defaultValue flo
 	if s.cache.IsEnabled() {
 		fromCache, ok := s.cache.GetCache().Get(key)
 		if ok {
-			fromCacheResDetail, ok := fromCache.(openfeature.FloatResolutionDetail)
+			fromCacheResDetail, ok := fromCache.(of.FloatResolutionDetail)
 			if ok {
 				fromCacheResDetail.Reason = ReasonCached
 				return fromCacheResDetail
@@ -292,7 +291,7 @@ func (s *Service) ResolveInt(ctx context.Context, key string, defaultValue int64
 	if s.cache.IsEnabled() {
 		fromCache, ok := s.cache.GetCache().Get(key)
 		if ok {
-			fromCacheResDetail, ok := fromCache.(openfeature.IntResolutionDetail)
+			fromCacheResDetail, ok := fromCache.(of.IntResolutionDetail)
 			if ok {
 				fromCacheResDetail.Reason = ReasonCached
 				return fromCacheResDetail
@@ -350,7 +349,7 @@ func (s *Service) ResolveObject(ctx context.Context, key string, defaultValue in
 	if s.cache.IsEnabled() {
 		fromCache, ok := s.cache.GetCache().Get(key)
 		if ok {
-			fromCacheResDetail, ok := fromCache.(openfeature.InterfaceResolutionDetail)
+			fromCacheResDetail, ok := fromCache.(of.InterfaceResolutionDetail)
 			if ok {
 				fromCacheResDetail.Reason = ReasonCached
 				return fromCacheResDetail
@@ -414,7 +413,7 @@ func resolve[req resolutionRequestConstraints, resp resolutionResponseConstraint
 	evalCtxF, err := structpb.NewStruct(evalCtx)
 	if err != nil {
 		logger.Error(err, "struct from evaluation context")
-		return nil, openfeature.NewParseErrorResolutionError(err.Error())
+		return nil, of.NewParseErrorResolutionError(err.Error())
 	}
 
 	res, err := resolver(ctx, connect.NewRequest(&req{
@@ -428,20 +427,20 @@ func resolve[req resolutionRequestConstraints, resp resolutionResponseConstraint
 	return res.Msg, nil
 }
 
-func handleError(err error) openfeature.ResolutionError {
+func handleError(err error) of.ResolutionError {
 	connectErr := &connect.Error{}
 	errors.As(err, &connectErr)
 	switch connectErr.Code() {
 	case connect.CodeUnavailable:
-		return openfeature.NewProviderNotReadyResolutionError(ConnectionError)
+		return of.NewProviderNotReadyResolutionError(ConnectionError)
 	case connect.CodeNotFound:
-		return openfeature.NewFlagNotFoundResolutionError(err.Error())
+		return of.NewFlagNotFoundResolutionError(err.Error())
 	case connect.CodeInvalidArgument:
-		return openfeature.NewTypeMismatchResolutionError(err.Error())
+		return of.NewTypeMismatchResolutionError(err.Error())
 	case connect.CodeDataLoss:
-		return openfeature.NewParseErrorResolutionError(err.Error())
+		return of.NewParseErrorResolutionError(err.Error())
 	}
-	return openfeature.NewGeneralResolutionError(err.Error())
+	return of.NewGeneralResolutionError(err.Error())
 }
 
 func (s *Service) EventChannel() <-chan of.Event {

providers/flagd/pkg/service/rpc/service_evaluation_test.go

@@ -173,7 +173,7 @@ func TestBooleanEvaluation(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		service := Service{
+		service := &Service{
 			cache:  test.getCache(),
 			logger: log,
 			client: test.getMockClient(),
@@ -309,7 +309,7 @@ func TestStringEvaluation(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		service := Service{
+		service := &Service{
 			cache:  test.getCache(),
 			logger: log,
 			client: test.getMockClient(),
@@ -445,7 +445,7 @@ func TestFloatEvaluation(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		service := Service{
+		service := &Service{
 			cache:  test.getCache(),
 			logger: log,
 			client: test.getMockClient(),
@@ -581,7 +581,7 @@ func TestIntEvaluation(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		service := Service{
+		service := &Service{
 			cache:  test.getCache(),
 			logger: log,
 			client: test.getMockClient(),
@@ -730,7 +730,7 @@ func TestObjectEvaluation(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		service := Service{
+		service := &Service{
 			cache:  test.getCache(),
 			logger: log,
 			client: test.getMockClient(),
@@ -742,7 +742,7 @@ func TestObjectEvaluation(t *testing.T) {
 }
 
 // validate is a generic validator
-func validate[T responseType](t *testing.T, test testStruct[T], resolutionDetail T, error of.ResolutionError, service Service) {
+func validate[T responseType](t *testing.T, test testStruct[T], resolutionDetail T, error of.ResolutionError, service *Service) {
 	if diff := cmp.Diff(
 		test.expectResponse, resolutionDetail,
 		cmpopts.IgnoreFields(of.ProviderResolutionDetail{}, "ResolutionError"),

providers/flagsmith/pkg/provider.go

@@ -28,7 +28,7 @@ func NewProvider(client *flagsmithClient.Client, opts ...ProviderOption) *Provid
 
 }
 
-// flagsmith provider does not have any hooks, returns empty slice
+// Hooks returns empty slice as flagsmith provider does not have any
 func (p *Provider) Hooks() []of.Hook {
 	return []of.Hook{}
 }
@@ -144,7 +144,7 @@ func (p *Provider) BooleanEvaluation(ctx context.Context, flag string, defaultVa
 
 	if p.usingBooleanConfigValue {
 		// Value will be true if the flag is enabled, false otherwise
-		value := !(resolutionDetails.Reason == of.DisabledReason)
+		value := resolutionDetails.Reason != of.DisabledReason
 		return of.BoolResolutionDetail{
 			Value: value,
 			ProviderResolutionDetail: of.ProviderResolutionDetail{

providers/go-feature-flag/pkg/provider_test.go

@@ -79,7 +79,7 @@ func (m *mockClient) roundTripFunc(req *http.Request) *http.Response {
 
 	m.callCount++
 	mockPath := "../testutils/mock_responses/%s.json"
-	flagName := strings.Replace(req.URL.Path, "/ofrep/v1/evaluate/flags/", "", -1)
+	flagName := strings.ReplaceAll(req.URL.Path, "/ofrep/v1/evaluate/flags/", "")
 
 	if flagName == "unauthorized" {
 		return &http.Response{

providers/harness/pkg/provider.go

@@ -43,11 +43,11 @@ func (p *Provider) Status() of.State {
 }
 
 func (p *Provider) Shutdown() {
-	p.harnessClient.Close()
+	_ = p.harnessClient.Close()
 	p.status = of.NotReadyState
 }
 
-// provider does not have any hooks, returns empty slice
+// Hooks returns empty slices as provider does not have any
 func (p *Provider) Hooks() []of.Hook {
 	return []of.Hook{}
 }