testserver: new methods SQLConnForUser and SQLConnForUserE

This deprecates the following pattern:
```go
testUserURL, cleanupFn := sqlutils.PGUrl(t,
	s.AdvSQLAddr(), "dbname", "username")
defer cleanupFn()
testUserDb, err := gosql.Open("postgres", testUserURL.String())
require.NoError(t, err)
defer testUserDb.Close()
```

Which can now be replaced by:
```
testUserDb := s.ApplicationLayer().SQLConnForUser(t, "username", "dbname")
```

Release note: None

Author: knz

pkg/ccl/auditloggingccl/audit_logging_test.go

@@ -10,10 +10,8 @@ package auditloggingccl
 
 import (
 	"context"
-	gosql "database/sql"
 	"fmt"
 	"math"
-	"net/url"
 	"regexp"
 	"strings"
 	"testing"
@@ -121,13 +119,7 @@ func TestSingleRoleAuditLogging(t *testing.T) {
 	rootRunner := sqlutils.MakeSQLRunner(sqlDB)
 	defer s.Stopper().Stop(context.Background())
 
-	testUserURL, cleanupFn := sqlutils.PGUrl(t,
-		s.ApplicationLayer().AdvSQLAddr(), t.Name(), url.User(username.TestUser))
-	defer cleanupFn()
-
-	testUserDb, err := gosql.Open("postgres", testUserURL.String())
-	require.NoError(t, err)
-	defer testUserDb.Close()
+	testUserDb := s.ApplicationLayer().SQLConnForUser(t, username.TestUser, "")
 	testRunner := sqlutils.MakeSQLRunner(testUserDb)
 
 	// Dummy table/user used by tests.
@@ -250,16 +242,10 @@ func TestMultiRoleAuditLogging(t *testing.T) {
 	defer cleanup()
 
 	s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{})
-	rootRunner := sqlutils.MakeSQLRunner(sqlDB)
 	defer s.Stopper().Stop(context.Background())
+	rootRunner := sqlutils.MakeSQLRunner(sqlDB)
 
-	testUserURL, cleanupFn := sqlutils.PGUrl(t,
-		s.ApplicationLayer().AdvSQLAddr(), t.Name(), url.User(username.TestUser))
-	defer cleanupFn()
-
-	testUserDb, err := gosql.Open("postgres", testUserURL.String())
-	require.NoError(t, err)
-	defer testUserDb.Close()
+	testUserDb := s.ApplicationLayer().SQLConnForUser(t, username.TestUser, "")
 	testRunner := sqlutils.MakeSQLRunner(testUserDb)
 
 	// Dummy table/user used by tests.
@@ -374,13 +360,7 @@ func TestReducedAuditConfig(t *testing.T) {
 		return nil
 	})
 
-	testUserURL, cleanupFn := sqlutils.PGUrl(t,
-		s.ApplicationLayer().AdvSQLAddr(), t.Name(), url.User(username.TestUser))
-	defer cleanupFn()
-
-	testUserDb, err := gosql.Open("postgres", testUserURL.String())
-	require.NoError(t, err)
-	defer testUserDb.Close()
+	testUserDb := s.ApplicationLayer().SQLConnForUser(t, username.TestUser, "")
 	testRunner := sqlutils.MakeSQLRunner(testUserDb)
 
 	// Set a cluster configuration.
@@ -436,9 +416,7 @@ func TestReducedAuditConfig(t *testing.T) {
 	}
 
 	// Open 2nd connection for the test user.
-	testUserDb2, err := gosql.Open("postgres", testUserURL.String())
-	require.NoError(t, err)
-	defer testUserDb2.Close()
+	testUserDb2 := s.ApplicationLayer().SQLConnForUser(t, username.TestUser, "")
 	testRunner2 := sqlutils.MakeSQLRunner(testUserDb2)
 
 	// Run a query on the new connection. The new connection will cause the reduced audit config to be re-computed.

pkg/ccl/backupccl/create_scheduled_backup_test.go

@@ -10,9 +10,7 @@ package backupccl
 
 import (
 	"context"
-	gosql "database/sql"
 	"fmt"
-	"net/url"
 	"regexp"
 	"sort"
 	"strconv"
@@ -970,18 +968,9 @@ func TestCreateBackupScheduleRequiresAdminRole(t *testing.T) {
 	defer cleanup()
 
 	th.sqlDB.Exec(t, `CREATE USER testuser`)
-	pgURL, cleanupFunc := sqlutils.PGUrl(
-		t, th.server.ApplicationLayer().AdvSQLAddr(),
-		"TestCreateSchedule-testuser", url.User("testuser"),
-	)
-	defer cleanupFunc()
-	testuser, err := gosql.Open("postgres", pgURL.String())
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, testuser.Close())
-	}()
+	testuser := th.server.ApplicationLayer().SQLConnForUser(t, "testuser", "")
 
-	_, err = testuser.Exec("CREATE SCHEDULE FOR BACKUP INTO 'somewhere' RECURRING '@daily'")
+	_, err := testuser.Exec("CREATE SCHEDULE FOR BACKUP INTO 'somewhere' RECURRING '@daily'")
 	require.Error(t, err)
 }
 

pkg/ccl/backupccl/show_test.go

@@ -10,7 +10,6 @@ package backupccl
 
 import (
 	"context"
-	gosql "database/sql"
 	"fmt"
 	"net/url"
 	"os"
@@ -681,14 +680,7 @@ func TestShowBackupPrivileges(t *testing.T) {
 	sqlDB.Exec(t, `CREATE USER testuser`)
 	sqlDB.Exec(t, `CREATE TABLE privs (a INT)`)
 
-	pgURL, cleanup := sqlutils.PGUrl(t, srv.ApplicationLayer().AdvSQLAddr(),
-		"TestShowBackupPrivileges-testuser", url.User("testuser"))
-	defer cleanup()
-	testuser, err := gosql.Open("postgres", pgURL.String())
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, testuser.Close())
-	}()
+	testuser := srv.ApplicationLayer().SQLConnForUser(t, "testuser", "")
 
 	// Make an initial backup.
 	const full = localFoo + "/full"
@@ -698,7 +690,7 @@ func TestShowBackupPrivileges(t *testing.T) {
 	// Make a second full backup using non into syntax.
 	sqlDB.Exec(t, `BACKUP TO $1;`, full)
 
-	_, err = testuser.Exec(`SHOW BACKUPS IN $1`, full)
+	_, err := testuser.Exec(`SHOW BACKUPS IN $1`, full)
 	require.True(t, testutils.IsError(err,
 		"only users with the admin role or the EXTERNALIOIMPLICITACCESS system privilege are allowed to access the specified nodelocal URI"))
 

pkg/ccl/backupccl/tenant_backup_nemesis_test.go

@@ -179,7 +179,7 @@ func TestTenantBackupNemesis(t *testing.T) {
 	g := ctxgroup.WithContext(ctx)
 	g.GoCtx(func(ctx context.Context) error {
 		pgURL, cleanupGoDB, err := sqlutils.PGUrlE(
-			tenant10.SQLAddr(), "workload-worker" /* prefix */, url.User(username.RootUser))
+			tenant10.AdvSQLAddr(), "workload-worker" /* prefix */, url.User(username.RootUser))
 		if err != nil {
 			return err
 		}

pkg/ccl/cloudccl/cloudprivilege/privileges_test.go

@@ -10,9 +10,7 @@ package cloudprivilege
 
 import (
 	"context"
-	gosql "database/sql"
 	"fmt"
-	"net/url"
 	"testing"
 
 	"github.com/cockroachdb/cockroach/pkg/base"
@@ -44,14 +42,7 @@ func TestURIRequiresAdminOrPrivilege(t *testing.T) {
 	rootDB := sqlutils.MakeSQLRunner(conn)
 
 	rootDB.Exec(t, `CREATE USER testuser`)
-	pgURL, cleanupFunc := sqlutils.PGUrl(
-		t, tc.ApplicationLayer(0).AdvSQLAddr(), "TestURIRequiresAdminRole-testuser",
-		url.User("testuser"),
-	)
-	defer cleanupFunc()
-	testuser, err := gosql.Open("postgres", pgURL.String())
-	require.NoError(t, err)
-	defer testuser.Close()
+	testuser := tc.ApplicationLayer(0).SQLConnForUser(t, username.TestUser, "")
 	rootDB.Exec(t, `CREATE TABLE foo (id INT)`)
 
 	// Grant SELECT so that EXPORT fails when checking URI privileges.

pkg/ccl/kvccl/kvfollowerreadsccl/BUILD.bazel

@@ -62,7 +62,6 @@ go_test(
         "//pkg/rpc",
         "//pkg/security/securityassets",
         "//pkg/security/securitytest",
-        "//pkg/security/username",
         "//pkg/server",
         "//pkg/settings/cluster",
         "//pkg/sql",

pkg/ccl/kvccl/kvfollowerreadsccl/followerreads_test.go

@@ -13,7 +13,6 @@ import (
 	gosql "database/sql"
 	"fmt"
 	"math"
-	"net/url"
 	"strings"
 	"testing"
 	"time"
@@ -31,7 +30,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/rpc"
-	"github.com/cockroachdb/cockroach/pkg/security/username"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql"
 	"github.com/cockroachdb/cockroach/pkg/sql/physicalplan/replicaoracle"
@@ -971,23 +969,22 @@ func TestSecondaryTenantFollowerReadsRouting(t *testing.T) {
 		// in KV so we must ensure they're not redacted.
 		systemSQL.Exec(t, `SET CLUSTER SETTING server.secondary_tenants.redact_trace.enabled = 'false'`)
 
+		dbs := make([]*gosql.DB, numNodes)
+		for i := 0; i < numNodes; i++ {
+			dbs[i] = tenants[i].SQLConn(t, "")
+		}
+
 		// Wait until all tenant servers are aware of the setting override.
 		testutils.SucceedsSoon(t, func() error {
 			settingNames := []string{
 				"kv.closed_timestamp.target_duration", "kv.closed_timestamp.side_transport_interval", "kv.closed_timestamp.propagation_slack",
 			}
 			for _, settingName := range settingNames {
 				for i := 0; i < numNodes; i++ {
-					pgURL, cleanup := sqlutils.PGUrl(t, tenants[i].SQLAddr(), "Tenant", url.User(username.RootUser))
-					defer cleanup()
-					db, err := gosql.Open("postgres", pgURL.String())
-					if err != nil {
-						t.Fatal(err)
-					}
-					defer db.Close()
+					db := dbs[i]
 
 					var val string
-					err = db.QueryRow(
+					err := db.QueryRow(
 						fmt.Sprintf("SHOW CLUSTER SETTING %s", settingName),
 					).Scan(&val)
 					require.NoError(t, err)
@@ -1003,13 +1000,7 @@ func TestSecondaryTenantFollowerReadsRouting(t *testing.T) {
 			return nil
 		})
 
-		pgURL, cleanupPGUrl := sqlutils.PGUrl(
-			t, tenants[3].SQLAddr(), "Tenant", url.User(username.RootUser),
-		)
-		defer cleanupPGUrl()
-		tenantSQLDB, err := gosql.Open("postgres", pgURL.String())
-		require.NoError(t, err)
-		defer tenantSQLDB.Close()
+		tenantSQLDB := dbs[3]
 		tenantSQL := sqlutils.MakeSQLRunner(tenantSQLDB)
 
 		tenantSQL.Exec(t, `CREATE DATABASE t`)

pkg/ccl/kvccl/kvtenantccl/upgradeccl/BUILD.bazel

@@ -16,7 +16,6 @@ go_test(
         "//pkg/roachpb",
         "//pkg/security/securityassets",
         "//pkg/security/securitytest",
-        "//pkg/security/username",
         "//pkg/server",
         "//pkg/settings/cluster",
         "//pkg/spanconfig",