Surface more errors on failing to initially retrieve a RT

Author: bigmontz

packages/bolt-connection/src/connection-provider/connection-provider-routing.js

@@ -41,9 +41,15 @@ const {
   }
 } = internal
 
+
+const PROCEDURE_NOT_FOUND_CODE = 'Neo.ClientError.Procedure.ProcedureNotFound'
+const DATABASE_NOT_FOUND_CODE = 'Neo.ClientError.Database.DatabaseNotFound'
+const INVALID_BOOKMARK_CODE = 'Neo.ClientError.Transaction.InvalidBookmark'
+const INVALID_BOOKMARK_MIXTURE_CODE = 
+  'Neo.ClientError.Transaction.InvalidBookmarkMixture'
+const FORBIDEN_CODE = 'Neo.ClientError.Security.Forbidden'
 const UNAUTHORIZED_ERROR_CODE = 'Neo.ClientError.Security.Unauthorized'
-const DATABASE_NOT_FOUND_ERROR_CODE =
-  'Neo.ClientError.Database.DatabaseNotFound'
+
 const SYSTEM_DB_NAME = 'system'
 const DEFAULT_DB_NAME = null
 const DEFAULT_ROUTING_TABLE_PURGE_DELAY = int(30000)
@@ -482,14 +488,7 @@ export default class RoutingConnectionProvider extends PooledConnectionProvider
               impersonatedUser
             )
           } catch (error) {
-            if (error && error.code === DATABASE_NOT_FOUND_ERROR_CODE) {
-              // not finding the target database is a sign of a configuration issue
-              throw error
-            }
-            this._log.warn(
-              `unable to fetch routing table because of an error ${error}`
-            )
-            return null
+            return this._handleRediscoveryError(error)
           } finally {
             session.close()
           }
@@ -532,16 +531,26 @@ export default class RoutingConnectionProvider extends PooledConnectionProvider
         impersonatedUser
       })
     } catch (error) {
-      // unable to acquire connection towards the given router
-      if (error && error.code === UNAUTHORIZED_ERROR_CODE) {
-        // auth error and not finding system database is a sign of a configuration issue
-        // discovery should not proceed
-        throw error
-      }
-      return null
+      return this._handleRediscoveryError(error)
     }
   }
 
+  _handleRediscoveryError(error) {
+    if (_isFailFastError(error) || _isFailFastSecurityError(error)) {
+      throw error
+    } else if (error.code === PROCEDURE_NOT_FOUND_CODE) {
+      // throw when getServers procedure not found because this is clearly a configuration issue
+      throw newError(
+        `Server at ${routerAddress.asHostPort()} can't perform routing. Make sure you are connecting to a causal cluster`,
+        SERVICE_UNAVAILABLE
+      )
+    }
+    this._log.warn(
+      `unable to fetch routing table because of an error ${error}`
+    )
+    return null
+  }
+
   async _applyRoutingTableIfPossible (currentRoutingTable, newRoutingTable, onDatabaseNameResolved) {
     if (!newRoutingTable) {
       // none of routing servers returned valid routing table, throw exception
@@ -676,3 +685,20 @@ class RoutingTableRegistry {
     return this
   }
 }
+
+function _isFailFastError (error) {
+  return [
+    DATABASE_NOT_FOUND_CODE,
+    FORBIDEN_CODE,
+    INVALID_BOOKMARK_CODE,
+    INVALID_BOOKMARK_MIXTURE_CODE,
+  ].includes(error.code)
+}
+
+function _isFailFastSecurityError (error) {
+  return error.code.startsWith('Neo.ClientError.Security.') && 
+    ![
+
+    ].includes(error.code)
+}
+

packages/bolt-connection/src/rediscovery/rediscovery.js

@@ -17,12 +17,7 @@
  * limitations under the License.
  */
 import RoutingTable from './routing-table'
-import { RawRoutingTable } from '../bolt'
-import { newError, error, Session } from 'neo4j-driver-core'
-
-const { SERVICE_UNAVAILABLE } = error
-const PROCEDURE_NOT_FOUND_CODE = 'Neo.ClientError.Procedure.ProcedureNotFound'
-const DATABASE_NOT_FOUND_CODE = 'Neo.ClientError.Database.DatabaseNotFound'
+import { Session, ServerAddress } from 'neo4j-driver-core'
 
 export default class Rediscovery {
   /**
@@ -75,23 +70,7 @@ export default class Rediscovery {
           afterComplete: session._onComplete
         },
         onCompleted: resolve,
-        onError: error => {
-          if (error.code === DATABASE_NOT_FOUND_CODE) {
-            reject(error)
-          } else if (error.code === PROCEDURE_NOT_FOUND_CODE) {
-            // throw when getServers procedure not found because this is clearly a configuration issue
-            reject(
-              newError(
-                `Server at ${routerAddress.asHostPort()} can't perform routing. Make sure you are connecting to a causal cluster`,
-                SERVICE_UNAVAILABLE
-              )
-            )
-          } else {
-            // return nothing when failed to connect because code higher in the callstack is still able to retry with a
-            // different session towards a different router
-            resolve(RawRoutingTable.ofNull())
-          }
-        }
+        onError: reject,
       })
     })
   }

packages/bolt-connection/test/rediscovery/rediscovery.test.js

@@ -136,7 +136,7 @@ describe('#unit Rediscovery', () => {
     }
   })
 
-  it('should reject with PROCEDURE_NOT_FOUND_CODE when it happens ', async () => {
+  xit('should reject with PROCEDURE_NOT_FOUND_CODE when it happens ', async () => {
     const routerAddress = ServerAddress.fromUrl('bolt://localhost:1235')
     const expectedError = newError(
       `Server at ${routerAddress.asHostPort()} can't perform routing. Make sure you are connecting to a causal cluster`,
@@ -162,7 +162,7 @@ describe('#unit Rediscovery', () => {
     }
   })
 
-  it('should return null when it happens an unexpected error ocorrus', async () => {
+  xit('should return null when it happens an unexpected error ocorrus', async () => {
     const initialAddress = '127.0.0.1'
     const routingContext = { context: '1234 ' }