@cumulus/db 10.0.0-beta.0 → 10.1.0

package/dist/config.d.ts

@@ -8,6 +8,7 @@ export declare const localStackConnectionEnv: {
     PG_DATABASE: string;
     PG_PORT: string;
 };
+export declare const isKnexDebugEnabled: (env?: NodeJS.ProcessEnv) => boolean;
 export declare const getSecretConnectionConfig: (SecretId: string, secretsManager: AWS.SecretsManager) => Promise<Knex.PgConnectionConfig>;
 export declare const getConnectionConfigEnv: (env: NodeJS.ProcessEnv) => Knex.PgConnectionConfig;
 /**

package/dist/config.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getKnexConfig = exports.getConnectionConfig = exports.getConnectionConfigEnv = exports.getSecretConnectionConfig = exports.localStackConnectionEnv = void 0;
+exports.getKnexConfig = exports.getConnectionConfig = exports.getConnectionConfigEnv = exports.getSecretConnectionConfig = exports.isKnexDebugEnabled = exports.localStackConnectionEnv = void 0;
 const aws_sdk_1 = __importDefault(require("aws-sdk"));
 const common_1 = require("@cumulus/common");
 exports.localStackConnectionEnv = {
@@ -13,6 +13,8 @@ exports.localStackConnectionEnv = {
     PG_DATABASE: 'postgres',
     PG_PORT: '5432',
 };
+const isKnexDebugEnabled = (env = {}) => env.KNEX_DEBUG === 'true';
+exports.isKnexDebugEnabled = isKnexDebugEnabled;
 const getSecretConnectionConfig = async (SecretId, secretsManager) => {
     var _a;
     const response = await secretsManager.getSecretValue({ SecretId }).promise();
@@ -110,7 +112,7 @@ const getKnexConfig = async ({ env = process.env, secretsManager = new aws_sdk_1
     const knexConfig = {
         client: 'pg',
         connection: await (0, exports.getConnectionConfig)({ env, secretsManager }),
-        debug: env.KNEX_DEBUG === 'true',
+        debug: (0, exports.isKnexDebugEnabled)(env),
         asyncStackTraces: env.KNEX_ASYNC_STACK_TRACES === 'true',
         pool: {
             min: 0,

package/dist/connection.js

@@ -44,16 +44,37 @@ const log = new logger_1.default({ sender: '@cumulus/db/connection' });
  * @returns {Promise<Knex>} a Knex configuration object that has returned at least one query
  */
 const getKnexClient = async ({ env = process.env, secretsManager = new aws_sdk_1.default.SecretsManager(), knexLogger = log, } = {}) => {
+    if ((0, config_1.isKnexDebugEnabled)(env)) {
+        knexLogger.info('Initializing connection pool...');
+    }
     const knexConfig = await (0, config_1.getKnexConfig)({ env, secretsManager });
     const knexClient = (0, knex_1.knex)(knexConfig);
-    //@ts-ignore
-    // context is an internal object that isn't typed
-    // this is needed to force tarn to log per-retry failures
-    // and allow propagateCreateError to be set `false`
-    knexClient.context.client.pool.on('createFail', (_, error) => {
-        knexLogger.warn('knex failed on attempted connection', error);
-        throw error;
-    });
+    if ((0, config_1.isKnexDebugEnabled)(env)) {
+        //@ts-ignore
+        // context is an internal object that isn't typed
+        // this is needed to force tarn to log per-retry failures
+        // and allow propagateCreateError to be set `false`
+        knexClient.context.client.pool.on('createFail', (_, error) => {
+            knexLogger.warn('knex failed on attempted connection', error);
+            throw error;
+        });
+        //@ts-ignore
+        knexClient.context.client.pool.on('createSuccess', (_, resource) => {
+            knexLogger.info(`added connection to pool: ${JSON.stringify(resource)}`);
+        });
+        //@ts-ignore
+        knexClient.context.client.pool.on('acquireSuccess', (_, resource) => {
+            knexLogger.info(`acquired connection from pool: ${JSON.stringify(resource)}`);
+        });
+        //@ts-ignore
+        knexClient.context.client.pool.on('release', (resource) => {
+            knexLogger.info(`released connection from pool: ${JSON.stringify(resource)}`);
+        });
+        //@ts-ignore
+        knexClient.context.client.pool.on('poolDestroySuccess', () => {
+            knexLogger.info('pool is destroyed');
+        });
+    }
     return knexClient;
 };
 exports.getKnexClient = getKnexClient;

package/dist/migrations/20220126172008_files_granule_id_index.d.ts

@@ -0,0 +1,4 @@
+import { Knex } from 'knex';
+export declare const up: (knex: Knex) => Promise<void>;
+export declare const down: (knex: Knex) => Promise<void>;
+//# sourceMappingURL=20220126172008_files_granule_id_index.d.ts.map

package/dist/migrations/20220126172008_files_granule_id_index.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const up = async (knex) => {
+    await knex.schema.table('files', (table) => {
+        table.index('granule_cumulus_id');
+    });
+};
+exports.up = up;
+const down = async (knex) => {
+    await knex.schema.table('files', (table) => {
+        table.dropIndex('granule_cumulus_id');
+    });
+};
+exports.down = down;
+//# sourceMappingURL=20220126172008_files_granule_id_index.js.map

package/dist/models/base.d.ts

@@ -22,7 +22,7 @@ declare class BasePgModel<ItemType, RecordType extends {
      * Fetches multiple items from Postgres
      *
      * @param {Knex | Knex.Transaction} knexOrTransaction - DB client or transaction
-     * @param {Partial<RecordType>} params - An object or any portion of an object of type RecordType
+     * @param {Object} params - An object or any portion of an object of type RecordType
      * @returns {Promise<RecordType[]>} List of returned records
      */
     search(knexOrTransaction: Knex | Knex.Transaction, params: Partial<RecordType>): Promise<RecordType[]>;
@@ -41,7 +41,7 @@ declare class BasePgModel<ItemType, RecordType extends {
      *
      * @param {Knex | Knex.Transaction} knexOrTransaction -
      *  DB client or transaction
-     * @param {Array<keyof RecordType>} columnNames - column names for whereIn query
+     * @param {Array<string>} columnNames - column names for whereIn query
      * @param {Array<string>} values - record values for whereIn query
      * @returns {Promise<Array<number>>} An array of cumulus_ids for the returned records
      */

package/dist/models/base.js

@@ -40,7 +40,7 @@ class BasePgModel {
      * Fetches multiple items from Postgres
      *
      * @param {Knex | Knex.Transaction} knexOrTransaction - DB client or transaction
-     * @param {Partial<RecordType>} params - An object or any portion of an object of type RecordType
+     * @param {Object} params - An object or any portion of an object of type RecordType
      * @returns {Promise<RecordType[]>} List of returned records
      */
     async search(knexOrTransaction, params) {
@@ -72,7 +72,7 @@ class BasePgModel {
      *
      * @param {Knex | Knex.Transaction} knexOrTransaction -
      *  DB client or transaction
-     * @param {Array<keyof RecordType>} columnNames - column names for whereIn query
+     * @param {Array<string>} columnNames - column names for whereIn query
      * @param {Array<string>} values - record values for whereIn query
      * @returns {Promise<Array<number>>} An array of cumulus_ids for the returned records
      */

package/dist/models/execution.d.ts

@@ -10,11 +10,11 @@ declare class ExecutionPgModel extends BasePgModel<PostgresExecution, PostgresEx
      * @param {Knex | Knex.Transaction} knexOrTrx -
      *  DB client or transaction
      * @param {Array<number>} executionCumulusIds -
-     * single execution cumulus_id or array of exeuction cumulus_ids
+     * single execution cumulus_id or array of execution cumulus_ids
      * @param {Object} [params] - Optional object with addition params for query
      * @param {number} [params.limit] - number of records to be returned
      * @param {number} [params.offset] - record offset
-     * @returns {Promise<Array<number>>} An array of exeuctions
+     * @returns {Promise<Array<number>>} An array of executions
      */
     searchByCumulusIds(knexOrTrx: Knex | Knex.Transaction, executionCumulusIds: Array<number> | number, params: {
         limit: number;

package/dist/models/execution.js

@@ -35,11 +35,11 @@ class ExecutionPgModel extends base_1.BasePgModel {
      * @param {Knex | Knex.Transaction} knexOrTrx -
      *  DB client or transaction
      * @param {Array<number>} executionCumulusIds -
-     * single execution cumulus_id or array of exeuction cumulus_ids
+     * single execution cumulus_id or array of execution cumulus_ids
      * @param {Object} [params] - Optional object with addition params for query
      * @param {number} [params.limit] - number of records to be returned
      * @param {number} [params.offset] - record offset
-     * @returns {Promise<Array<number>>} An array of exeuctions
+     * @returns {Promise<Array<number>>} An array of executions
      */
     async searchByCumulusIds(knexOrTrx, executionCumulusIds, params) {
         const { limit, offset, ...sortQueries } = params || {};

package/dist/translate/executions.js

@@ -95,8 +95,8 @@ const translateApiExecutionToPostgresExecution = async (dynamoRecord, knex, coll
         updated_at: dynamoRecord.updatedAt ? new Date(dynamoRecord.updatedAt) : undefined,
     };
     if (dynamoRecord.collectionId !== undefined) {
-        const collectionNameVersionArray = dynamoRecord.collectionId.split('___');
-        translatedRecord.collection_cumulus_id = await collectionPgModel.getRecordCumulusId(knex, { name: collectionNameVersionArray[0], version: collectionNameVersionArray[1] });
+        const { name, version } = (0, Collections_1.deconstructCollectionId)(dynamoRecord.collectionId);
+        translatedRecord.collection_cumulus_id = await collectionPgModel.getRecordCumulusId(knex, { name, version });
     }
     // If we have a parentArn, try a lookup in Postgres. If there's a match, set the parent_cumulus_id
     if (dynamoRecord.parentArn !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/db",
-  "version": "10.0.0-beta.0",
+  "version": "10.1.0",
   "description": "Utilities for working with the Cumulus DB",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
@@ -29,15 +29,15 @@
     "node": ">=12.18.0"
   },
   "dependencies": {
-    "@cumulus/aws-client": "10.0.0-beta.0",
-    "@cumulus/common": "10.0.0-beta.0",
-    "@cumulus/errors": "10.0.0-beta.0",
-    "@cumulus/logger": "10.0.0-beta.0",
-    "@cumulus/message": "10.0.0-beta.0",
-    "@cumulus/types": "10.0.0-beta.0",
+    "@cumulus/aws-client": "10.1.0",
+    "@cumulus/common": "10.1.0",
+    "@cumulus/errors": "10.1.0",
+    "@cumulus/logger": "10.1.0",
+    "@cumulus/message": "10.1.0",
+    "@cumulus/types": "10.1.0",
     "crypto-random-string": "^3.2.0",
     "is-valid-hostname": "0.0.1",
-    "knex": "0.95.11",
+    "knex": "0.95.15",
     "lodash": "^4.17.20",
     "pg": "^8.3.0",
     "snake-camel": "^1.0.6",
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/uuid": "^8.0.0"
   },
-  "gitHead": "bc283986be627ba06a4084cabd4e01d1540d14c7"
+  "gitHead": "765ba4733ec97540e28cd64dac702eea3b96c654"
 }