deps: upgrade golangci-lint to v2 (#2118)

* deps: upgrade golangci-lint to v2

* deps: upgrade golangci-lint config to v2

* deps: update config

* chore: fix lint errors

Author: nnnkkk7

.github/workflows/pr-go.yaml

@@ -178,6 +178,6 @@ jobs:
           go-version-file: 'go.mod'
           cache: true
       - name: Install golangci-lint
-        run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+        run: go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.4.0
       - name: Lint
         run: make lint

.golangci.yml

@@ -1,36 +1,48 @@
+version: "2"
 run:
   tests: false
-linters-settings:
-  goimports:
-    # put imports beginning with prefix after 3rd-party packages;
-    # it's a comma-separated list of prefixes
-    local-prefixes: github.com/bucketeer-io/bucketeer
-  goheader:
-    # template does not contains the comment indicator '//' or '/*' '*/'
-    template: |-
-      Copyright {{mod-year-range}} The Bucketeer Authors.
-
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
 linters:
-  disable-all: true
+  default: none
   enable:
     - errcheck
     - goheader
-    - gosimple
     - govet
     - ineffassign
-    - typecheck
+    - lll
+    - staticcheck
     - unused
+  settings:
+    goheader:
+      template: |-
+        Copyright {{mod-year-range}} The Bucketeer Authors.
+
+        Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        You may obtain a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+    staticcheck:
+      checks: ["all", "-SA1019", "-ST1003","-ST1012"] # ignore deprecated, ignore poorly chosen identifier and ignore poorly chosen name for error variable
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+formatters:
+  enable:
     - gofmt
     - goimports
-    - lll
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/bucketeer-io/bucketeer
+  exclusions:
+    generated: lax

pkg/account/api/admin_account.go

@@ -415,12 +415,12 @@ func (s *AccountService) getMyOrganizations(
 	}
 	myOrgs := make([]*environmentproto.Organization, 0, len(accountsWithOrg))
 	for _, accWithOrg := range accountsWithOrg {
-		if accWithOrg.AccountV2.Disabled || accWithOrg.Organization.Disabled || accWithOrg.Organization.Archived {
+		if accWithOrg.AccountV2.Disabled || accWithOrg.Organization.Disabled || accWithOrg.Archived {
 			continue
 		}
 		// Add the organization if the account is an admin or owner.
 		// Otherwise, we check if the account is enabled in any environment in this organization.
-		if accWithOrg.AccountV2.OrganizationRole >= accountproto.AccountV2_Role_Organization_ADMIN {
+		if accWithOrg.OrganizationRole >= accountproto.AccountV2_Role_Organization_ADMIN {
 			myOrgs = append(myOrgs, accWithOrg.Organization)
 			continue
 		}
@@ -432,7 +432,7 @@ func (s *AccountService) getMyOrganizations(
 		// When the new console is ready, we will use the DisableAccount API instead,
 		// which will update the `disabled` column in the DB.
 		var enabled bool
-		for _, role := range accWithOrg.AccountV2.EnvironmentRoles {
+		for _, role := range accWithOrg.EnvironmentRoles {
 			if role.Role != accountproto.AccountV2_Role_Environment_UNASSIGNED {
 				enabled = true
 			}
@@ -449,7 +449,7 @@ func (s *AccountService) containsSystemAdminOrganization(
 	organizations []*domain.AccountWithOrganization,
 ) bool {
 	for _, org := range organizations {
-		if org.Organization.SystemAdmin {
+		if org.SystemAdmin {
 			return true
 		}
 	}

pkg/account/command/account_v2.go

@@ -223,11 +223,12 @@ func (h *accountV2CommandHandler) changeEnvironmentRoles(
 	ctx context.Context,
 	cmd *accountproto.ChangeAccountV2EnvironmentRolesCommand,
 ) error {
-	if cmd.WriteType == accountproto.ChangeAccountV2EnvironmentRolesCommand_WriteType_OVERRIDE {
+	switch cmd.WriteType {
+	case accountproto.ChangeAccountV2EnvironmentRolesCommand_WriteType_OVERRIDE:
 		if err := h.account.ChangeEnvironmentRole(cmd.Roles); err != nil {
 			return err
 		}
-	} else if cmd.WriteType == accountproto.ChangeAccountV2EnvironmentRolesCommand_WriteType_PATCH {
+	case accountproto.ChangeAccountV2EnvironmentRolesCommand_WriteType_PATCH:
 		if err := h.account.PatchEnvironmentRole(cmd.Roles); err != nil {
 			return err
 		}

pkg/account/domain/account.go

@@ -172,68 +172,68 @@ func (a *AccountV2) RemoveTeam(team string) error {
 }
 
 func (a *AccountV2) ChangeName(newName string) error {
-	a.AccountV2.Name = newName
+	a.Name = newName
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }
 
 func (a *AccountV2) ChangeFirstName(newFirstName string) error {
-	a.AccountV2.FirstName = newFirstName
+	a.FirstName = newFirstName
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }
 
 func (a *AccountV2) ChangeLastName(newLastName string) error {
-	a.AccountV2.LastName = newLastName
+	a.LastName = newLastName
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }
 
 func (a *AccountV2) ChangeLanguage(newLanguage string) error {
-	a.AccountV2.Language = newLanguage
+	a.Language = newLanguage
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }
 
 func (a *AccountV2) ChangeAvatarImageURL(url string) error {
-	a.AccountV2.AvatarImageUrl = url
+	a.AvatarImageUrl = url
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }
 
 func (a *AccountV2) ChangeAvatar(image []byte, fileType string) error {
-	a.AccountV2.AvatarImage = image
-	a.AccountV2.AvatarFileType = fileType
+	a.AvatarImage = image
+	a.AvatarFileType = fileType
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }
 
 func (a *AccountV2) ChangeTags(tags []string) error {
-	a.AccountV2.Tags = tags
+	a.Tags = tags
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }
 
 func (a *AccountV2) ChangeOrganizationRole(role proto.AccountV2_Role_Organization) error {
-	a.AccountV2.OrganizationRole = role
+	a.OrganizationRole = role
 	if role >= proto.AccountV2_Role_Organization_ADMIN {
-		a.AccountV2.EnvironmentRoles = []*proto.AccountV2_EnvironmentRole{}
+		a.EnvironmentRoles = []*proto.AccountV2_EnvironmentRole{}
 	}
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }
 
 func (a *AccountV2) ChangeEnvironmentRole(roles []*proto.AccountV2_EnvironmentRole) error {
-	a.AccountV2.EnvironmentRoles = roles
+	a.EnvironmentRoles = roles
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }
 
 func (a *AccountV2) PatchEnvironmentRole(patchRoles []*proto.AccountV2_EnvironmentRole) error {
 	for _, p := range patchRoles {
-		e := getEnvironmentRole(a.AccountV2.EnvironmentRoles, p.EnvironmentId)
+		e := getEnvironmentRole(a.EnvironmentRoles, p.EnvironmentId)
 		if e == nil {
-			a.AccountV2.EnvironmentRoles = append(a.AccountV2.EnvironmentRoles, p)
+			a.EnvironmentRoles = append(a.EnvironmentRoles, p)
 			continue
 		}
 		e.Role = p.Role
@@ -243,7 +243,7 @@ func (a *AccountV2) PatchEnvironmentRole(patchRoles []*proto.AccountV2_Environme
 }
 
 func (a *AccountV2) ChangeLastSeen(lastSeen int64) error {
-	a.AccountV2.LastSeen = lastSeen
+	a.LastSeen = lastSeen
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }
@@ -258,13 +258,13 @@ func getEnvironmentRole(roles []*proto.AccountV2_EnvironmentRole, envID string)
 }
 
 func (a *AccountV2) Enable() error {
-	a.AccountV2.Disabled = false
+	a.Disabled = false
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }
 
 func (a *AccountV2) Disable() error {
-	a.AccountV2.Disabled = true
+	a.Disabled = true
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }
@@ -291,17 +291,17 @@ func (a *AccountV2) AddSearchFilter(
 		EnvironmentId:    environmentID,
 		DefaultFilter:    defaultFilter,
 	}
-	a.AccountV2.SearchFilters = append(a.AccountV2.SearchFilters, searchFilter)
+	a.SearchFilters = append(a.SearchFilters, searchFilter)
 	a.UpdatedAt = time.Now().Unix()
 	return searchFilter, nil
 }
 
 func (a *AccountV2) DeleteSearchFilter(id string) error {
-	for i, f := range a.AccountV2.SearchFilters {
+	for i, f := range a.SearchFilters {
 		if f.Id == id {
-			a.AccountV2.SearchFilters = append(a.AccountV2.SearchFilters[:i], a.AccountV2.SearchFilters[i+1:]...)
-			if len(a.AccountV2.SearchFilters) == 0 {
-				a.AccountV2.SearchFilters = nil
+			a.SearchFilters = append(a.SearchFilters[:i], a.SearchFilters[i+1:]...)
+			if len(a.SearchFilters) == 0 {
+				a.SearchFilters = nil
 			}
 			a.UpdatedAt = time.Now().Unix()
 			return nil
@@ -311,7 +311,7 @@ func (a *AccountV2) DeleteSearchFilter(id string) error {
 }
 
 func (a *AccountV2) ChangeSearchFilterName(id string, name string) error {
-	for _, f := range a.AccountV2.SearchFilters {
+	for _, f := range a.SearchFilters {
 		if f.Id == id {
 			f.Name = name
 			a.UpdatedAt = time.Now().Unix()
@@ -322,7 +322,7 @@ func (a *AccountV2) ChangeSearchFilterName(id string, name string) error {
 }
 
 func (a *AccountV2) ChangeSearchFilterQuery(id string, query string) error {
-	for _, f := range a.AccountV2.SearchFilters {
+	for _, f := range a.SearchFilters {
 		if f.Id == id {
 			f.Query = query
 			a.UpdatedAt = time.Now().Unix()
@@ -333,7 +333,7 @@ func (a *AccountV2) ChangeSearchFilterQuery(id string, query string) error {
 }
 
 func (a *AccountV2) ChangeDefaultSearchFilter(id string, defaultFilter bool) error {
-	for _, f := range a.AccountV2.SearchFilters {
+	for _, f := range a.SearchFilters {
 		if f.Id == id {
 			// Since there is only one default setting for a filter target, set the existing default to OFF.
 			if defaultFilter {
@@ -349,7 +349,7 @@ func (a *AccountV2) ChangeDefaultSearchFilter(id string, defaultFilter bool) err
 }
 
 func (a *AccountV2) resetDefaultFilter(targetFilter proto.FilterTargetType, environmentID string) {
-	for _, f := range a.AccountV2.SearchFilters {
+	for _, f := range a.SearchFilters {
 		if f.DefaultFilter &&
 			targetFilter == f.FilterTargetType &&
 			environmentID == f.EnvironmentId {

pkg/account/domain/api_key.go

@@ -60,19 +60,19 @@ func NewAPIKey(
 }
 
 func (a *APIKey) Rename(name string) error {
-	a.APIKey.Name = name
+	a.Name = name
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }
 
 func (a *APIKey) Enable() error {
-	a.APIKey.Disabled = false
+	a.Disabled = false
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }
 
 func (a *APIKey) Disable() error {
-	a.APIKey.Disabled = true
+	a.Disabled = true
 	a.UpdatedAt = time.Now().Unix()
 	return nil
 }

pkg/api/cmd/server.go

@@ -230,9 +230,10 @@ func (s *server) Run(ctx context.Context, metrics metrics.Metrics, logger *zap.L
 	}
 
 	// Add provider-specific options
-	if pubSubType == factory.Google {
+	switch pubSubType {
+	case factory.Google:
 		factoryOpts = append(factoryOpts, factory.WithProjectID(*s.project))
-	} else if pubSubType == factory.RedisStream {
+	case factory.RedisStream:
 		redisClient, err := redisv3.NewClient(
 			*s.pubSubRedisAddr,
 			redisv3.WithPoolSize(*s.pubSubRedisPoolSize),

pkg/auth/api/api.go

@@ -418,7 +418,7 @@ func (s *authService) SwitchOrganization(
 				zap.String("organizationID", newOrganizationID),
 			)
 		}
-		accountDomain.AccountV2.OrganizationId = newOrganizationID
+		accountDomain.OrganizationId = newOrganizationID
 		token, err := s.generateToken(
 			ctx,
 			accessToken.Email,
@@ -705,7 +705,7 @@ func (s *authService) generateToken(
 	}
 
 	// Use the account's organization ID
-	organizationID := accountDomain.AccountV2.OrganizationId
+	organizationID := accountDomain.OrganizationId
 
 	// Create access token
 	timeNow := time.Now()

pkg/autoops/api/api.go

@@ -35,7 +35,6 @@ import (
 	domainevent "github.com/bucketeer-io/bucketeer/pkg/domainevent/domain"
 	experimentclient "github.com/bucketeer-io/bucketeer/pkg/experiment/client"
 	featureclient "github.com/bucketeer-io/bucketeer/pkg/feature/client"
-	ftstorage "github.com/bucketeer-io/bucketeer/pkg/feature/storage/v2"
 	v2fs "github.com/bucketeer-io/bucketeer/pkg/feature/storage/v2"
 	"github.com/bucketeer-io/bucketeer/pkg/locale"
 	"github.com/bucketeer-io/bucketeer/pkg/log"
@@ -1545,7 +1544,7 @@ func (s *AutoOpsService) ExecuteAutoOps(
 			}
 			return dt.Err()
 		}
-		ftStorage := ftstorage.NewFeatureStorage(tx)
+		ftStorage := v2fs.NewFeatureStorage(tx)
 		feature, err := ftStorage.GetFeature(contextWithTx, autoOpsRule.FeatureId, req.EnvironmentId)
 		if err != nil {
 			return err
@@ -1698,7 +1697,7 @@ func (s *AutoOpsService) executeAutoOpsNoCommand(
 			return dt.Err()
 		}
 
-		ftStorage := ftstorage.NewFeatureStorage(tx)
+		ftStorage := v2fs.NewFeatureStorage(tx)
 		feature, err := ftStorage.GetFeature(contextWithTx, autoOpsRule.FeatureId, req.EnvironmentId)
 		if err != nil {
 			return err