gcf-utils 13.3.2-beta.1 → 13.5.0

package/build/src/bin/genkey.js

@@ -15,7 +15,11 @@
 // limitations under the License.
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -79,14 +83,14 @@ const botname = argv.bot;
 const webhookSecret = argv.secret;
 const id = Number(argv.id);
 async function run(keyfile, webhookSecret, id, project, botname) {
-    const blob = await genkey_util_1.gather(keyfile, id, webhookSecret);
+    const blob = await (0, genkey_util_1.gather)(keyfile, id, webhookSecret);
     const opts = project
         ? {
             projectId: project,
         }
         : undefined;
     const smclient = new secret_manager_1.v1.SecretManagerServiceClient(opts);
-    await genkey_util_1.create(smclient, project, botname, blob);
+    await (0, genkey_util_1.create)(smclient, project, botname, blob);
 }
 run(keyfile, webhookSecret, id, project, botname);
 //# sourceMappingURL=genkey.js.map

package/build/src/bin/genkey.js.map

@@ -1 +1 @@
-{"version":3,"file":"genkey.js","sourceRoot":"","sources":["../../../src/bin/genkey.ts"],"names":[],"mappings":";;AACA,4BAA4B;AAC5B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,kDAAkD;AAClD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;;;;;;;;;;;;;;;;;;;AAEjC,6CAA+B;AAE/B,iEAAgD;AAChD,+CAA6C;AAE7C,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CACxB,KAAK,EACL,iCAAiC,EACjC,CAAC,KAAW,EAAE,EAAE;IACd,OAAO,KAAK;SACT,MAAM,CAAC,SAAS,EAAE;QACjB,QAAQ,EAAE,8BAA8B;QACxC,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,SAAS;KACnB,CAAC;SACD,MAAM,CAAC,SAAS,EAAE;QACjB,KAAK,EAAE,GAAG;QACV,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,SAAS;KAChB,CAAC;SACD,MAAM,CAAC,SAAS,EAAE;QACjB,QAAQ,EAAE,qBAAqB;QAC/B,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,IAAI;KACb,CAAC;SACD,MAAM,CAAC,KAAK,EAAE;QACb,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,iBAAiB;KAC/B,CAAC;SACD,MAAM,CAAC,IAAI,EAAE;QACZ,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,8BAA8B;KAC5C,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,0CAA0C;KACxD,CAAC,CAAC;AACP,CAAC,CACF,CAAC,IAAI,CAAC;AAEP,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,SAAS,CAAC;AAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAiB,CAAC;AACvC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAI,CAAC;AAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;AAClC,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAE3B,KAAK,UAAU,GAAG,CAChB,OAAe,EACf,aAAqB,EACrB,EAAU,EACV,OAAe,EACf,OAAe;IAEf,MAAM,IAAI,GAAG,MAAM,oBAAM,CAAC,OAAO,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,OAAO;QAClB,CAAC,CAAC;YACE,SAAS,EAAE,OAAO;SACnB;QACH,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,QAAQ,GAAG,IAAI,mBAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,oBAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC;AAED,GAAG,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC"}
+{"version":3,"file":"genkey.js","sourceRoot":"","sources":["../../../src/bin/genkey.ts"],"names":[],"mappings":";;AACA,4BAA4B;AAC5B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,kDAAkD;AAClD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;AAEjC,6CAA+B;AAE/B,iEAAgD;AAChD,+CAA6C;AAE7C,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CACxB,KAAK,EACL,iCAAiC,EACjC,CAAC,KAAW,EAAE,EAAE;IACd,OAAO,KAAK;SACT,MAAM,CAAC,SAAS,EAAE;QACjB,QAAQ,EAAE,8BAA8B;QACxC,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,SAAS;KACnB,CAAC;SACD,MAAM,CAAC,SAAS,EAAE;QACjB,KAAK,EAAE,GAAG;QACV,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,SAAS;KAChB,CAAC;SACD,MAAM,CAAC,SAAS,EAAE;QACjB,QAAQ,EAAE,qBAAqB;QAC/B,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,IAAI;KACb,CAAC;SACD,MAAM,CAAC,KAAK,EAAE;QACb,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,iBAAiB;KAC/B,CAAC;SACD,MAAM,CAAC,IAAI,EAAE;QACZ,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,8BAA8B;KAC5C,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,0CAA0C;KACxD,CAAC,CAAC;AACP,CAAC,CACF,CAAC,IAAI,CAAC;AAEP,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,SAAS,CAAC;AAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAiB,CAAC;AACvC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAI,CAAC;AAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;AAClC,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAE3B,KAAK,UAAU,GAAG,CAChB,OAAe,EACf,aAAqB,EACrB,EAAU,EACV,OAAe,EACf,OAAe;IAEf,MAAM,IAAI,GAAG,MAAM,IAAA,oBAAM,EAAC,OAAO,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,OAAO;QAClB,CAAC,CAAC;YACE,SAAS,EAAE,OAAO;SACnB;QACH,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,QAAQ,GAAG,IAAI,mBAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,IAAA,oBAAM,EAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC;AAED,GAAG,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC"}

package/build/src/bot-request.d.ts

@@ -0,0 +1,21 @@
+import * as express from 'express';
+/**
+ * Type of function execution trigger
+ */
+export declare enum TriggerType {
+    GITHUB = "GitHub Webhook",
+    SCHEDULER = "Cloud Scheduler",
+    TASK = "Cloud Task",
+    PUBSUB = "Pub/Sub",
+    UNKNOWN = "Unknown"
+}
+export interface BotRequest {
+    eventName: string;
+    githubDeliveryId: string;
+    signature?: string;
+    taskName?: string;
+    taskRetryCount?: number;
+    traceId?: string;
+    triggerType: TriggerType;
+}
+export declare function parseBotRequest(request: express.Request): BotRequest;

package/build/src/bot-request.js

@@ -0,0 +1,99 @@
+"use strict";
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseBotRequest = exports.TriggerType = void 0;
+const custom_events_1 = require("./custom-events");
+/**
+ * Type of function execution trigger
+ */
+var TriggerType;
+(function (TriggerType) {
+    TriggerType["GITHUB"] = "GitHub Webhook";
+    TriggerType["SCHEDULER"] = "Cloud Scheduler";
+    TriggerType["TASK"] = "Cloud Task";
+    TriggerType["PUBSUB"] = "Pub/Sub";
+    TriggerType["UNKNOWN"] = "Unknown";
+})(TriggerType = exports.TriggerType || (exports.TriggerType = {}));
+function parseBotRequest(request) {
+    const eventName = request.get('X-GitHub-Event') || '';
+    const githubDeliveryId = request.get('X-GitHub-Delivery') || '';
+    const signature = parseSignatureHeader(request);
+    const taskName = request.get('X-CloudTasks-TaskName');
+    const taskRetryCount = parseInt(request.get('X-CloudTasks-TaskRetryCount') || '0');
+    const triggerType = parseTriggerType(eventName, taskName);
+    const traceId = parseTraceId(request);
+    return {
+        eventName,
+        githubDeliveryId,
+        signature,
+        taskName,
+        taskRetryCount,
+        traceId,
+        triggerType,
+    };
+}
+exports.parseBotRequest = parseBotRequest;
+/**
+ * Determine the type of trigger that started this execution
+ * @param eventName event name from header
+ * @param taskName task id from header
+ */
+function parseTriggerType(eventName, taskName) {
+    if (!taskName && custom_events_1.SCHEDULER_EVENT_NAMES.includes(eventName)) {
+        return TriggerType.SCHEDULER;
+    }
+    else if (!taskName && eventName === 'pubsub.message') {
+        return TriggerType.PUBSUB;
+    }
+    else if (!taskName && eventName) {
+        return TriggerType.GITHUB;
+    }
+    else if (eventName) {
+        return TriggerType.TASK;
+    }
+    return TriggerType.UNKNOWN;
+}
+/**
+ * Parse the signature from the request headers.
+ *
+ * If the expected header is not set, returns `unset` because the verification
+ * function throws an exception on empty string when we would rather
+ * treat the error as an invalid signature.
+ * @param request incoming trigger request
+ */
+function parseSignatureHeader(request) {
+    const sha1Signature = request.get('X-Hub-Signature');
+    if (sha1Signature) {
+        return sha1Signature;
+    }
+    return 'unset';
+}
+/**
+ * Parse the trace id from the trace context header. The format of the header
+ * looks something like `<trace-id>/<span-id>;o=<options-flags>`.
+ * @param request incoming trigger request
+ */
+function parseTraceId(request) {
+    const traceContext = request.get('X-Cloud-Trace-Context');
+    if (!traceContext) {
+        return undefined;
+    }
+    const parts = traceContext.split('/');
+    if (parts.length === 0 || !parts[0]) {
+        return undefined;
+    }
+    return parts[0];
+}
+//# sourceMappingURL=bot-request.js.map

package/build/src/bot-request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bot-request.js","sourceRoot":"","sources":["../../src/bot-request.ts"],"names":[],"mappings":";AAAA,4BAA4B;AAC5B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,kDAAkD;AAClD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAGjC,mDAAsD;AAEtD;;GAEG;AACH,IAAY,WAMX;AAND,WAAY,WAAW;IACrB,wCAAyB,CAAA;IACzB,4CAA6B,CAAA;IAC7B,kCAAmB,CAAA;IACnB,iCAAkB,CAAA;IAClB,kCAAmB,CAAA;AACrB,CAAC,EANW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAMtB;AAYD,SAAgB,eAAe,CAAC,OAAwB;IACtD,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;IACtD,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;IAChE,MAAM,SAAS,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACtD,MAAM,cAAc,GAAG,QAAQ,CAC7B,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,IAAI,GAAG,CAClD,CAAC;IACF,MAAM,WAAW,GAAG,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACtC,OAAO;QACL,SAAS;QACT,gBAAgB;QAChB,SAAS;QACT,QAAQ;QACR,cAAc;QACd,OAAO;QACP,WAAW;KACZ,CAAC;AACJ,CAAC;AAnBD,0CAmBC;AAED;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,SAAiB,EAAE,QAAgB;IAC3D,IAAI,CAAC,QAAQ,IAAI,qCAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QAC1D,OAAO,WAAW,CAAC,SAAS,CAAC;KAC9B;SAAM,IAAI,CAAC,QAAQ,IAAI,SAAS,KAAK,gBAAgB,EAAE;QACtD,OAAO,WAAW,CAAC,MAAM,CAAC;KAC3B;SAAM,IAAI,CAAC,QAAQ,IAAI,SAAS,EAAE;QACjC,OAAO,WAAW,CAAC,MAAM,CAAC;KAC3B;SAAM,IAAI,SAAS,EAAE;QACpB,OAAO,WAAW,CAAC,IAAI,CAAC;KACzB;IACD,OAAO,WAAW,CAAC,OAAO,CAAC;AAC7B,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,oBAAoB,CAAC,OAAwB;IACpD,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACrD,IAAI,aAAa,EAAE;QACjB,OAAO,aAAa,CAAC;KACtB;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;GAIG;AACH,SAAS,YAAY,CAAC,OAAwB;IAC5C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAC1D,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;QACnC,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC"}

package/build/src/custom-events.d.ts

@@ -0,0 +1,4 @@
+export declare const SCHEDULER_GLOBAL_EVENT_NAME = "schedule.global";
+export declare const SCHEDULER_INSTALLATION_EVENT_NAME = "schedule.installation";
+export declare const SCHEDULER_REPOSITORY_EVENT_NAME = "schedule.repository";
+export declare const SCHEDULER_EVENT_NAMES: string[];

package/build/src/custom-events.js

@@ -0,0 +1,25 @@
+"use strict";
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SCHEDULER_EVENT_NAMES = exports.SCHEDULER_REPOSITORY_EVENT_NAME = exports.SCHEDULER_INSTALLATION_EVENT_NAME = exports.SCHEDULER_GLOBAL_EVENT_NAME = void 0;
+exports.SCHEDULER_GLOBAL_EVENT_NAME = 'schedule.global';
+exports.SCHEDULER_INSTALLATION_EVENT_NAME = 'schedule.installation';
+exports.SCHEDULER_REPOSITORY_EVENT_NAME = 'schedule.repository';
+exports.SCHEDULER_EVENT_NAMES = [
+    exports.SCHEDULER_GLOBAL_EVENT_NAME,
+    exports.SCHEDULER_INSTALLATION_EVENT_NAME,
+    exports.SCHEDULER_REPOSITORY_EVENT_NAME,
+];
+//# sourceMappingURL=custom-events.js.map

package/build/src/custom-events.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom-events.js","sourceRoot":"","sources":["../../src/custom-events.ts"],"names":[],"mappings":";AAAA,4BAA4B;AAC5B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,kDAAkD;AAClD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAEpB,QAAA,2BAA2B,GAAG,iBAAiB,CAAC;AAChD,QAAA,iCAAiC,GAAG,uBAAuB,CAAC;AAC5D,QAAA,+BAA+B,GAAG,qBAAqB,CAAC;AACxD,QAAA,qBAAqB,GAAG;IACnC,mCAA2B;IAC3B,yCAAiC;IACjC,uCAA+B;CAChC,CAAC"}

package/build/src/gcf-utils.d.ts

@@ -8,6 +8,7 @@ import { Storage } from '@google-cloud/storage';
 import * as express from 'express';
 import { Octokit } from '@octokit/rest';
 import { GCFLogger } from './logging/gcf-logger';
+export { TriggerType } from './bot-request';
 export interface RequestWithRawBody extends express.Request {
     rawBody?: Buffer;
 }
@@ -48,16 +49,6 @@ export interface CronPayload {
     };
     cron_org: string;
 }
-/**
- * Type of function execution trigger
- */
-export declare enum TriggerType {
-    GITHUB = "GitHub Webhook",
-    SCHEDULER = "Cloud Scheduler",
-    TASK = "Cloud Task",
-    PUBSUB = "Pub/Sub",
-    UNKNOWN = "Unknown"
-}
 /**
  * It creates a comment string used for `addOrUpdateissuecomment`.
  */
@@ -105,26 +96,6 @@ export declare class GCFBootstrapper {
     getSecretName(): string;
     getLatestSecretVersionName(): string;
     getProbotConfig(logging?: boolean): Promise<Options>;
-    /**
-     * Parse the signature from the request headers.
-     *
-     * If the expected header is not set, returns `unset` because the verification
-     * function throws an exception on empty string when we would rather
-     * treat the error as an invalid signature.
-     * @param request incoming trigger request
-     */
-    private static parseSignatureHeader;
-    /**
-     * Parse the event name, delivery id, signature and task id from the request headers
-     * @param request incoming trigger request
-     */
-    private static parseRequestHeaders;
-    /**
-     * Determine the type of trigger that started this execution
-     * @param name event name from header
-     * @param taskId task id from header
-     */
-    private static parseTriggerType;
     private parseWrapConfig;
     private getRetryLimit;
     /**
@@ -141,6 +112,7 @@ export declare class GCFBootstrapper {
      * @param wrapOptions {WrapOptions} Bot handler options
      */
     gcf(appFn: ApplicationFunction, wrapOptions?: WrapOptions): HandlerFunction;
+    private buildLoggerBindings;
     /**
      * Entrypoint for handling all scheduled tasks.
      *
@@ -236,4 +208,4 @@ export declare class GCFBootstrapper {
     private maybeWriteBodyToTmp;
     private maybeDownloadOriginalBody;
 }
-export {};
+export declare function getContextLogger(context: any): GCFLogger;

package/build/src/gcf-utils.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.GCFBootstrapper = exports.addOrUpdateIssueComment = exports.getCommentMark = exports.TriggerType = exports.logger = void 0;
+exports.getContextLogger = exports.GCFBootstrapper = exports.addOrUpdateIssueComment = exports.getCommentMark = exports.logger = exports.TriggerType = void 0;
 // Copyright 2019 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,17 +34,13 @@ const uuid_1 = require("uuid");
 const server_1 = require("./server/server");
 const run_1 = require("@googleapis/run");
 const google_auth_library_1 = require("google-auth-library");
+const bot_request_1 = require("./bot-request");
+const custom_events_1 = require("./custom-events");
+var bot_request_2 = require("./bot-request");
+Object.defineProperty(exports, "TriggerType", { enumerable: true, get: function () { return bot_request_2.TriggerType; } });
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const LoggingOctokitPlugin = require('../src/logging/logging-octokit-plugin.js');
 const DEFAULT_CRON_TYPE = 'repository';
-const SCHEDULER_GLOBAL_EVENT_NAME = 'schedule.global';
-const SCHEDULER_INSTALLATION_EVENT_NAME = 'schedule.installation';
-const SCHEDULER_REPOSITORY_EVENT_NAME = 'schedule.repository';
-const SCHEDULER_EVENT_NAMES = [
-    SCHEDULER_GLOBAL_EVENT_NAME,
-    SCHEDULER_INSTALLATION_EVENT_NAME,
-    SCHEDULER_REPOSITORY_EVENT_NAME,
-];
 const RUNNING_IN_TEST = process.env.NODE_ENV === 'test';
 const DEFAULT_TASK_CALLER = 'task-caller@repo-automation-bots.iam.gserviceaccount.com';
 const DEFAULT_WRAP_CONFIG = {
@@ -55,17 +51,6 @@ const DEFAULT_WRAP_CONFIG = {
     maxPubSubRetries: 0,
 };
 exports.logger = new gcf_logger_1.GCFLogger();
-/**
- * Type of function execution trigger
- */
-var TriggerType;
-(function (TriggerType) {
-    TriggerType["GITHUB"] = "GitHub Webhook";
-    TriggerType["SCHEDULER"] = "Cloud Scheduler";
-    TriggerType["TASK"] = "Cloud Task";
-    TriggerType["PUBSUB"] = "Pub/Sub";
-    TriggerType["UNKNOWN"] = "Unknown";
-})(TriggerType = exports.TriggerType || (exports.TriggerType = {}));
 /**
  * It creates a comment string used for `addOrUpdateissuecomment`.
  */
@@ -89,7 +74,7 @@ exports.getCommentMark = getCommentMark;
  */
 const addOrUpdateIssueComment = async (octokit, owner, repo, issueNumber, installationId, commentBody, onlyUpdate = false) => {
     var _a;
-    const commentMark = exports.getCommentMark(installationId);
+    const commentMark = (0, exports.getCommentMark)(installationId);
     const listCommentsResponse = await octokit.issues.listComments({
         owner: owner,
         repo: repo,
@@ -160,7 +145,7 @@ class GCFBootstrapper {
     async loadProbot(appFn, logging) {
         if (!this.probot) {
             const cfg = await this.getProbotConfig(logging);
-            this.probot = probot_1.createProbot({ overrides: cfg });
+            this.probot = (0, probot_1.createProbot)({ overrides: cfg });
         }
         await this.probot.load(appFn);
         return this.probot;
@@ -206,63 +191,11 @@ class GCFBootstrapper {
             });
             return {
                 ...config,
+                log: exports.logger,
                 Octokit: DefaultOctokit,
             };
         }
     }
-    /**
-     * Parse the signature from the request headers.
-     *
-     * If the expected header is not set, returns `unset` because the verification
-     * function throws an exception on empty string when we would rather
-     * treat the error as an invalid signature.
-     * @param request incoming trigger request
-     */
-    static parseSignatureHeader(request) {
-        const sha1Signature = request.get('x-hub-signature') || request.get('X-Hub-Signature');
-        if (sha1Signature) {
-            return sha1Signature;
-        }
-        return 'unset';
-    }
-    /**
-     * Parse the event name, delivery id, signature and task id from the request headers
-     * @param request incoming trigger request
-     */
-    static parseRequestHeaders(request) {
-        const name = request.get('x-github-event') || request.get('X-GitHub-Event') || '';
-        const id = request.get('x-github-delivery') ||
-            request.get('X-GitHub-Delivery') ||
-            '';
-        const signature = this.parseSignatureHeader(request);
-        const taskId = request.get('X-CloudTasks-TaskName') ||
-            request.get('x-cloudtasks-taskname') ||
-            '';
-        const taskRetries = parseInt(request.get('X-CloudTasks-TaskRetryCount') ||
-            request.get('x-cloudtasks-taskretrycount') ||
-            '0');
-        return { name, id, signature, taskId, taskRetries };
-    }
-    /**
-     * Determine the type of trigger that started this execution
-     * @param name event name from header
-     * @param taskId task id from header
-     */
-    static parseTriggerType(name, taskId) {
-        if (!taskId && SCHEDULER_EVENT_NAMES.includes(name)) {
-            return TriggerType.SCHEDULER;
-        }
-        else if (!taskId && name === 'pubsub.message') {
-            return TriggerType.PUBSUB;
-        }
-        else if (!taskId && name) {
-            return TriggerType.GITHUB;
-        }
-        else if (name) {
-            return TriggerType.TASK;
-        }
-        return TriggerType.UNKNOWN;
-    }
     parseWrapConfig(wrapOptions) {
         const wrapConfig = {
             ...DEFAULT_WRAP_CONFIG,
@@ -294,7 +227,7 @@ class GCFBootstrapper {
      * @param wrapOptions {WrapOptions} Bot handler options
      */
     server(appFn, wrapOptions) {
-        return server_1.getServer(this.gcf(appFn, wrapOptions));
+        return (0, server_1.getServer)(this.gcf(appFn, wrapOptions));
     }
     /**
      * Wrap an ApplicationFunction in so it can be started in a Google
@@ -307,13 +240,11 @@ class GCFBootstrapper {
             const wrapConfig = this.parseWrapConfig(wrapOptions);
             this.probot =
                 this.probot || (await this.loadProbot(appFn, wrapConfig.logging));
-            const { name, id, signature, taskId, taskRetries } = GCFBootstrapper.parseRequestHeaders(request);
-            const triggerType = GCFBootstrapper.parseTriggerType(name, taskId);
+            // parse all common fields from a bot request
+            const botRequest = (0, bot_request_1.parseBotRequest)(request);
             // validate the signature
-            exports.logger.info(`request.rawbody: {request.rawbody}`);
             if (!wrapConfig.skipVerification &&
-                !(await this.probot.webhooks.verify(request.rawBody ? request.rawBody.toString() : request.body, signature))) {
-                exports.logger.info('Signature verification failed');
+                !(await this.probot.webhooks.verify(request.rawBody ? request.rawBody.toString() : request.body, botRequest.signature))) {
                 response.status(400).send({
                     statusCode: 400,
                     body: JSON.stringify({ message: 'Invalid signature' }),
@@ -324,33 +255,34 @@ class GCFBootstrapper {
              * Note: any logs written before resetting bindings may contain
              * bindings from previous executions
              */
+            const loggerBindings = this.buildLoggerBindings(botRequest, request.body);
             exports.logger.resetBindings();
-            exports.logger.addBindings(trigger_info_builder_1.buildTriggerInfo(triggerType, id, name, request.body));
+            exports.logger.addBindings(loggerBindings);
+            const requestLogger = exports.logger.child(loggerBindings);
             try {
-                if (triggerType === TriggerType.UNKNOWN) {
-                    exports.logger.info('Trigger type is unknown');
+                if (botRequest.triggerType === bot_request_1.TriggerType.UNKNOWN) {
                     response.sendStatus(400);
                     return;
                 }
-                else if (triggerType === TriggerType.SCHEDULER) {
+                else if (botRequest.triggerType === bot_request_1.TriggerType.SCHEDULER) {
                     // Cloud scheduler tasks (cron)
-                    await this.handleScheduled(id, request, wrapConfig);
+                    await this.handleScheduled(botRequest.githubDeliveryId, request, wrapConfig);
                 }
-                else if (triggerType === TriggerType.PUBSUB) {
+                else if (botRequest.triggerType === bot_request_1.TriggerType.PUBSUB) {
                     const payload = this.parsePubSubPayload(request);
                     await this.enqueueTask({
-                        id,
-                        name,
+                        id: botRequest.githubDeliveryId,
+                        name: botRequest.eventName,
                         body: JSON.stringify(payload),
                     });
                 }
-                else if (triggerType === TriggerType.TASK) {
-                    const maxRetries = this.getRetryLimit(wrapConfig, name);
+                else if (botRequest.triggerType === bot_request_1.TriggerType.TASK) {
+                    const maxRetries = this.getRetryLimit(wrapConfig, botRequest.eventName);
                     // Abort task retries if we've hit the max number by
                     // returning "success"
-                    if (taskRetries > maxRetries) {
-                        exports.logger.metric('too-many-retries');
-                        exports.logger.info(`Too many retries: ${taskRetries} > ${maxRetries}`);
+                    if (botRequest.taskRetryCount > maxRetries) {
+                        requestLogger.metric('too-many-retries');
+                        requestLogger.info(`Too many retries: ${botRequest.taskRetryCount} > ${maxRetries}`);
                         // return 200 so we don't retry the task again
                         response.send({
                             statusCode: 200,
@@ -364,28 +296,29 @@ class GCFBootstrapper {
                     // The payload does not exist, stop retrying on this task by letting
                     // this request "succeed".
                     if (!payload) {
-                        exports.logger.metric('payload-expired');
+                        requestLogger.metric('payload-expired');
                         response.send({
                             statusCode: 200,
                             body: JSON.stringify({ message: 'Payload expired' }),
                         });
                         return;
                     }
+                    setContextLogger(payload, requestLogger);
                     // TODO: find out the best way to get this type, and whether we can
                     // keep using a custom event name.
                     await this.probot.receive({
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        name: name,
+                        name: botRequest.eventName,
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        id: id,
+                        id: botRequest.githubDeliveryId,
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
                         payload: payload,
                     });
                 }
-                else if (triggerType === TriggerType.GITHUB) {
+                else if (botRequest.triggerType === bot_request_1.TriggerType.GITHUB) {
                     await this.enqueueTask({
-                        id,
-                        name,
+                        id: botRequest.githubDeliveryId,
+                        name: botRequest.eventName,
                         body: JSON.stringify(request.body),
                     });
                 }
@@ -395,16 +328,30 @@ class GCFBootstrapper {
                 });
             }
             catch (err) {
-                exports.logger.error(err);
+                requestLogger.error(err);
                 response.status(500).send({
                     statusCode: 500,
                     body: JSON.stringify({ message: err.message }),
                 });
                 return;
             }
+            requestLogger.flushSync();
             exports.logger.flushSync();
         };
     }
+    buildLoggerBindings(botRequest, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    requestBody) {
+        const extras = {};
+        const triggerInfo = (0, trigger_info_builder_1.buildTriggerInfo)(botRequest, requestBody);
+        if (botRequest.traceId) {
+            extras['logging.googleapis.com/trace'] = `projects/${this.projectId}/traces/${botRequest.traceId}`;
+        }
+        return {
+            ...triggerInfo,
+            ...extras,
+        };
+    }
     /**
      * Entrypoint for handling all scheduled tasks.
      *
@@ -440,7 +387,7 @@ class GCFBootstrapper {
     async handleScheduledGlobal(id, body) {
         await this.enqueueTask({
             id,
-            name: SCHEDULER_GLOBAL_EVENT_NAME,
+            name: custom_events_1.SCHEDULER_GLOBAL_EVENT_NAME,
             body: JSON.stringify(body),
         });
     }
@@ -501,7 +448,7 @@ class GCFBootstrapper {
         if (body.installation) {
             await this.enqueueTask({
                 id,
-                name: SCHEDULER_INSTALLATION_EVENT_NAME,
+                name: custom_events_1.SCHEDULER_INSTALLATION_EVENT_NAME,
                 body: JSON.stringify(body),
             });
         }
@@ -523,7 +470,7 @@ class GCFBootstrapper {
                 };
                 await this.enqueueTask({
                     id,
-                    name: SCHEDULER_INSTALLATION_EVENT_NAME,
+                    name: custom_events_1.SCHEDULER_INSTALLATION_EVENT_NAME,
                     body: JSON.stringify(payload),
                 });
             }
@@ -549,7 +496,7 @@ class GCFBootstrapper {
         var _a, _b;
         if (body.repo) {
             // Job was scheduled for a single repository:
-            await this.scheduledToTask(body.repo, id, body, SCHEDULER_REPOSITORY_EVENT_NAME);
+            await this.scheduledToTask(body.repo, id, body, custom_events_1.SCHEDULER_REPOSITORY_EVENT_NAME);
         }
         else if (body.installation) {
             const generator = this.eachInstalledRepository(body.installation.id, wrapConfig);
@@ -559,7 +506,7 @@ class GCFBootstrapper {
                 if (repo.archived === true || repo.disabled === true) {
                     continue;
                 }
-                promises.push(this.scheduledToTask(repo.full_name, id, body, SCHEDULER_REPOSITORY_EVENT_NAME));
+                promises.push(this.scheduledToTask(repo.full_name, id, body, custom_events_1.SCHEDULER_REPOSITORY_EVENT_NAME));
                 if (promises.length >= batchSize) {
                     await Promise.all(promises);
                     promises.splice(0, promises.length);
@@ -601,7 +548,7 @@ class GCFBootstrapper {
                     if (repo.archived === true || repo.disabled === true) {
                         continue;
                     }
-                    promises.push(this.scheduledToTask(repo.full_name, id, payload, SCHEDULER_REPOSITORY_EVENT_NAME));
+                    promises.push(this.scheduledToTask(repo.full_name, id, payload, custom_events_1.SCHEDULER_REPOSITORY_EVENT_NAME));
                     if (promises.length >= batchSize) {
                         await Promise.all(promises);
                         promises.splice(0, promises.length);
@@ -716,7 +663,7 @@ class GCFBootstrapper {
             scopes: ['https://www.googleapis.com/auth/cloud-platform'],
         });
         const authClient = await auth.getClient();
-        const client = await run_1.run({
+        const client = await (0, run_1.run)({
             version: 'v1',
             auth: authClient,
         });
@@ -765,6 +712,7 @@ class GCFBootstrapper {
             await this.cloudTasksClient.createTask({
                 parent: queuePath,
                 task: {
+                    dispatchDeadline: { seconds: 60 * 30 },
                     httpRequest: {
                         httpMethod: 'POST',
                         headers: {
@@ -813,13 +761,13 @@ class GCFBootstrapper {
      */
     async maybeWriteBodyToTmp(body) {
         if (this.payloadBucket) {
-            const tmp = `${Date.now()}-${uuid_1.v4()}.txt`;
+            const tmp = `${Date.now()}-${(0, uuid_1.v4)()}.txt`;
             const bucket = this.storage.bucket(this.payloadBucket);
             const writeable = bucket.file(tmp).createWriteStream({
                 validation: !RUNNING_IN_TEST,
             });
             exports.logger.info(`uploading payload to ${tmp}`);
-            into_stream_1.default(body).pipe(writeable);
+            (0, into_stream_1.default)(body).pipe(writeable);
             await new Promise((resolve, reject) => {
                 writeable.on('error', reject);
                 writeable.on('finish', resolve);
@@ -849,7 +797,7 @@ class GCFBootstrapper {
                 validation: !RUNNING_IN_TEST,
             });
             try {
-                const content = await get_stream_1.default(readable);
+                const content = await (0, get_stream_1.default)(readable);
                 exports.logger.info(`downloaded payload from ${payload.tmpUrl}`);
                 return JSON.parse(content);
             }
@@ -868,4 +816,21 @@ class GCFBootstrapper {
     }
 }
 exports.GCFBootstrapper = GCFBootstrapper;
+const loggerCache = new WeakMap();
+// Helper to inject the request logger
+function setContextLogger(payload, logger) {
+    loggerCache.set(payload, logger);
+}
+// Helper to extract the request logger from the request payload.
+// If gcf-utils wrapper did not provide a logger, fall back to the
+// default logger.
+function getContextLogger(context) {
+    const requestLogger = loggerCache.get(context === null || context === void 0 ? void 0 : context.payload);
+    if (!requestLogger) {
+        exports.logger.warn('Failed to find a context logger');
+        return exports.logger;
+    }
+    return requestLogger;
+}
+exports.getContextLogger = getContextLogger;
 //# sourceMappingURL=gcf-utils.js.map