clientsecopts: rename PGURL to MakeURLForServer

We have enough things called "PGURL" as it is. This rename clarifies
the purpose.

Release note: None

pkg/cli/start.go

@@ -520,7 +520,7 @@ func runStart(cmd *cobra.Command, args []string, startSingleNode bool) (returnEr
 			// earlier (e.g. above, in the runStart function) because
 			// at this time the address and port have not been resolved yet.
 			clientConnOptions, serverParams := makeServerOptionsForURL(&serverCfg)
-			pgURL, err := clientsecopts.PGURL(clientConnOptions, serverParams, url.User(username.RootUser))
+			pgURL, err := clientsecopts.MakeURLForServer(clientConnOptions, serverParams, url.User(username.RootUser))
 			if err != nil {
 				log.Errorf(ctx, "failed computing the URL: %v", err)
 				return
@@ -912,7 +912,7 @@ func waitForShutdown(
 	return returnErr
 }
 
-// makeServerOptionsForURL creates the input for PGURL().
+// makeServerOptionsForURL creates the input for MakeURLForServer().
 // Beware of not calling this too early; the server address
 // is finalized late in the network initialization sequence.
 func makeServerOptionsForURL(
@@ -956,7 +956,7 @@ func reportServerInfo(
 	// earlier (e.g. above, in the runStart function) because
 	// at this time the address and port have not been resolved yet.
 	clientConnOptions, serverParams := makeServerOptionsForURL(serverCfg)
-	pgURL, err := clientsecopts.PGURL(clientConnOptions, serverParams, url.User(username.RootUser))
+	pgURL, err := clientsecopts.MakeURLForServer(clientConnOptions, serverParams, url.User(username.RootUser))
 	if err != nil {
 		log.Ops.Errorf(ctx, "failed computing the URL: %v", err)
 		return err

pkg/security/clientsecopts/client_opts.go

@@ -130,9 +130,11 @@ type ServerParameters struct {
 	DefaultDatabase string
 }
 
-// PGURL constructs a URL for the postgres endpoint, given a server
+// MakeURLForServer constructs a URL for the postgres endpoint, given a server
 // config.
-func PGURL(copts ClientOptions, sparams ServerParameters, user *url.Userinfo) (*pgurl.URL, error) {
+func MakeURLForServer(
+	copts ClientOptions, sparams ServerParameters, user *url.Userinfo,
+) (*pgurl.URL, error) {
 	host, port, _ := addr.SplitHostPort(sparams.ServerAddr, sparams.DefaultPort)
 	u := pgurl.New().
 		WithNet(pgurl.NetTCP(host, port)).

pkg/server/server_sql.go

@@ -690,7 +690,7 @@ func newSQLServer(ctx context.Context, cfg sqlServerArgs) (*SQLServer, error) {
 	nodeInfo := sql.NodeInfo{
 		AdminURL: cfg.AdminURL,
 		PGURL: func(user *url.Userinfo) (*pgurl.URL, error) {
-			return clientsecopts.PGURL(ccopts, sparams, user)
+			return clientsecopts.MakeURLForServer(ccopts, sparams, user)
 		},
 		LogicalClusterID: cfg.rpcContext.LogicalClusterID.Get,
 		NodeID:           cfg.nodeIDContainer,