coder · coadler · Mar 17, 2022 · Mar 16, 2022 · Mar 17, 2022 · Mar 17, 2022
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -79,7 +79,7 @@ jobs:
       - name: Install Protoc
         uses: arduino/setup-protoc@v1
         with:
-          version: "3.6.1"
+          version: "3.19.4"
       - uses: actions/setup-go@v2
         with:
           go-version: "^1.17"
@@ -370,4 +370,4 @@ jobs:
           DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
           DD_CATEGORY: e2e
           GIT_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
-        run: go run scripts/datadog-cireport/main.go site/test-results/junit.xml
+        run: go run scripts/datadog-cireport/main.go site/test-results/junit.xml
diff --git a/.golangci.yml b/.golangci.yml
@@ -184,13 +184,15 @@ linters-settings:
       - r
       - i
       - db
+      - t
     # Optional list of variable declarations that should be ignored completely. (defaults to empty list)
     # Entries must be in the form of "<variable name> <type>" or "<variable name> *<type>" for
     # variables, or "const <name>" for constants.
     ignore-decls:
       - rw http.ResponseWriter
       - r *http.Request
       - t testing.T
+      - t testing.TB
 
 issues:
   # Rules listed here: https://github.com/securego/gosec#available-rules

diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -27,8 +27,8 @@ type Options struct {
 
 // New constructs the Coder API into an HTTP handler.
 //
-// A wait function is returned to handle awaiting closure
-// of hijacked HTTP requests.
+// A wait function is returned to handle awaiting closure of hijacked HTTP
+// requests.
 func New(options *Options) (http.Handler, func()) {
 	api := &api{
 		Options: options,

diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -61,7 +61,7 @@ func New(t *testing.T, options *Options) *codersdk.Client {
 		t.Cleanup(func() {
 			_ = sqlDB.Close()
 		})
-		err = database.Migrate(sqlDB)
+		err = database.MigrateUp(sqlDB)
 		require.NoError(t, err)
 		db = database.New(sqlDB)
 

diff --git a/database/dump.sql b/database/dump.sql
diff --git a/database/dump/main.go b/database/dump/main.go
@@ -24,7 +24,7 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	err = database.Migrate(db)
+	err = database.MigrateUp(db)
 	if err != nil {
 		panic(err)
 	}