@8ms/helpers 1.3.9 → 1.3.10

package/google/bigQuery/loadData.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const IsTableExists_1 = __importDefault(require("./IsTableExists"));
 const getClient_1 = __importDefault(require("./getClient"));
+const getClient_2 = __importDefault(require("../storage/getClient"));
 /**
  * Load data into a given table.
  */
@@ -18,7 +19,7 @@ const loadData = async ({ file, table }) => {
         let bigqueryClient = (0, getClient_1.default)({
             projectId: table.projectId
         });
-        let storageClient = (0, getClient_1.default)({
+        let storageClient = (0, getClient_2.default)({
             projectId: file.projectId
         });
         await bigqueryClient

package/google/storage/getClient.d.ts

@@ -0,0 +1,8 @@
+type GetClient = {
+    projectId?: string;
+};
+/**
+ * Create a new client if the project id differs from the global.
+ */
+declare const getClient: ({ projectId }: GetClient) => any;
+export default getClient;

package/google/storage/getClient.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Create a new client if the project id differs from the global.
+ */
+const getClient = ({ projectId }) => {
+    let client = global.googleStorageClient;
+    if (undefined !== projectId && projectId !== global.googleStorageDefault.projectId) {
+        const { Storage } = require('@google-cloud/storage');
+        client = new Storage({
+            credentials: global.googleStorageDefault.credentials,
+            location: "europe-west2",
+            projectId: projectId,
+        });
+    }
+    return client;
+};
+exports.default = getClient;

package/google/storage/initClient.js

@@ -4,6 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const getConfig_1 = __importDefault(require("../getConfig"));
+global.googleStorageDefault = {
+    credentials: null,
+    projectId: null,
+};
 global.googleStorageClient = null;
 /**
  * Initialise the Google Sheets instance using the separate service method.
@@ -14,6 +18,8 @@ const initClient = ({ parameter, projectId }) => {
     if (!global.googleStorageClient) {
         const { Storage } = require('@google-cloud/storage');
         const formattedConfig = (0, getConfig_1.default)({ parameter });
+        global.googleStorageDefault.credentials = formattedConfig;
+        global.googleStorageDefault.projectId = projectId;
         global.googleStorageClient = new Storage({
             credentials: formattedConfig,
             projectId: projectId,

package/package.json

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