Use linting rules from topaz and update formatting with gofumpt

carabasdaniel · carabasdaniel · commit 11440b6990cf · 2025-04-15T10:43:44.000+03:00
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -28,54 +28,56 @@ linters:
     - wrapcheck
 
   settings:
+    cyclop:
+      max-complexity: 12
+
+    errcheck:
+      exclude-functions:
+        - fmt.Fprint
+        - fmt.Fprintf
+        - fmt.Fprintln
+        - os.Close
+
+    funlen:
+      lines: 80
+      statements: 60
+      ignore-comments: true
+
+    gomoddirectives:
+      replace-local: true
+
+    gosec:
+      excludes:
+        - G104  # Errors unhandled
+        - G304  # Potential file inclusion via variable (see https://github.com/golang/go/issues/67002)
+
     ireturn:
       allow:
         - error
         - empty
+        - stdlib
         - generic
         - proto.Message
-        - plugins.Plugin
-        - stdlib
         - v3.ImporterClient
-    gomoddirectives:
-      replace-local: true
+
     lll:
-      line-length: 140 # a lot of parameter lines over 130 characters
-    dupl:
-      threshold: 100
-    funlen:
-      lines: 100
-      statements: 80
-      ignore-comments: true
-    goconst:
-      min-len: 2
-      min-occurrences: 2
-    gocritic:
-      enabled-tags:
-        - diagnostic
-        - experimental
-        - opinionated
-        - performance
-        - style
-      disabled-checks:
-        - dupImport # https://github.com/go-critic/go-critic/issues/845
-        - ifElseChain
-        - octalLiteral
-        - whyNoLint
-        - wrapperFunc
-    cyclop:
-      max-complexity: 12    
-    govet:
-      settings:
-        printf:
-          funcs:
-            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
-            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
-            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
-            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
-    misspell:
-      locale: US
-    nolintlint:
-      allow-unused: false # report any unused nolint directives
-      require-explanation: false # don't require an explanation for nolint directives
-      require-specific: false # don't require nolint directives to be specific about which linter is being skipped
+      line-length: 150
+
+    recvcheck:
+      exclusions:
+        - "*.Map"
+
+    tagliatelle:
+      case:
+        rules:
+          json: snake
+          yaml: snake
+
+  exclusions:
+    generated: lax
+
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
diff --git a/plugins/auth0/pkg/app/constants.go b/plugins/auth0/pkg/app/constants.go
@@ -1,6 +1,8 @@
 package app
 
-const AppName = "ds-load-auth0"
-const AppDescription = "auth0 directory loader"
+const (
+	AppName        = "ds-load-auth0"
+	AppDescription = "auth0 directory loader"
+)
 
 const auth0prefix string = "auth0|"
diff --git a/plugins/azuread/pkg/app/cli.go b/plugins/azuread/pkg/app/cli.go
@@ -32,7 +32,8 @@ func (cmd *VersionCmd) Run() error {
 }
 
 func createAzureAdClient(ctx context.Context,
-	tenant, clientID, clientSecret, refreshToken string) (*azureclient.AzureADClient, error) {
+	tenant, clientID, clientSecret, refreshToken string,
+) (*azureclient.AzureADClient, error) {
 	if refreshToken != "" {
 		return azureclient.NewAzureADClientWithRefreshToken(
 			ctx,
diff --git a/plugins/azuread/pkg/app/constants.go b/plugins/azuread/pkg/app/constants.go
@@ -1,4 +1,6 @@
 package app
 
-const AppName = "ds-load-azuread"
-const AppDescription = "AzureAD directory loader"
+const (
+	AppName        = "ds-load-azuread"
+	AppDescription = "AzureAD directory loader"
+)
diff --git a/plugins/azuread/pkg/azureclient/credential.go b/plugins/azuread/pkg/azureclient/credential.go
@@ -23,7 +23,8 @@ type RefreshTokenCredential struct {
 }
 
 func NewRefreshTokenCredential(ctx context.Context,
-	tenantID, clientID, clientSecret, refreshToken string) (*RefreshTokenCredential, error) {
+	tenantID, clientID, clientSecret, refreshToken string,
+) (*RefreshTokenCredential, error) {
 	c := &RefreshTokenCredential{
 		clientID:     clientID,
 		clientSecret: clientSecret,
diff --git a/plugins/azureadb2c/pkg/app/cli.go b/plugins/azureadb2c/pkg/app/cli.go
@@ -32,7 +32,8 @@ func (cmd *VersionCmd) Run() error {
 }
 
 func createAzureAdClient(ctx context.Context,
-	tenant, clientID, clientSecret, refreshToken string) (*azureclient.AzureADClient, error) {
+	tenant, clientID, clientSecret, refreshToken string,
+) (*azureclient.AzureADClient, error) {
 	if refreshToken != "" {
 		return azureclient.NewAzureADClientWithRefreshToken(
 			ctx,
diff --git a/plugins/azureadb2c/pkg/app/constants.go b/plugins/azureadb2c/pkg/app/constants.go
@@ -1,4 +1,6 @@
 package app
 
-const AppName = "ds-load-azureadb2c"
-const AppDescription = "AzureAD B2C directory loader"
+const (
+	AppName        = "ds-load-azureadb2c"
+	AppDescription = "AzureAD B2C directory loader"
+)
diff --git a/plugins/azureadb2c/pkg/azureclient/credential.go b/plugins/azureadb2c/pkg/azureclient/credential.go
@@ -23,7 +23,8 @@ type RefreshTokenCredential struct {
 }
 
 func NewRefreshTokenCredential(ctx context.Context,
-	tenantID, clientID, clientSecret, refreshToken string) (*RefreshTokenCredential, error) {
+	tenantID, clientID, clientSecret, refreshToken string,
+) (*RefreshTokenCredential, error) {
 	c := &RefreshTokenCredential{
 		clientID:     clientID,
 		clientSecret: clientSecret,
diff --git a/plugins/cognito/pkg/app/constants.go b/plugins/cognito/pkg/app/constants.go
@@ -1,4 +1,6 @@
 package app
 
-const AppName = "ds-load-cognito"
-const AppDescription = "Cognito directory loader"
+const (
+	AppName        = "ds-load-cognito"
+	AppDescription = "Cognito directory loader"
+)
diff --git a/plugins/fusionauth/pkg/app/constants.go b/plugins/fusionauth/pkg/app/constants.go
@@ -1,4 +1,6 @@
 package app
 
-const AppName = "ds-load-fusionauth"
-const AppDescription = "FusionAuth directory loader"
+const (
+	AppName        = "ds-load-fusionauth"
+	AppDescription = "FusionAuth directory loader"
+)
diff --git a/plugins/google/pkg/app/constants.go b/plugins/google/pkg/app/constants.go
@@ -1,4 +1,6 @@
 package app
 
-const AppName = "ds-load-google"
-const AppDescription = "Google Workspace directory loader"
+const (
+	AppName        = "ds-load-google"
+	AppDescription = "Google Workspace directory loader"
+)
diff --git a/plugins/jumpcloud/pkg/fetch/fetch.go b/plugins/jumpcloud/pkg/fetch/fetch.go
@@ -71,7 +71,8 @@ func (f *Fetcher) Fetch(ctx context.Context, outputWriter, errorWriter io.Writer
 func (f *Fetcher) fetchGroups(ctx context.Context,
 	writer *js.JSONArrayWriter,
 	errorWriter io.Writer,
-	idLookup map[string]*jc.BaseUser) error {
+	idLookup map[string]*jc.BaseUser,
+) error {
 	groups, err := f.jcc.ListGroups(ctx, jc.UserGroups)
 	if err != nil {
 		common.WriteErrorWithExitCode(errorWriter, err, 1)
diff --git a/plugins/jumpcloud/pkg/jc/jc.go b/plugins/jumpcloud/pkg/jc/jc.go
@@ -64,7 +64,7 @@ func (c *JumpCloudClient) ListUsers(ctx context.Context) ([]*User, error) {
 
 	users := struct {
 		Results    []*User `json:"results"`
-		TotalCount int     `json:"totalCount"`
+		TotalCount int     `json:"totalCount"` //nolint:tagliatelle // keep jc format
 	}{}
 
 	if err := makeHTTPRequest(ctx, url, http.MethodPost, c.headers, nil, nil, &users); err != nil {
@@ -236,7 +236,8 @@ func makeHTTPRequest[T any](
 	headers map[string]string,
 	queryParams url.Values,
 	body io.Reader,
-	resp T) error {
+	resp T,
+) error {
 	client := http.Client{}
 
 	u, err := url.Parse(reqURL)
diff --git a/plugins/jumpcloud/pkg/jc/jc_test.go b/plugins/jumpcloud/pkg/jc/jc_test.go
@@ -1,4 +1,3 @@
-//nolint:dupl // duplicate for testing
 package jc_test
 
 import (
@@ -12,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-const JcAPIKey string = "JC_API_KEY" //nolint: gosec // no hardcoded credentials.
+const JcAPIKey string = "JC_API_KEY" //nolint:gosec // no hardcoded credentials.
 
 func TestMain(m *testing.M) {
 	if os.Getenv(JcAPIKey) == "" {
diff --git a/plugins/ldap/pkg/app/constants.go b/plugins/ldap/pkg/app/constants.go
@@ -1,4 +1,6 @@
 package app
 
-const AppName = "ds-load-ldap"
-const AppDescription = "ldap directory loader"
+const (
+	AppName        = "ds-load-ldap"
+	AppDescription = "ldap directory loader"
+)
diff --git a/plugins/okta/pkg/app/constants.go b/plugins/okta/pkg/app/constants.go
@@ -1,4 +1,6 @@
 package app
 
-const AppName = "ds-load-okta"
-const AppDescription = "okta directory loader"
+const (
+	AppName        = "ds-load-okta"
+	AppDescription = "okta directory loader"
+)
diff --git a/plugins/okta/pkg/fetch/fetch.go b/plugins/okta/pkg/fetch/fetch.go
@@ -1,4 +1,4 @@
-//nolint: dupl // similar code in getting group details
+//nolint:dupl // similar code in getting group details
 package fetch
 
 import (
diff --git a/plugins/openapi/pkg/openapi/openapi.go b/plugins/openapi/pkg/openapi/openapi.go
@@ -26,14 +26,14 @@ type API struct {
 	Service     string `json:"service"`
 	Method      string `json:"method"`
 	Path        string `json:"path"`
-	DisplayName string `json:"displayName"`
+	DisplayName string `json:"displayName"` //nolint:tagliatelle // keep open api format
 	ID          string `json:"id"`
 	ServiceID   string `json:"serviceID"` //nolint:tagliatelle // keep open api format
 }
 
 type Service struct {
 	Type        string `json:"type"`
-	DisplayName string `json:"displayName"`
+	DisplayName string `json:"displayName"` //nolint:tagliatelle // keep open api format
 	ID          string `json:"id"`
 }
 
diff --git a/sdk/transform/functions.go b/sdk/transform/functions.go
@@ -74,8 +74,8 @@ func marshal(v any) string {
 
 func fromEnv(key, envName string) string {
 	value := os.Getenv(envName)
-	strValue, err := json.Marshal(value)
 
+	strValue, err := json.Marshal(value)
 	if err != nil {
 		log.Error().Err(err).Msg("failed to marshal value")
 	}

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ func (cmd *VersionCmd) Run() error {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`func createAzureAdClient(ctx context.Context,`
`35`		`- tenant, clientID, clientSecret, refreshToken string) (*azureclient.AzureADClient, error) {`
	`35`	`+ tenant, clientID, clientSecret, refreshToken string,`
	`36`	`+) (*azureclient.AzureADClient, error) {`
`36`	`37`	`if refreshToken != "" {`
`37`	`38`	`return azureclient.NewAzureADClientWithRefreshToken(`
`38`	`39`	`ctx,`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ type RefreshTokenCredential struct {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`func NewRefreshTokenCredential(ctx context.Context,`
`26`		`- tenantID, clientID, clientSecret, refreshToken string) (*RefreshTokenCredential, error) {`
	`26`	`+ tenantID, clientID, clientSecret, refreshToken string,`
	`27`	`+) (*RefreshTokenCredential, error) {`
`27`	`28`	`c := &RefreshTokenCredential{`
`28`	`29`	`clientID: clientID,`
`29`	`30`	`clientSecret: clientSecret,`