coder
diff --git a/‎.golangci.yaml
Lines changed: 4 additions & 6 deletions b/‎.golangci.yaml
Lines changed: 4 additions & 6 deletions
diff --git a/‎cli/configssh.go
Lines changed: 0 additions & 1 deletion b/‎cli/configssh.go
Lines changed: 0 additions & 1 deletion
@@ -11,7 +11,7 @@ linters-settings:
       # Gradually extend to cover more of the codebase.
       - 'httpmw\.\w+'
   gocognit:
-    min-complexity: 46 # Min code complexity (def 30).
+    min-complexity: 300
 
   goconst:
     min-len: 4 # Min length of string consts (def 3).
@@ -122,10 +122,6 @@ linters-settings:
   goimports:
     local-prefixes: coder.com,cdr.dev,go.coder.com,github.com/cdr,github.com/coder
 
-  gocyclo:
-    # goal: 30
-    min-complexity: 47
-
   importas:
     no-unaliased: true
 
@@ -236,7 +232,9 @@ linters:
     - exportloopref
     - forcetypeassert
     - gocritic
-    - gocyclo
+    # gocyclo is essentially gocognit but worse.
+    # - gocyclo
+    - gocognit
     - goimports
     - gomodguard
     - gosec
 
@@ -190,7 +190,6 @@ func sshPrepareWorkspaceConfigs(ctx context.Context, client *codersdk.Client) (r
 	}
 }
 
-//nolint:gocyclo
 func (r *RootCmd) configSSH() *clibase.Cmd {
 	var (
 		sshConfigFile       string
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,6 @@ func sshPrepareWorkspaceConfigs(ctx context.Context, client *codersdk.Client) (r`
`190`	`190`	`}`
`191`	`191`	`}`
`192`	`192`
`193`		`-//nolint:gocyclo`
`194`	`193`	`func (r RootCmd) configSSH() clibase.Cmd {`
`195`	`194`	`var (`
`196`	`195`	`sshConfigFile string`