@8ms/helpers 1.1.75 → 1.1.78

package/google/bigQuery/IsTableExists.d.ts

@@ -0,0 +1,10 @@
+declare type IsTableExists = {
+    datasetId: string;
+    tableId: string;
+};
+/**
+ * Check to see whether a given BigQuery table exists.
+ * https://cloud.google.com/bigquery/docs/samples/bigquery-table-exists
+ */
+declare const isTableExists: ({ datasetId, tableId }: IsTableExists) => Promise<boolean>;
+export default isTableExists;

package/google/bigQuery/IsTableExists.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Check to see whether a given BigQuery table exists.
+ * https://cloud.google.com/bigquery/docs/samples/bigquery-table-exists
+ */
+const isTableExists = async ({ datasetId, tableId }) => {
+    let response;
+    const dataset = global.googleBigQueryClient.dataset(datasetId);
+    try {
+        await dataset.table(tableId)
+            .get();
+        response = true;
+    }
+    catch (exception) {
+        response = false;
+    }
+    return response;
+};
+exports.default = isTableExists;

package/google/bigQuery/initClient.js

@@ -4,16 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const getConfig_1 = __importDefault(require("../getConfig"));
-global.googleBigQueryClient = {};
+global.googleBigQueryClient = null;
 /**
  * Initialise the Big Query client.
  * It's possible to use multiple clients, so we set one up per project id.
  */
 const initClient = ({ parameter, projectId }) => {
-    if (!global.googleBigQueryClient[projectId]) {
+    if (!global.googleBigQueryClient) {
         const { BigQuery } = require('@google-cloud/bigquery');
         const formattedConfig = (0, getConfig_1.default)({ parameter });
-        global.googleBigQueryClient[projectId] = new BigQuery({
+        global.googleBigQueryClient = new BigQuery({
             credentials: formattedConfig,
             projectId: projectId,
         });

package/google/bigQuery/query.d.ts

@@ -1,9 +1,8 @@
 declare type Query = {
-    projectId: string;
-    query: string;
+    input: string;
 };
 /**
  * Build the query and return the data.
  */
-declare const query: ({ projectId, query }: Query) => Promise<any>;
+declare const query: ({ input }: Query) => Promise<any>;
 export default query;

package/google/bigQuery/query.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Build the query and return the data.
  */
-const query = async ({ projectId, query }) => {
-    const apiResponse = await global.googleBigQueryClient[projectId].query(query);
+const query = async ({ input }) => {
+    const apiResponse = await global.googleBigQueryClient.query(input);
     return apiResponse;
 };
 exports.default = query;

package/google/getConfig.d.ts

@@ -16,5 +16,5 @@ export declare type GetConfig = {
 /**
  * Using the response from Parameter Store and format it ready to be used with Google API.
  */
-declare const getConfig: (parameter: GetConfig) => Config;
+declare const getConfig: ({ parameter }: GetConfig) => Config;
 export default getConfig;

package/google/getConfig.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Using the response from Parameter Store and format it ready to be used with Google API.
  */
-const getConfig = (parameter) => {
+const getConfig = ({ parameter }) => {
     // Format the private key to be in the same format as required by Google
     const privateKey = parameter['private_key'].replace(/\\n/g, '\n');
     const response = {

package/google/storage/initClient.js

@@ -4,17 +4,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const getConfig_1 = __importDefault(require("../getConfig"));
-global.googleStorageClient = {};
+global.googleStorageClient = null;
 /**
  * Initialise the Google Sheets instance using the separate service method.
  * https://github.com/googleapis/google-api-nodejs-client
  * Library: @googleapis/sheets
  */
 const initClient = ({ parameter, projectId }) => {
-    if (!global.googleStorageClient[projectId]) {
+    if (!global.googleStorageClient) {
         const { Storage } = require('@google-cloud/storage');
         const formattedConfig = (0, getConfig_1.default)({ parameter });
-        global.googleStorageClient[projectId] = new Storage({
+        global.googleStorageClient = new Storage({
             credentials: formattedConfig,
             projectId: projectId,
         });

package/google/storage/writeFile.d.ts

@@ -3,10 +3,9 @@ declare type WriteFile = {
     credentials: any;
     data: any;
     key: string;
-    projectId: string;
 };
 /**
  * Write a file to Google Cloud Storage.
  */
-export declare const writeFile: ({ bucket, data, key, projectId }: WriteFile) => Promise<any>;
+export declare const writeFile: ({ bucket, data, key }: WriteFile) => Promise<any>;
 export default writeFile;

package/google/storage/writeFile.js

@@ -4,10 +4,10 @@ exports.writeFile = void 0;
 /**
  * Write a file to Google Cloud Storage.
  */
-const writeFile = async ({ bucket, data, key, projectId }) => {
+const writeFile = async ({ bucket, data, key }) => {
     const stream = require('stream');
     const dataStream = new stream.PassThrough();
-    const googleFile = global.googleStorageClient[projectId].bucket(bucket)
+    const googleFile = global.googleStorageClient.bucket(bucket)
         .file(key);
     dataStream.push(data);
     dataStream.push(null);

package/initClients.d.ts

@@ -18,16 +18,13 @@ declare type InitClients = {
     googleAds?: {
         parameterName: string;
     };
-    googleBigQuery?: {
-        projectIds: string | string[];
-    };
     googleConfig?: {
         parameterName: string;
+        projectId: string;
     };
+    googleBigQuery?: boolean;
     googleSheets?: boolean;
-    googleStorage?: {
-        projectIds: string | string[];
-    };
+    googleStorage?: boolean;
     prisma?: {
         debug?: boolean;
     };

package/initClients.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const getArray_1 = __importDefault(require("./array/getArray"));
 const initClient_1 = __importDefault(require("./aws/athenaExpress/initClient"));
 const initClient_2 = __importDefault(require("./aws/glue/initClient"));
 const initClient_3 = __importDefault(require("./aws/s3/initClient"));
@@ -62,14 +61,11 @@ const initClients = async ({ athenaExpress, awsConfig, awsGlue, awsS3, awsSes, a
             name: googleConfig.parameterName,
         });
         // BigQuery
-        if (googleBigQuery && googleBigQuery.projectIds) {
-            const googleBigQueryProjectIds = (0, getArray_1.default)({ input: googleBigQuery.projectIds });
-            for (let i = 0; i < googleBigQueryProjectIds.length; i++) {
-                (0, initClient_7.default)({
-                    parameter: googleParameter,
-                    projectId: googleBigQueryProjectIds[i],
-                });
-            }
+        if (googleBigQuery && googleConfig.projectId) {
+            (0, initClient_7.default)({
+                parameter: googleParameter,
+                projectId: googleConfig.projectId,
+            });
         }
         // Google Sheets
         if (googleSheets) {
@@ -78,14 +74,11 @@ const initClients = async ({ athenaExpress, awsConfig, awsGlue, awsS3, awsSes, a
             });
         }
         // Google Storage
-        if (googleStorage && googleStorage.projectIds) {
-            const googleStorageProjectIds = (0, getArray_1.default)({ input: googleStorage.projectIds });
-            for (let i = 0; i < googleStorageProjectIds.length; i++) {
-                (0, initClient_9.default)({
-                    parameter: googleParameter,
-                    projectId: googleStorageProjectIds[i],
-                });
-            }
+        if (googleStorage && googleConfig.projectId) {
+            (0, initClient_9.default)({
+                parameter: googleParameter,
+                projectId: googleConfig.projectId,
+            });
         }
     }
     // Google Ads authentication using SSM Parameter

package/package.json

@@ -1,7 +1,7 @@
 {
   "name":            "@8ms/helpers",
   "license":         "UNLICENSED",
-  "version":         "1.1.75",
+  "version":         "1.1.78",
   "repository":      {
 	"type": "git",
 	"url":  "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"