Jul 3, 2025 · Jun 27, 2025 · Jun 27, 2025 · Jun 27, 2025 · Jul 3, 2025 · Jul 3, 2025
diff --git a/Makefile b/Makefile
 # 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
 echo "$(GREEN)==>$(RESET) $(BOLD)fmt/go$(RESET)"
 # 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
 exec3>&-

 # 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 -h2>&1);then
diff --git a/cli/configssh.go b/cli/configssh.go

 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
 _, 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 have0700 permissions")
 require.Equal(t, os.FileMode(0o700), sshDirInfo.Mode().Perm(), "directory should haverwx------ permissions")
 }

 func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {
 strings.Join([]string{
 headerEnd,
 "",
 }, "\n")},
 }, "\n"),
 },
 },
 args: []string{"--ssh-option", "ForwardAgent=yes"},
 matches: []match{
 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
 }

 retryable, err = deliveryFn(ctx, msgID)

 if err != nil {
 i.err.Add(1)
 i.lastErr.Store(err)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -460,16 +460,16 @@ 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
		echo "$(GREEN)==>$(RESET) $(BOLD)fmt/go$(RESET)"
		# 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

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,7 +61,7 @@ fi
		exec3>&-

		# 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 -h2>&1);then
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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)
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 have0700 permissions")
		require.Equal(t, os.FileMode(0o700), sshDirInfo.Mode().Perm(), "directory should haverwx------ permissions")
		}

		func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {
Expand DownExpand Up		@@ -358,7 +359,8 @@ func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {
		strings.Join([]string{
		headerEnd,
		"",
		}, "\n")},
		}, "\n"),
		},
		},
		args: []string{"--ssh-option", "ForwardAgent=yes"},
		matches: []match{
Expand All		@@ -383,7 +385,8 @@ func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {
		strings.Join([]string{
		headerEnd,
		"",
		}, "\n")},
		}, "\n"),
		},
		},
		args: []string{"--ssh-option", "ForwardAgent=yes"},
		matches: []match{
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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)
Expand Down