Merge branch 'main' into bryphe/feat/initial-e2e-tests

bryphe-coder · bryphe-coder · commit 5eedfbe23a0b · 2022-03-01T22:53:11.000Z
diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go
@@ -6,13 +6,18 @@ import (
 	"io/ioutil"
 	"net"
 	"os"
+	"sync"
 	"time"
 
 	"github.com/ory/dockertest/v3"
 	"github.com/ory/dockertest/v3/docker"
 	"golang.org/x/xerrors"
 )
 
+// Required to prevent port collision during container creation.
+// Super unlikely, but it happened. See: https://github.com/coder/coder/runs/5375197003
+var openPortMutex sync.Mutex
+
 // Open creates a new PostgreSQL server using a Docker container.
 func Open() (string, func(), error) {
 	pool, err := dockertest.NewPool("")
@@ -23,10 +28,12 @@ func Open() (string, func(), error) {
 	if err != nil {
 		return "", nil, xerrors.Errorf("create tempdir: %w", err)
 	}
+	openPortMutex.Lock()
 	// Pick an explicit port on the host to connect to 5432.
 	// This is necessary so we can configure the port to only use ipv4.
 	port, err := getFreePort()
 	if err != nil {
+		openPortMutex.Unlock()
 		return "", nil, xerrors.Errorf("Unable to get free port: %w", err)
 	}
 
@@ -64,8 +71,11 @@ func Open() (string, func(), error) {
 		config.RestartPolicy = docker.RestartPolicy{Name: "no"}
 	})
 	if err != nil {
+		openPortMutex.Unlock()
 		return "", nil, xerrors.Errorf("could not start resource: %w", err)
 	}
+	openPortMutex.Unlock()
+
 	hostAndPort := resource.GetHostPort("5432/tcp")
 	dbURL := fmt.Sprintf("postgres://postgres:postgres@%s/postgres?sslmode=disable", hostAndPort)
 
diff --git a/provisionerd/provisionerd_test.go b/provisionerd/provisionerd_test.go
@@ -466,15 +466,13 @@ func TestProvisionerd(t *testing.T) {
 					})
 					require.NoError(t, err)
 					<-shutdownCtx.Done()
-					err = stream.Send(&sdkproto.Provision_Response{
+					return stream.Send(&sdkproto.Provision_Response{
 						Type: &sdkproto.Provision_Response_Complete{
 							Complete: &sdkproto.Provision_Complete{
 								Error: "some error",
 							},
 						},
 					})
-					require.NoError(t, err)
-					return nil
 				},
 			}),
 		})
diff --git a/site/package.json b/site/package.json
@@ -66,7 +66,7 @@
     "ts-jest": "27.1.3",
     "ts-loader": "9.2.6",
     "ts-node": "10.5.0",
-    "typescript": "4.5.5",
+    "typescript": "4.6.2",
     "yup": "0.32.11"
   },
   "dependencies": {},
diff --git a/site/yarn.lock b/site/yarn.lock
@@ -12097,10 +12097,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@4.5.5:
-  version "4.5.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
-  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
+typescript@4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
+  integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
 
 ua-parser-js@^0.7.30:
   version "0.7.31"
