fix(rdb): stop listing databases when building URL without db

Author: jremy42

internal/namespaces/rdb/v1/custom_url.go

@@ -77,28 +77,28 @@ func generateURL(ctx context.Context, argsI any) (any, error) {
 		return nil, fmt.Errorf("unknown engine %q", instance.Engine)
 	}
 
-    // Then we add the username
-    if args.User != "" {
-        // If a user is provided, use it directly to be resilient across API behaviors and test environments
-        u.User = url.User(args.User)
-    } else {
-        users, err := api.ListUsers(&rdb.ListUsersRequest{
-            Region:     args.Region,
-            InstanceID: args.InstanceID,
-            Name:       &args.User,
-        }, scw.WithContext(ctx), scw.WithAllPages())
-        if err != nil {
-            return nil, fmt.Errorf("failed to list users for instance %q", args.InstanceID)
-        }
-        if users.TotalCount != 1 {
-            return nil, fmt.Errorf(
-                "expected 1 user with the name %q, got %d",
-                args.User,
-                users.TotalCount,
-            )
-        }
-        u.User = url.User(users.Users[0].Name)
-    }
+	// Then we add the username
+	if args.User != "" {
+		// If a user is provided, use it directly to be resilient across API behaviors and test environments
+		u.User = url.User(args.User)
+	} else {
+		users, err := api.ListUsers(&rdb.ListUsersRequest{
+			Region:     args.Region,
+			InstanceID: args.InstanceID,
+			Name:       &args.User,
+		}, scw.WithContext(ctx), scw.WithAllPages())
+		if err != nil {
+			return nil, fmt.Errorf("failed to list users for instance %q", args.InstanceID)
+		}
+		if users.TotalCount != 1 {
+			return nil, fmt.Errorf(
+				"expected 1 user with the name %q, got %d",
+				args.User,
+				users.TotalCount,
+			)
+		}
+		u.User = url.User(users.Users[0].Name)
+	}
 
 	// Then we have to determine the endpoint
 	var privateEndpoint *rdb.Endpoint
@@ -119,27 +119,9 @@ func generateURL(ctx context.Context, argsI any) (any, error) {
 	}
 	u.Host = fmt.Sprintf("%s:%d", endpoint.IP.String(), endpoint.Port)
 
-    // Finally we add the database if it was given
+    // Finally we add the database if it was given; otherwise keep instance base URL
     if args.Db != "" {
-        // Use provided database name directly; keep legacy lookup only when not provided
         u = u.JoinPath(args.Db)
-    } else {
-        databases, err := api.ListDatabases(&rdb.ListDatabasesRequest{
-            Region:     args.Region,
-            InstanceID: args.InstanceID,
-            Name:       &args.Db,
-        }, scw.WithContext(ctx), scw.WithAllPages())
-        if err != nil {
-            return nil, fmt.Errorf("failed to list databases for instance %q", args.InstanceID)
-        }
-        if databases.TotalCount != 1 {
-            return nil, fmt.Errorf(
-                "expected 1 database with the name %q, got %d",
-                args.Db,
-                databases.TotalCount,
-            )
-        }
-        u = u.JoinPath(databases.Databases[0].Name)
     }
 
 	return u.String(), nil