testserver: rename Serving(RPC|SQL)Addr to Adv(RPC|SQL)Addr

Prior to this commit, we had methods on TestServer called
"ServingXXXAddr" but under the hood were referring to the advertised
addresses in the config struct. This was confusing.

This patch updates the name of the methods to use "Adv" to be coherent
with the field they are exposing.

Release note: None

Author: knz

pkg/bench/pgbench_test.go

@@ -113,7 +113,7 @@ func BenchmarkPgbenchExec(b *testing.B) {
 		defer s.Stopper().Stop(context.Background())
 
 		pgURL, cleanupFn := sqlutils.PGUrl(
-			b, s.ServingSQLAddr(), "benchmarkCockroach", url.User(username.RootUser))
+			b, s.AdvSQLAddr(), "benchmarkCockroach", url.User(username.RootUser))
 		pgURL.RawQuery = "sslmode=disable"
 		defer cleanupFn()
 

pkg/bench/tpcc/tpcc_bench_test.go

@@ -147,7 +147,7 @@ func (bm *benchmark) startCockroach(b testing.TB) {
 	}
 
 	pgURL, cleanup, err := sqlutils.PGUrlE(
-		s.ServingSQLAddr(), b.TempDir(), url.User("root"),
+		s.AdvSQLAddr(), b.TempDir(), url.User("root"),
 	)
 	require.NoError(b, err)
 	pgURL.Path = databaseName

pkg/ccl/auditloggingccl/audit_logging_test.go

@@ -122,7 +122,7 @@ func TestSingleRoleAuditLogging(t *testing.T) {
 	defer s.Stopper().Stop(context.Background())
 
 	testUserURL, cleanupFn := sqlutils.PGUrl(t,
-		s.ApplicationLayer().ServingSQLAddr(), t.Name(), url.User(username.TestUser))
+		s.ApplicationLayer().AdvSQLAddr(), t.Name(), url.User(username.TestUser))
 	defer cleanupFn()
 
 	testUserDb, err := gosql.Open("postgres", testUserURL.String())
@@ -254,7 +254,7 @@ func TestMultiRoleAuditLogging(t *testing.T) {
 	defer s.Stopper().Stop(context.Background())
 
 	testUserURL, cleanupFn := sqlutils.PGUrl(t,
-		s.ApplicationLayer().ServingSQLAddr(), t.Name(), url.User(username.TestUser))
+		s.ApplicationLayer().AdvSQLAddr(), t.Name(), url.User(username.TestUser))
 	defer cleanupFn()
 
 	testUserDb, err := gosql.Open("postgres", testUserURL.String())
@@ -375,7 +375,7 @@ func TestReducedAuditConfig(t *testing.T) {
 	})
 
 	testUserURL, cleanupFn := sqlutils.PGUrl(t,
-		s.ApplicationLayer().ServingSQLAddr(), t.Name(), url.User(username.TestUser))
+		s.ApplicationLayer().AdvSQLAddr(), t.Name(), url.User(username.TestUser))
 	defer cleanupFn()
 
 	testUserDb, err := gosql.Open("postgres", testUserURL.String())

pkg/ccl/backupccl/backup_test.go

@@ -7513,7 +7513,7 @@ func TestClientDisconnect(t *testing.T) {
 			// Make credentials for the new connection.
 			sqlDB.Exec(t, `CREATE USER testuser`)
 			sqlDB.Exec(t, `GRANT admin TO testuser`)
-			pgURL, cleanup := sqlutils.PGUrl(t, tc.ApplicationLayer(0).ServingSQLAddr(),
+			pgURL, cleanup := sqlutils.PGUrl(t, tc.ApplicationLayer(0).AdvSQLAddr(),
 				"TestClientDisconnect-testuser", url.User("testuser"))
 			defer cleanup()
 

pkg/ccl/backupccl/create_scheduled_backup_test.go

@@ -971,7 +971,7 @@ func TestCreateBackupScheduleRequiresAdminRole(t *testing.T) {
 
 	th.sqlDB.Exec(t, `CREATE USER testuser`)
 	pgURL, cleanupFunc := sqlutils.PGUrl(
-		t, th.server.ApplicationLayer().ServingSQLAddr(),
+		t, th.server.ApplicationLayer().AdvSQLAddr(),
 		"TestCreateSchedule-testuser", url.User("testuser"),
 	)
 	defer cleanupFunc()

pkg/ccl/backupccl/datadriven_test.go

@@ -230,7 +230,7 @@ func (d *datadrivenTestState) getSQLDB(t *testing.T, name string, user string) *
 	if db, ok := d.sqlDBs[key]; ok {
 		return db
 	}
-	addr := d.firstNode[name].ApplicationLayer().ServingSQLAddr()
+	addr := d.firstNode[name].ApplicationLayer().AdvSQLAddr()
 	pgURL, cleanup := sqlutils.PGUrl(t, addr, "TestBackupRestoreDataDriven", url.User(user))
 	d.cleanupFns = append(d.cleanupFns, cleanup)
 

pkg/ccl/backupccl/show_test.go

@@ -681,7 +681,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().ServingSQLAddr(),
+	pgURL, cleanup := sqlutils.PGUrl(t, srv.ApplicationLayer().AdvSQLAddr(),
 		"TestShowBackupPrivileges-testuser", url.User("testuser"))
 	defer cleanup()
 	testuser, err := gosql.Open("postgres", pgURL.String())

pkg/ccl/changefeedccl/sink_test.go

@@ -480,7 +480,7 @@ func TestSQLSink(t *testing.T) {
 	sqlDB := sqlutils.MakeSQLRunner(sqlDBRaw)
 	sqlDB.Exec(t, `CREATE DATABASE d`)
 
-	pgURL, cleanup := sqlutils.PGUrl(t, s.ApplicationLayer().ServingSQLAddr(), t.Name(), url.User(username.RootUser))
+	pgURL, cleanup := sqlutils.PGUrl(t, s.ApplicationLayer().AdvSQLAddr(), t.Name(), url.User(username.RootUser))
 	defer cleanup()
 	pgURL.Path = `d`
 

pkg/ccl/cloudccl/cloudprivilege/privileges_test.go

@@ -45,7 +45,7 @@ func TestURIRequiresAdminOrPrivilege(t *testing.T) {
 
 	rootDB.Exec(t, `CREATE USER testuser`)
 	pgURL, cleanupFunc := sqlutils.PGUrl(
-		t, tc.ApplicationLayer(0).ServingSQLAddr(), "TestURIRequiresAdminRole-testuser",
+		t, tc.ApplicationLayer(0).AdvSQLAddr(), "TestURIRequiresAdminRole-testuser",
 		url.User("testuser"),
 	)
 	defer cleanupFunc()

pkg/ccl/serverccl/server_controller_test.go

@@ -103,7 +103,7 @@ ALTER TENANT application START SERVICE SHARED`)
 				continue
 			}
 
-			sqlAddr := tc.Server(i).ServingSQLAddr()
+			sqlAddr := tc.Server(i).AdvSQLAddr()
 			db, err := serverutils.OpenDBConnE(sqlAddr, "cluster:application", false, tc.Stopper())
 			if err != nil {
 				return err
@@ -194,7 +194,7 @@ func TestServerControllerHTTP(t *testing.T) {
 	t.Logf("connecting to the test tenant")
 
 	// Get a SQL connection to the test tenant.
-	sqlAddr := s.ServingSQLAddr()
+	sqlAddr := s.AdvSQLAddr()
 	db2, err := serverutils.OpenDBConnE(sqlAddr, "cluster:hello/defaultdb", false, s.Stopper())
 	// Expect no error yet: the connection is opened lazily; an
 	// error here means the parameters were incorrect.
@@ -440,7 +440,7 @@ func TestServerControllerMultiNodeTenantStartup(t *testing.T) {
 	// Pick a random node, try to run some SQL inside that tenant.
 	rng, _ := randutil.NewTestRand()
 	serverIdx := int(rng.Int31n(int32(numNodes)))
-	sqlAddr := tc.Server(serverIdx).ServingSQLAddr()
+	sqlAddr := tc.Server(serverIdx).AdvSQLAddr()
 	t.Logf("attempting to use tenant server on node %d (%s)", serverIdx, sqlAddr)
 	testutils.SucceedsSoon(t, func() error {
 		tenantDB, err := serverutils.OpenDBConnE(sqlAddr, "cluster:hello", false, tc.Stopper())
@@ -481,7 +481,7 @@ func TestServerStartStop(t *testing.T) {
 	})
 	defer s.Stopper().Stop(ctx)
 
-	sqlAddr := s.ServingSQLAddr()
+	sqlAddr := s.AdvSQLAddr()
 
 	// Create our own test tenant with a known name.
 	_, err := db.Exec("CREATE TENANT hello")