fix: minor folder refactor (#704)

Author: fenos

src/http/routes-helper.ts

@@ -1,7 +1,7 @@
 type BucketResponseType = { message: string; statusCode?: string; error?: string }
 
 /**
- * Create generic respose for all buckets
+ * Create generic response for all buckets
  * @param message {string} Main message
  * @param status {string=} StatusCode
  * @param error {string=} Error number (presented as a string)

src/http/routes/admin/jwks.ts

@@ -2,7 +2,7 @@ import { FastifyInstance, RequestGenericInterface } from 'fastify'
 import apiKey from '../../plugins/apikey'
 import { jwksManager } from '@internal/database'
 import { FromSchema } from 'json-schema-to-ts'
-import { UrlSigningJwkGenerator } from '@internal/auth/generators/jwk-generator'
+import { UrlSigningJwkGenerator } from '@internal/auth/jwks/generator'
 import { logSchema } from '@internal/monitoring'
 
 const addSchema = {

…nternal/auth/generators/jwk-generator.ts src/internal/auth/jwks/generator.tssrc/internal/auth/generators/jwk-generator.ts renamed to src/internal/auth/jwks/generator.ts src/internal/auth/generators/jwk-generator.ts renamed to src/internal/auth/jwks/generator.ts

@@ -0,0 +1,3 @@
+export * from './manager'
+export * from './store'
+export * from './store-knex'

src/internal/auth/jwks/index.ts

@@ -13,7 +13,7 @@ import { ProgressiveMigrations } from './progressive'
 import { ResetMigrationsOnTenant, RunMigrationsOnTenants } from '@storage/events'
 import { ERRORS } from '@internal/errors'
 import { DBMigration } from './types'
-import { getSslSettings } from '../util'
+import { getSslSettings } from '../ssl'
 import { MigrationTransformer, DisableConcurrentIndexTransformer } from './transformers'
 import { lastLocalMigrationName, loadMigrationFilesCached, localMigrationFiles } from './files'
 

…nternal/database/jwks-manager/manager.ts src/internal/auth/jwks/manager.tssrc/internal/database/jwks-manager/manager.ts renamed to src/internal/auth/jwks/manager.ts src/internal/database/jwks-manager/manager.ts renamed to src/internal/auth/jwks/manager.ts

@@ -2,7 +2,7 @@ import { getConfig } from '../../config'
 import TTLCache from '@isaacs/ttlcache'
 import { knex, Knex } from 'knex'
 import { logger, logSchema } from '@internal/monitoring'
-import { getSslSettings } from '@internal/database/util'
+import { getSslSettings } from '@internal/database/ssl'
 import { wait } from '@internal/concurrency'
 import { JWTPayload } from 'jose'
 import { DbActivePool } from '@internal/monitoring/metrics'
@@ -223,6 +223,11 @@ class TenantPool implements PoolStrategy {
     }
 
     while (true) {
+      if (!pool?.client?.pool) {
+        if (pool) return pool.destroy()
+        return
+      }
+
       let waiting = 0
       waiting += pool.client.pool.numPendingAcquires()
       waiting += pool.client.pool.numPendingValidations()