@shushed/helpers 0.0.159 → 0.0.160

package/dist/index.js

@@ -107196,7 +107196,6 @@ var PubSubHelper = class extends Runtime {
     return `${infraPrefix}-${shortHash(this.triggerId)}`;
   }
   async createOrUpdate(opts) {
-    this.logging.log("createOrUpdate called with", opts);
     const [topics] = await this.pubSub.getTopics();
     const infraPrefix = opts.topicName.indexOf("---") !== -1 ? opts.topicName : `${this.envName}---${opts.topicName}`;
     const mainDlqTopicName = `${infraPrefix}-${shortHash(this.triggerId)}-dlq`;
@@ -107229,7 +107228,6 @@ var PubSubHelper = class extends Runtime {
       mainTopic = await this.ensureTopicExists(opts.topicName);
     }
     if (!opts.table) {
-      this.logging.log("createOrUpdate deleting table subscriptions");
       if (tableSubscription) {
         await tableSubscription.delete();
         tableSubscription = null;
@@ -107239,9 +107237,7 @@ var PubSubHelper = class extends Runtime {
         tableDlqSubscription = null;
       }
     } else {
-      this.logging.log("createOrUpdate creating table subscription");
       if (opts.createDeadLetterQueues) {
-        this.logging.log("createOrUpdate ensuring dlqs exist for table subscription");
         tableDlqTopic = await this.ensureTopicExists(tableDlqTopicName);
         tableDlqSubscription = await this.ensureSubscribtionExists(tableDlqSubscriptionName, {
           topic: tableDlqTopic,
@@ -107249,7 +107245,6 @@ var PubSubHelper = class extends Runtime {
           dlqTopic: null
         });
       }
-      this.logging.log("createOrUpdate ensuring the table subscription exists");
       tableSubscription = await this.ensureSubscribtionExists(tableSubscriptionName, {
         topic,
         tableId: opts.table.tableId,
@@ -107262,7 +107257,6 @@ var PubSubHelper = class extends Runtime {
     }
     const pullPushSubscription = opts.pull || opts.push;
     if (!pullPushSubscription) {
-      this.logging.log("createOrUpdate deleting main subscriptions");
       if (mainSubscription) {
         await mainSubscription.delete();
         mainSubscription = null;
@@ -107273,7 +107267,6 @@ var PubSubHelper = class extends Runtime {
       }
     } else {
       if (opts.createDeadLetterQueues) {
-        this.logging.log("createOrUpdate creating dlqs for main subscription");
         mainDlqTopic = await this.ensureTopicExists(mainDlqTopicName);
         mainDlqSubscription = await this.ensureSubscribtionExists(mainDlqSubscriptionName, {
           topic: mainDlqTopic,
@@ -107292,7 +107285,6 @@ var PubSubHelper = class extends Runtime {
       });
     }
     if (!opts.createDeadLetterQueues) {
-      this.logging.log("createOrUpdate deleting all dlqs");
       if (mainDlqSubscription) {
         await mainDlqSubscription.delete();
         mainDlqSubscription = null;
@@ -107322,16 +107314,13 @@ var PubSubHelper = class extends Runtime {
     return topics.find((topic) => this.getNameFromFullyQualifiedName(topic.name) === topicName);
   }
   async ensureTopicExists(topicName) {
-    this.logging.log("ensureTopicExists called with", topicName);
     let topic = await this.findTopic(topicName);
-    this.logging.log(`ensureTopicExists topic ${!topic ? "does not " : ""}exists`);
     let topicMetadata;
     try {
       [topicMetadata] = await topic?.getMetadata() || [null];
     } catch (err) {
       throw new Error("Invariant: While getting topic metadata - " + err.message);
     }
-    this.logging.log(`ensureTopicExists retrieved topic metadata`);
     const metadata = {
       labels: {
         "created-at": (/* @__PURE__ */ new Date()).getTime().toString(),
@@ -107347,7 +107336,6 @@ var PubSubHelper = class extends Runtime {
       const simMetadata = Object.assign({}, topicMetadata?.labels || {}, metadata.labels);
       if (!(0, import_lodash.default)(topicMetadata?.labels, simMetadata)) {
         simMetadata["last-modified-at"] = (/* @__PURE__ */ new Date()).getTime().toString();
-        this.logging.log(`ensureTopicExists topic metadata has changed updating with`, simMetadata);
         try {
           await topic.setMetadata({
             labels: simMetadata
@@ -107358,10 +107346,6 @@ var PubSubHelper = class extends Runtime {
         }
       }
     } else {
-      this.logging.log(`ensureTopicExists creating new topic`, {
-        name: topicName,
-        labels: metadata.labels
-      });
       await this.pubSub.createTopic({
         name: topicName,
         labels: metadata.labels
@@ -107384,27 +107368,11 @@ var PubSubHelper = class extends Runtime {
       retryMaxDelay: 360,
       ackDeadline: 90
     };
-    this.logging.log("updateSubscription called with", subscriptionName, !!subscription, subscriptionMetaData, Object.assign({}, inputOpts, {
-      topic: inputOpts.topic.name,
-      dlqTopic: inputOpts.dlqTopic?.name
-    }));
     const opts = Object.assign({}, defaultOptions, inputOpts);
-    this.logging.log("updateSubscription final opts", Object.assign({}, opts, {
-      topic: opts.topic.name,
-      dlqTopic: opts.dlqTopic?.name
-    }));
     let nextMetadata = null;
     if (isSubscriptionOptionsPush(opts)) {
-      this.logging.log("updateSubscription, subscription is push");
       if (opts.endpointUrl !== subscriptionMetaData?.pushConfig?.pushEndpoint || this.serviceAccountEmail !== subscriptionMetaData?.pushConfig.oidcToken?.serviceAccountEmail || process.env.GCLOUD_PROJECT + "/" + this.triggerId !== subscriptionMetaData.pushConfig.oidcToken.audience) {
         if (subscriptionMetaData?.pushConfig?.pushEndpoint && subscription) {
-          this.logging.log("updateSubscription pushConfig changed, push configuration already exists, modifying", {
-            pushEndpoint: opts.endpointUrl,
-            oidcToken: {
-              serviceAccountEmail: this.serviceAccountEmail,
-              audience: process.env.GCLOUD_PROJECT + "/" + this.triggerId
-            }
-          });
           try {
             await subscription.modifyPushConfig({
               pushEndpoint: opts.endpointUrl,
@@ -107496,7 +107464,6 @@ var PubSubHelper = class extends Runtime {
       nextMetadata.bigqueryConfig = null;
     }
     if (subscription && nextMetadata) {
-      this.logging.log("updateSubscription updating subscription", nextMetadata);
       try {
         await subscription.setMetadata(nextMetadata);
       } catch (err) {
@@ -107509,20 +107476,14 @@ var PubSubHelper = class extends Runtime {
   async ensureSubscribtionExists(subscriptionName, opts) {
     let [subscriptions] = await opts.topic.getSubscriptions();
     let subscription = subscriptions.find((subscription2) => this.getNameFromFullyQualifiedName(subscription2.name) === subscriptionName) || null;
-    this.logging.log("ensureSubscribtionExists called with", subscriptionName, Object.assign({}, opts, {
-      topic: opts.topic.name,
-      dlqTopic: opts.dlqTopic?.name
-    }));
     let subscriptionMetaData;
     try {
       [subscriptionMetaData] = await subscription?.getMetadata() || [null];
     } catch (err) {
       throw new Error("Invariant: While getting subscription metadata - " + err.message);
     }
-    this.logging.log("ensureSubscribtionExists retrieved subscriptionMetaData", subscriptionMetaData);
     const createPayload = await this.updateSubscription(subscriptionName, subscription, subscriptionMetaData, opts);
     if (createPayload && !subscription) {
-      this.logging.log(`ensureSubscribtionExists creating subscription: ${subscriptionName} on topic: ${opts.topic.name} with`, createPayload);
       await opts.topic.createSubscription(subscriptionName, createPayload);
       [subscriptions] = await opts.topic.getSubscriptions();
       subscription = subscriptions.find((subscription2) => this.getNameFromFullyQualifiedName(subscription2.name) === subscriptionName) || null;
@@ -107533,7 +107494,6 @@ var PubSubHelper = class extends Runtime {
     return subscription;
   }
   async deleteSubscriptions(topicName) {
-    this.logging.log("deleteSubscriptions called with", topicName);
     return this.createOrUpdate({
       topicName,
       createDeadLetterQueues: false,
@@ -107543,7 +107503,6 @@ var PubSubHelper = class extends Runtime {
     });
   }
   async getStatus(topicName) {
-    this.logging.log("getStatus called with", topicName);
     const [topics] = await this.pubSub.getTopics();
     const infraPrefix = topicName.indexOf("---") !== -1 ? topicName : `${this.envName}---${topicName}`;
     const mainDlqTopicName = `${infraPrefix}-${shortHash(this.triggerId)}-dlq`;
@@ -107611,16 +107570,13 @@ var PubSubHelper = class extends Runtime {
   async pause(topicName) {
     const [topics] = await this.pubSub.getTopics();
     const mainTopic = topics.find((x) => this.getNameFromFullyQualifiedName(x.name) === topicName);
-    this.logging.log("paused called with", topicName);
     const infraPrefix = topicName.indexOf("---") !== -1 ? topicName : `${this.envName}---${topicName}`;
     let mainTopicSubscriptions = null;
     if (mainTopic) {
       [mainTopicSubscriptions] = await mainTopic.getSubscriptions();
     }
     const mainSubscriptionName = `${infraPrefix}-${shortHash(this.triggerId)}`;
-    this.logging.log("isRunning checking the", mainSubscriptionName);
     const mainSubscription = mainTopicSubscriptions?.find((x) => this.getNameFromFullyQualifiedName(x.name) === mainSubscriptionName) || null;
-    this.logging.log("pause found the", mainSubscription?.name);
     if (mainSubscription) {
       try {
         await mainSubscription.setMetadata({
@@ -107641,27 +107597,15 @@ var PubSubHelper = class extends Runtime {
   async resume(topicName) {
     const [topics] = await this.pubSub.getTopics();
     const mainTopic = topics.find((x) => this.getNameFromFullyQualifiedName(x.name) === topicName);
-    this.logging.log("resume called with", topicName);
     const infraPrefix = topicName.indexOf("---") !== -1 ? topicName : `${this.envName}---${topicName}`;
     let mainTopicSubscriptions = null;
     if (mainTopic) {
       [mainTopicSubscriptions] = await mainTopic.getSubscriptions();
     }
     const mainSubscriptionName = `${infraPrefix}-${shortHash(this.triggerId)}`;
-    this.logging.log("resume checking the", mainSubscriptionName);
     const mainSubscription = mainTopicSubscriptions?.find((x) => this.getNameFromFullyQualifiedName(x.name) === mainSubscriptionName) || null;
-    this.logging.log("resume found the", mainSubscription?.name);
     if (mainSubscription) {
       try {
-        this.logging.log("resume setting metadata", {
-          pushConfig: {
-            pushEndpoint: this.runtimeUrl + "/executeWorkflow/" + this.workflowId + "/" + this.triggerId + `?topic_name=${topicName}`,
-            oidcToken: {
-              serviceAccountEmail: this.serviceAccountEmail,
-              audience: process.env.GCLOUD_PROJECT + "/" + this.triggerId
-            }
-          }
-        });
         await mainSubscription.setMetadata({
           pushConfig: {
             pushEndpoint: this.runtimeUrl + "/executeWorkflow/" + this.workflowId + "/" + this.triggerId + `?topic_name=${topicName}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shushed/helpers",
-  "version": "0.0.159",
+  "version": "0.0.160",
   "author": "",
   "license": "UNLICENSED",
   "description": "",