Write startup script logs to fs dir

kylecarbs · kylecarbs · commit 8c289e505eb3 · 2022-11-13T18:32:57.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -376,7 +376,11 @@ func (a *agent) runStartupScript(ctx context.Context, script string) error {
 	}
 
 	a.logger.Info(ctx, "running startup script", slog.F("script", script))
-	writer, err := os.OpenFile(filepath.Join(os.TempDir(), "coder-startup-script.log"), os.O_CREATE|os.O_RDWR, 0o600)
+	tempDir, err := afero.TempDir(a.filesystem, "", "")
+	if err != nil {
+		return xerrors.Errorf("create temp dir: %w", err)
+	}
+	writer, err := a.filesystem.OpenFile(filepath.Join(tempDir, "coder-startup-script.log"), os.O_CREATE|os.O_RDWR, 0o600)
 	if err != nil {
 		return xerrors.Errorf("open startup script log file: %w", err)
 	}
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -681,6 +681,7 @@ func setupAgent(t *testing.T, metadata codersdk.WorkspaceAgentMetadata, ptyTimeo
 			statsChan:   statsCh,
 			coordinator: coordinator,
 		},
+		Filesystem:             afero.NewMemMapFs(),
 		Logger:                 slogtest.Make(t, nil).Leveled(slog.LevelDebug),
 		ReconnectingPTYTimeout: ptyTimeout,
 	})

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,11 @@ func (a *agent) runStartupScript(ctx context.Context, script string) error {`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`a.logger.Info(ctx, "running startup script", slog.F("script", script))`
`379`		`- writer, err := os.OpenFile(filepath.Join(os.TempDir(), "coder-startup-script.log"), os.O_CREATE\|os.O_RDWR, 0o600)`
	`379`	`+ tempDir, err := afero.TempDir(a.filesystem, "", "")`
	`380`	`+ if err != nil {`
	`381`	`+ return xerrors.Errorf("create temp dir: %w", err)`
	`382`	`+ }`
	`383`	`+ writer, err := a.filesystem.OpenFile(filepath.Join(tempDir, "coder-startup-script.log"), os.O_CREATE\|os.O_RDWR, 0o600)`
`380`	`384`	`if err != nil {`
`381`	`385`	`return xerrors.Errorf("open startup script log file: %w", err)`
`382`	`386`	`}`