fix test

Emyrk · Emyrk · commit 1781c7c80437 · 2024-10-24T15:39:54.000-04:00
diff --git a/cli/testdata/coder_server_--help.golden b/cli/testdata/coder_server_--help.golden
@@ -145,7 +145,9 @@ INTROSPECTION / PROMETHEUS OPTIONS:
           Collect agent stats (may increase charges for metrics storage).
 
       --prometheus-collect-db-metrics bool, $CODER_PROMETHEUS_COLLECT_DB_METRICS (default: false)
-          Collect database metrics (may increase charges for metrics storage).
+          Collect database query metrics (may increase charges for metrics
+          storage). If set to false, a reduced set of database metrics are still
+          collected.
 
       --prometheus-enable bool, $CODER_PROMETHEUS_ENABLE
           Serve prometheus metrics on the address defined by prometheus address.
diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden
@@ -197,7 +197,8 @@ introspection:
       - template_name
       - username
       - workspace_name
-    # Collect database metrics (may increase charges for metrics storage).
+    # Collect database query metrics (may increase charges for metrics storage). If
+    # set to false, a reduced set of database metrics are still collected.
     # (default: false, type: bool)
     collect_db_metrics: false
   pprof:
diff --git a/enterprise/cli/testdata/coder_server_--help.golden b/enterprise/cli/testdata/coder_server_--help.golden
@@ -146,7 +146,9 @@ INTROSPECTION / PROMETHEUS OPTIONS:
           Collect agent stats (may increase charges for metrics storage).
 
       --prometheus-collect-db-metrics bool, $CODER_PROMETHEUS_COLLECT_DB_METRICS (default: false)
-          Collect database metrics (may increase charges for metrics storage).
+          Collect database query metrics (may increase charges for metrics
+          storage). If set to false, a reduced set of database metrics are still
+          collected.
 
       --prometheus-enable bool, $CODER_PROMETHEUS_ENABLE
           Serve prometheus metrics on the address defined by prometheus address.
diff --git a/enterprise/dbcrypt/dbcrypt_internal_test.go b/enterprise/dbcrypt/dbcrypt_internal_test.go
@@ -773,7 +773,7 @@ func TestEncryptDecryptField(t *testing.T) {
 
 func expectInTx(mdb *dbmock.MockStore) *gomock.Call {
 	return mdb.EXPECT().InTx(gomock.Any(), gomock.Any()).Times(1).DoAndReturn(
-		func(f func(store database.Store) error, _ *sql.TxOptions) error {
+		func(f func(store database.Store) error, _ *database.TxOptions) error {
 			return f(mdb)
 		},
 	)

Original file line number	Diff line number	Diff line change
`@@ -773,7 +773,7 @@ func TestEncryptDecryptField(t *testing.T) {`
`773`	`773`
`774`	`774`	`func expectInTx(mdb dbmock.MockStore) gomock.Call {`
`775`	`775`	`return mdb.EXPECT().InTx(gomock.Any(), gomock.Any()).Times(1).DoAndReturn(`
`776`		`- func(f func(store database.Store) error, _ *sql.TxOptions) error {`
	`776`	`+ func(f func(store database.Store) error, _ *database.TxOptions) error {`
`777`	`777`	`return f(mdb)`
`778`	`778`	`},`
`779`	`779`	`)`