chore: re-enable terraform caching

ammario · ammario · commit 3445b4ffe37a · 2023-05-09T21:35:04.000Z
why was this disabled???
diff --git 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
@@ -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/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),
 	)

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ func Install(ctx context.Context, log slog.Logger, dir string, wantVersion *vers`
`62`	`62`	`log.Debug(`
`63`	`63`	`ctx,`
`64`	`64`	`"installing terraform",`
	`65`	`+ slog.F("prev_version", hasVersion),`
`65`	`66`	`slog.F("dir", dir),`
`66`	`67`	`slog.F("version", TerraformVersion),`
`67`	`68`	`)`