Commit2c95a1d

authored

chore: update gofumpt from v0.4.0 to v0.8.0 (#18652)

1 parent494dccc commit2c95a1dCopy full SHA for 2c95a1d

File tree

+12

-10

lines changed

+12

-10

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -460,16 +460,16 @@ ifdef FILE`
`460`	`460`	`# Format single file`
`461`	`461`	`if [[ -f "$(FILE)" ]] && [[ "$(FILE)" == *.go ]] && ! grep -q "DO NOT EDIT" "$(FILE)"; then \`
`462`	`462`	`echo "$(GREEN)==>$(RESET) $(BOLD)fmt/go$(RESET) $(FILE)"; \`
`463`		`-go run mvdan.cc/gofumpt@v0.4.0 -w -l "$(FILE)"; \`
	`463`	`+go run mvdan.cc/gofumpt@v0.8.0 -w -l "$(FILE)"; \`
`464`	`464`	`fi`
`465`	`465`	`else`
`466`	`466`	`go mod tidy`
`467`	`467`	`echo "$(GREEN)==>$(RESET) $(BOLD)fmt/go$(RESET)"`
`468`	`468`	`# VS Code users should check out`
`469`	`469`	`# https://github.com/mvdan/gofumpt#visual-studio-code`
`470`	`470`	`find . $(FIND_EXCLUSIONS) -type f -name '*.go' -print0 \| \`
`471`		`-xargs -0 grep --null -L"DO NOT EDIT" \| \`
`472`		`-xargs -0 go run mvdan.cc/gofumpt@v0.4.0 -w -l`
	`471`	`+xargs -0 grep -E --null -L'^// Code generated .*DO NOT EDIT\.$$' \| \`
	`472`	`+xargs -0 go run mvdan.cc/gofumpt@v0.8.0 -w -l`
`473`	`473`	`endif`
`474`	`474`	`.PHONY: fmt/go`
`475`	`475`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ fi`
`61`	`61`	`exec3>&-`
`62`	`62`
`63`	`63`	`# Format the generated code.`
`64`		`-go run mvdan.cc/gofumpt@v0.4.0 -w -l"${TMPDIR}/${DEST_FILENAME}"`
	`64`	`+go run mvdan.cc/gofumpt@v0.8.0 -w -l"${TMPDIR}/${DEST_FILENAME}"`
`65`	`65`
`66`	`66`	`# Add a header so that Go recognizes this as a generated file.`
`67`	`67`	`if grep -q --"\[-i extension\]"<<(sed -h2>&1);then`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ func (r RootCmd) configSSH() serpent.Command {`
`446`	`446`
`447`	`447`	`if!bytes.Equal(configRaw,configModified) {`
`448`	`448`	`sshDir:=filepath.Dir(sshConfigFile)`
`449`		`-iferr:=os.MkdirAll(sshDir,0700);err!=nil {`
	`449`	`+iferr:=os.MkdirAll(sshDir,0o700);err!=nil {`
`450`	`450`	`returnxerrors.Errorf("failed to create directory %q: %w",sshDir,err)`
`451`	`451`	`}`
`452`	`452`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -204,10 +204,11 @@ func TestConfigSSH_MissingDirectory(t *testing.T) {`
`204`	`204`	`_,err=os.Stat(sshConfigPath)`
`205`	`205`	`require.NoError(t,err,"config file should exist")`
`206`	`206`
`207`		`-// Check that the directory has proper permissions (0700)`
	`207`	`+// Check that the directory has proper permissions (rwx for owner, none for`
	`208`	`+// group and everyone)`
`208`	`209`	`sshDirInfo,err:=os.Stat(sshDir)`
`209`	`210`	`require.NoError(t,err)`
`210`		`-require.Equal(t,os.FileMode(0700),sshDirInfo.Mode().Perm(),"directory should have0700 permissions")`
	`211`	`+require.Equal(t,os.FileMode(0o700),sshDirInfo.Mode().Perm(),"directory should haverwx------ permissions")`
`211`	`212`	`}`
`212`	`213`
`213`	`214`	`funcTestConfigSSH_FileWriteAndOptionsFlow(t*testing.T) {`
`@@ -358,7 +359,8 @@ func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {`
`358`	`359`	`strings.Join([]string{`
`359`	`360`	`headerEnd,`
`360`	`361`	`"",`
`361`		`-},"\n")},`
	`362`	`+},"\n"),`
	`363`	`+},`
`362`	`364`	`},`
`363`	`365`	`args: []string{"--ssh-option","ForwardAgent=yes"},`
`364`	`366`	`matches: []match{`
`@@ -383,7 +385,8 @@ func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {`
`383`	`385`	`strings.Join([]string{`
`384`	`386`	`headerEnd,`
`385`	`387`	`"",`
`386`		`-},"\n")},`
	`388`	`+},"\n"),`
	`389`	`+},`
`387`	`390`	`},`
`388`	`391`	`args: []string{"--ssh-option","ForwardAgent=yes"},`
`389`	`392`	`matches: []match{`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,6 @@ func (i *dispatchInterceptor) Dispatcher(payload types.MessagePayload, title, bo`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`retryable,err=deliveryFn(ctx,msgID)`
`97`		`-`
`98`	`97`	`iferr!=nil {`
`99`	`98`	`i.err.Add(1)`
`100`	`99`	`i.lastErr.Store(err)`

Comments

(0)