Merge branch 'main' into workspaceagent

kylecarbs · kylecarbs · commit 30189aac7ae4 · 2022-02-19T04:08:24.000Z
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -122,7 +122,7 @@ jobs:
         os:
           - ubuntu-latest
           - macos-latest
-          - windows-latest
+          - windows-2022
     steps:
       - uses: actions/checkout@v2
 
@@ -138,9 +138,9 @@ jobs:
             ~/.cache/go-build
             ~/Library/Caches/go-build
             %LocalAppData%\go-build
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          key: ${{ matrix.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
-            ${{ runner.os }}-go-
+            ${{ matrix.os }}-go-
 
       - run: go install gotest.tools/gotestsum@latest
 
@@ -150,11 +150,13 @@ jobs:
           terraform_wrapper: false
 
       - name: Test with Mock Database
+        shell: bash
         env:
+          GOCOUNT: ${{ runner.os == 'Windows' && 3 || 5 }}
           GOMAXPROCS: ${{ runner.os == 'Windows' && 1 || 2 }}
         run: gotestsum --junitfile="gotests.xml" --packages="./..." --
-          -covermode=atomic -coverprofile="gotests.coverage" -failfast
-          -timeout=3m -count=5 -race -short
+          -covermode=atomic -coverprofile="gotests.coverage"
+          -timeout=3m -count=$GOCOUNT -race -short -failfast
 
       - name: Upload DataDog Trace
         if: (success() || failure()) && github.actor != 'dependabot[bot]'
@@ -171,7 +173,7 @@ jobs:
           -count=1 -race -parallel=2 -failfast
 
       - name: Upload DataDog Trace
-        if: (success() || failure()) && github.actor != 'dependabot[bot]'
+        if: (success() || failure()) && github.actor != 'dependabot[bot]' && runner.os == 'Linux'
         env:
           DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
           DD_DATABASE: postgresql
diff --git a/peer/conn.go b/peer/conn.go
@@ -183,12 +183,15 @@ func (c *Conn) init() error {
 		}
 	})
 	c.rtc.OnConnectionStateChange(func(peerConnectionState webrtc.PeerConnectionState) {
-		if c.isClosed() {
-			// Make sure we don't log after Close() has been called.
-			return
-		}
-		c.opts.Logger.Debug(context.Background(), "rtc connection updated",
-			slog.F("state", peerConnectionState))
+		go func() {
+			c.closeMutex.Lock()
+			defer c.closeMutex.Unlock()
+			if c.isClosed() {
+				return
+			}
+			c.opts.Logger.Debug(context.Background(), "rtc connection updated",
+				slog.F("state", peerConnectionState))
+		}()
 
 		switch peerConnectionState {
 		case webrtc.PeerConnectionStateDisconnected:
diff --git a/pty/start_other.go b/pty/start_other.go
@@ -9,13 +9,17 @@ import (
 	"syscall"
 
 	"github.com/creack/pty"
+	"golang.org/x/xerrors"
 )
 
 func startPty(cmd *exec.Cmd) (PTY, *os.Process, error) {
 	ptty, tty, err := pty.Open()
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, xerrors.Errorf("open: %w", err)
 	}
+	defer func() {
+		_ = tty.Close()
+	}()
 	cmd.SysProcAttr = &syscall.SysProcAttr{
 		Setsid:  true,
 		Setctty: true,
@@ -26,7 +30,7 @@ func startPty(cmd *exec.Cmd) (PTY, *os.Process, error) {
 	err = cmd.Start()
 	if err != nil {
 		_ = ptty.Close()
-		return nil, nil, err
+		return nil, nil, xerrors.Errorf("start: %w", err)
 	}
 	oPty := &otherPty{
 		pty: ptty,
diff --git a/site/nextrouter/nextrouter.go b/site/nextrouter/nextrouter.go
@@ -49,10 +49,7 @@ func Handler(fileSystem fs.FS, options *Options) (http.Handler, error) {
 	}
 
 	// Fallback to static file server for non-HTML files
-	// Non-HTML files don't have special routing rules, so we can just leverage
-	// the built-in http.FileServer for it.
-	fileHandler := http.FileServer(http.FS(fileSystem))
-	router.NotFound(fileHandler.ServeHTTP)
+	router.NotFound(FileHandler(fileSystem))
 
 	// Finally, if there is a 404.html available, serve that
 	err = register404(fileSystem, router, *options)
@@ -64,6 +61,31 @@ func Handler(fileSystem fs.FS, options *Options) (http.Handler, error) {
 	return router, nil
 }
 
+// FileHandler serves static content, additionally adding immutable
+// cache-control headers for Next.js content
+func FileHandler(fileSystem fs.FS) func(writer http.ResponseWriter, request *http.Request) {
+	// Non-HTML files don't have special routing rules, so we can just leverage
+	// the built-in http.FileServer for it.
+	fileHandler := http.FileServer(http.FS(fileSystem))
+
+	return func(writer http.ResponseWriter, request *http.Request) {
+		// From the Next.js documentation:
+		//
+		// "Caching improves response times and reduces the number
+		// of requests to external services. Next.js automatically
+		// adds caching headers to immutable assets served from
+		// /_next/static including JavaScript, CSS, static images,
+		// and other media."
+		//
+		// See: https://nextjs.org/docs/going-to-production
+		if strings.HasPrefix(request.URL.Path, "/_next/static/") {
+			writer.Header().Add("Cache-Control", "public, max-age=31536000, immutable")
+		}
+
+		fileHandler.ServeHTTP(writer, request)
+	}
+}
+
 // registerRoutes recursively traverses the file-system, building routes
 // as appropriate for respecting NextJS dynamic rules.
 func registerRoutes(rtr chi.Router, fileSystem fs.FS, options Options) error {
diff --git a/site/nextrouter/nextrouter_test.go b/site/nextrouter/nextrouter_test.go
@@ -376,6 +376,42 @@ func TestNextRouter(t *testing.T) {
 		require.EqualValues(t, "test-create", body)
 	})
 
+	t.Run("Caching headers for _next resources", func(t *testing.T) {
+		t.Parallel()
+
+		rootFS := fstest.MapFS{
+			"index.html": &fstest.MapFile{
+				Data: []byte("test-root"),
+			},
+			"_next/static/test.js": &fstest.MapFile{
+				Data: []byte("test.js cached forever"),
+			},
+			"_next/static/chunks/app/test.css": &fstest.MapFile{
+				Data: []byte("test.css cached forever"),
+			},
+		}
+
+		router, err := nextrouter.Handler(rootFS, nil)
+		require.NoError(t, err)
+
+		server := httptest.NewServer(router)
+		t.Cleanup(server.Close)
+
+		res, err := request(server, "/index.html")
+		require.NoError(t, err)
+		require.NoError(t, res.Body.Close())
+
+		require.Equal(t, http.StatusOK, res.StatusCode)
+		require.Empty(t, res.Header.Get("Cache-Control"))
+
+		res, err = request(server, "/_next/static/test.js")
+		require.NoError(t, err)
+		require.NoError(t, res.Body.Close())
+
+		require.Equal(t, http.StatusOK, res.StatusCode)
+		require.Equal(t, "public, max-age=31536000, immutable", res.Header.Get("Cache-Control"))
+	})
+
 	t.Run("Injects template parameters", func(t *testing.T) {
 		t.Parallel()
 
