NotificationsYou must be signed in to change notification settings
Fork909
Star10k

Commit2dc99c8

authored

fix: correct spurious edits made during the lint fixing slog (#17113)

1 parent6bb4bdb commit2dc99c8Copy full SHA for 2dc99c8

File tree

3 files changed

+17

-29

lines changed

.golangci.yaml
cmd/coder
- main.go
scripts/migrate-test
- main.go

3 files changed

+17

-29

lines changed

`‎.golangci.yaml`

Lines changed: 4 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,30 +24,19 @@ linters-settings:`
`24`	`24`	`enabled-checks:`
`25`	`25`	`# - appendAssign`
`26`	`26`	`# - appendCombine`
`27`		`- -argOrder`
`28`	`27`	`# - assignOp`
`29`	`28`	`# - badCall`
`30`		`- -badCond`
`31`	`29`	`-badLock`
`32`	`30`	`-badRegexp`
`33`	`31`	`-boolExprSimplify`
`34`	`32`	`# - builtinShadow`
`35`	`33`	`-builtinShadowDecl`
`36`		`- -captLocal`
`37`		`- -caseOrder`
`38`		`- -codegenComment`
`39`	`34`	`# - commentedOutCode`
`40`	`35`	`-commentedOutImport`
`41`		`- -commentFormatting`
`42`		`- -defaultCaseOrder`
`43`	`36`	`-deferUnlambda`
`44`	`37`	`# - deprecatedComment`
`45`	`38`	`# - docStub`
`46`		`- -dupArg`
`47`		`- -dupBranchBody`
`48`		`- -dupCase`
`49`	`39`	`-dupImport`
`50`		`- -dupSubExpr`
`51`	`40`	`# - elseif`
`52`	`41`	`-emptyFallthrough`
`53`	`42`	`# - emptyStringTest`
`@@ -56,56 +45,43 @@ linters-settings:`
`56`	`45`	`# - exitAfterDefer`
`57`	`46`	`# - exposedSyncMutex`
`58`	`47`	`# - filepathJoin`
`59`		`- -flagDeref`
`60`		`- -flagName`
`61`	`48`	`-hexLiteral`
`62`	`49`	`# - httpNoBody`
`63`	`50`	`# - hugeParam`
`64`	`51`	`# - ifElseChain`
`65`	`52`	`# - importShadow`
`66`	`53`	`-indexAlloc`
`67`	`54`	`-initClause`
`68`		`- -mapKey`
`69`	`55`	`-methodExprCall`
`70`	`56`	`# - nestingReduce`
`71`		`- -newDeref`
`72`	`57`	`-nilValReturn`
`73`	`58`	`# - octalLiteral`
`74`		`- -offBy1`
`75`	`59`	`# - paramTypeCombine`
`76`	`60`	`# - preferStringWriter`
`77`	`61`	`# - preferWriteByte`
`78`	`62`	`# - ptrToRefParam`
`79`	`63`	`# - rangeExprCopy`
`80`	`64`	`# - rangeValCopy`
`81`		`- -regexpMust`
`82`	`65`	`-regexpPattern`
`83`	`66`	`# - regexpSimplify`
`84`	`67`	`-ruleguard`
`85`		`- -singleCaseSwitch`
`86`		`- -sloppyLen`
`87`	`68`	`# - sloppyReassign`
`88`		`- -sloppyTypeAssert`
`89`	`69`	`-sortSlice`
`90`	`70`	`-sprintfQuotedString`
`91`	`71`	`-sqlQuery`
`92`	`72`	`# - stringConcatSimplify`
`93`	`73`	`# - stringXbytes`
`94`	`74`	`# - suspiciousSorting`
`95`		`- -switchTrue`
`96`	`75`	`-truncateCmp`
`97`	`76`	`-typeAssertChain`
`98`	`77`	`# - typeDefFirst`
`99`		`- -typeSwitchVar`
`100`	`78`	`# - typeUnparen`
`101`		`- -underef`
`102`	`79`	`# - unlabelStmt`
`103`	`80`	`# - unlambda`
`104`	`81`	`# - unnamedResult`
`105`	`82`	`# - unnecessaryBlock`
`106`	`83`	`# - unnecessaryDefer`
`107`	`84`	`# - unslice`
`108`		`- -valSwap`
`109`	`85`	`-weakCond`
`110`	`86`	`# - whyNoLint`
`111`	`87`	`# - wrapperFunc`
`@@ -208,7 +184,7 @@ issues:`
`208`	`184`	`-node_modules`
`209`	`185`	`-.git`
`210`	`186`
`211`		`-skip-files:`
	`187`	`+exclude-files:`
`212`	`188`	`-scripts/rules.go`
`213`	`189`
`214`	`190`	`# Rules listed here: https://github.com/securego/gosec#available-rules`
`@@ -224,15 +200,16 @@ issues:`
`224`	`200`	`-path:scripts/*`
`225`	`201`	`linters:`
`226`	`202`	`-exhaustruct`
	`203`	`+ -path:scripts/rules.go`
	`204`	`+linters:`
	`205`	`+ -ALL`
`227`	`206`
`228`	`207`	`fix:true`
`229`	`208`	`max-issues-per-linter:0`
`230`	`209`	`max-same-issues:0`
`231`	`210`
`232`	`211`	`run:`
`233`	`212`	`timeout:10m`
`234`		`-skip-files:`
`235`		`- -scripts/rules.go`
`236`	`213`
`237`	`214`	`# Over time, add more and more linters from`
`238`	`215`	`# https://golangci-lint.run/usage/linters/ as the code improves.`

`‎cmd/coder/main.go`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,26 @@`
`1`	`1`	`package main`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+"fmt"`
	`5`	`+"os"`
`4`	`6`	`_"time/tzdata"`
`5`	`7`
	`8`	`+tea"github.com/charmbracelet/bubbletea"`
	`9`	`+`
	`10`	`+"github.com/coder/coder/v2/agent/agentexec"`
`6`	`11`	`_"github.com/coder/coder/v2/buildinfo/resources"`
`7`	`12`	`"github.com/coder/coder/v2/cli"`
`8`	`13`	`)`
`9`	`14`
`10`	`15`	`funcmain() {`
	`16`	`+iflen(os.Args)>1&&os.Args[1]=="agent-exec" {`
	`17`	`+err:=agentexec.CLI()`
	`18`	`+_,_=fmt.Fprintln(os.Stderr,err)`
	`19`	`+os.Exit(1)`
	`20`	`+}`
`11`	`21`	`// This preserves backwards compatibility with an init function that is causing grief for`
`12`	`22`	`// web terminals using agent-exec + screen. See https://github.com/coder/coder/pull/15817`
	`23`	`+tea.InitTerminal()`
`13`	`24`
`14`	`25`	`varrootCmd cli.RootCmd`
`15`	`26`	`rootCmd.RunWithSubcommands(rootCmd.AGPL())`

`‎scripts/migrate-test/main.go`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -95,12 +95,12 @@ func main() {`
`95`	`95`	`dumpBytesAfter,err:=dbtestutil.PGDumpSchemaOnly(postgresURL)`
`96`	`96`	`iferr!=nil {`
`97`	`97`	`friendlyError(os.Stderr,err,migrateFromVersion,migrateToVersion)`
`98`		`-panic("")`
	`98`	`+panic(err)`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`ifdiff:=cmp.Diff(string(dumpBytesAfter),string(stripGenPreamble(expectedSchemaAfter)));diff!="" {`
`102`	`102`	`friendlyError(os.Stderr,xerrors.Errorf("Schema differs from expected after migration: %s",diff),migrateFromVersion,migrateToVersion)`
`103`		`-panic("")`
	`103`	`+panic(err)`
`104`	`104`	`}`
`105`	`105`	`_,_=fmt.Fprintf(os.Stderr,"OK\n")`
`106`	`106`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2dc99c8

File tree

3 files changed

3 files changed

`‎.golangci.yaml`

`‎cmd/coder/main.go`

`‎scripts/migrate-test/main.go`

0 commit comments