diff --git a/cli/server.go b/cli/server.go index 6386a41968..2b3e78165c 100644 --- a/cli/server.go +++ b/cli/server.go @@ -243,13 +243,11 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd. notifyCtx, notifyStop := signal.NotifyContext(ctx, InterruptSignals...) defer notifyStop() - // Ensure we have a unique cache directory for this process. - cacheDir := filepath.Join(cfg.CacheDir.String(), uuid.NewString()) + cacheDir := cfg.CacheDir.String() err = os.MkdirAll(cacheDir, 0o700) if err != nil { return xerrors.Errorf("create cache directory: %w", err) } - defer os.RemoveAll(cacheDir) // Clean up idle connections at the end, e.g. // embedded-postgres can leave an idle connection diff --git a/coderd/coderd.go b/coderd/coderd.go index 8f5f3661b1..065680202c 100644 --- a/coderd/coderd.go +++ b/coderd/coderd.go @@ -5,6 +5,7 @@ import ( "crypto/tls" "crypto/x509" "encoding/json" + "flag" "fmt" "io" "net/http" @@ -878,7 +879,12 @@ func (api *API) Close() error { } func compressHandler(h http.Handler) http.Handler { - cmp := middleware.NewCompressor(5, + level := 5 + if flag.Lookup("test.v") != nil { + level = 1 + } + + cmp := middleware.NewCompressor(level, "text/*", "application/*", "image/*", diff --git a/go.sum b/go.sum index 46c7093b28..eff37e92f4 100644 --- a/go.sum +++ b/go.sum @@ -2636,7 +2636,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZa sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= software.sslmate.com/src/go-pkcs12 v0.2.0 h1:nlFkj7bTysH6VkC4fGphtjXRbezREPgrHuJG20hBGPE= -storj.io/drpc v0.0.33-0.20220622181519-9206537a4db7 h1:6jIp39oQGZMjfrG3kiafK2tcL0Fbprh2kvaoJNfhvuM= -storj.io/drpc v0.0.33-0.20220622181519-9206537a4db7/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= storj.io/drpc v0.0.33-0.20230420154621-9716137f6037 h1:SYRl2YUthhsXNkrP30KwxkDGN9TESdNrbpr14rOxsnM= storj.io/drpc v0.0.33-0.20230420154621-9716137f6037/go.mod h1:vR804UNzhBa49NOJ6HeLjd2H3MakC1j5Gv8bsOQT6N4= diff --git a/provisioner/terraform/install.go b/provisioner/terraform/install.go index 778c80e67a..fc6dbbcf80 100644 --- a/provisioner/terraform/install.go +++ b/provisioner/terraform/install.go @@ -62,6 +62,7 @@ func Install(ctx context.Context, log slog.Logger, dir string, wantVersion *vers log.Debug( ctx, "installing terraform", + slog.F("prev_version", hasVersion), slog.F("dir", dir), slog.F("version", TerraformVersion), )