diff --git a/Makefile b/Makefile
index d6e0418a0ba28..0ed464ba23a80 100644
--- a/Makefile
+++ b/Makefile
@@ -460,7 +460,7 @@ ifdef FILE
# Format single file
if [[ -f "$(FILE)" ]] && [[ "$(FILE)" == *.go ]] && ! grep -q "DO NOT EDIT" "$(FILE)"; then \
echo "$(GREEN)==>$(RESET) $(BOLD)fmt/go$(RESET) $(FILE)"; \
- go run mvdan.cc/gofumpt@v0.4.0 -w -l "$(FILE)"; \
+ go run mvdan.cc/gofumpt@v0.8.0 -w -l "$(FILE)"; \
fi
else
go mod tidy
@@ -468,8 +468,8 @@ else
# VS Code users should check out
# https://github.com/mvdan/gofumpt#visual-studio-code
find . $(FIND_EXCLUSIONS) -type f -name '*.go' -print0 | \
- xargs -0 grep --null -L "DO NOT EDIT" | \
- xargs -0 go run mvdan.cc/gofumpt@v0.4.0 -w -l
+ xargs -0 grep -E --null -L '^// Code generated .* DO NOT EDIT\.$$' | \
+ xargs -0 go run mvdan.cc/gofumpt@v0.8.0 -w -l
endif
.PHONY: fmt/go
diff --git a/agent/agentcontainers/dcspec/gen.sh b/agent/agentcontainers/dcspec/gen.sh
index 276cb24cb4123..056fd218fd247 100755
--- a/agent/agentcontainers/dcspec/gen.sh
+++ b/agent/agentcontainers/dcspec/gen.sh
@@ -61,7 +61,7 @@ fi
exec 3>&-
# Format the generated code.
-go run mvdan.cc/gofumpt@v0.4.0 -w -l "${TMPDIR}/${DEST_FILENAME}"
+go run mvdan.cc/gofumpt@v0.8.0 -w -l "${TMPDIR}/${DEST_FILENAME}"
# Add a header so that Go recognizes this as a generated file.
if grep -q -- "\[-i extension\]" < <(sed -h 2>&1); then
diff --git a/cli/configssh.go b/cli/configssh.go
index c1be60b604a9e..b12b9d5c3d5cd 100644
--- a/cli/configssh.go
+++ b/cli/configssh.go
@@ -446,7 +446,7 @@ func (r *RootCmd) configSSH() *serpent.Command {
if !bytes.Equal(configRaw, configModified) {
sshDir := filepath.Dir(sshConfigFile)
- if err := os.MkdirAll(sshDir, 0700); err != nil {
+ if err := os.MkdirAll(sshDir, 0o700); err != nil {
return xerrors.Errorf("failed to create directory %q: %w", sshDir, err)
}
diff --git a/cli/configssh_test.go b/cli/configssh_test.go
index 1ffe93a7b838c..7e42bfe81a799 100644
--- a/cli/configssh_test.go
+++ b/cli/configssh_test.go
@@ -204,10 +204,11 @@ func TestConfigSSH_MissingDirectory(t *testing.T) {
_, err = os.Stat(sshConfigPath)
require.NoError(t, err, "config file should exist")
- // Check that the directory has proper permissions (0700)
+ // Check that the directory has proper permissions (rwx for owner, none for
+ // group and everyone)
sshDirInfo, err := os.Stat(sshDir)
require.NoError(t, err)
- require.Equal(t, os.FileMode(0700), sshDirInfo.Mode().Perm(), "directory should have 0700 permissions")
+ require.Equal(t, os.FileMode(0o700), sshDirInfo.Mode().Perm(), "directory should have rwx------ permissions")
}
func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {
@@ -358,7 +359,8 @@ func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {
strings.Join([]string{
headerEnd,
"",
- }, "\n")},
+ }, "\n"),
+ },
},
args: []string{"--ssh-option", "ForwardAgent=yes"},
matches: []match{
@@ -383,7 +385,8 @@ func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {
strings.Join([]string{
headerEnd,
"",
- }, "\n")},
+ }, "\n"),
+ },
},
args: []string{"--ssh-option", "ForwardAgent=yes"},
matches: []match{
diff --git a/coderd/notifications/utils_test.go b/coderd/notifications/utils_test.go
index d27093fb63119..ce071cc6a0a53 100644
--- a/coderd/notifications/utils_test.go
+++ b/coderd/notifications/utils_test.go
@@ -94,7 +94,6 @@ func (i *dispatchInterceptor) Dispatcher(payload types.MessagePayload, title, bo
}
retryable, err = deliveryFn(ctx, msgID)
-
if err != nil {
i.err.Add(1)
i.lastErr.Store(err)
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy