feat: use @probot/get-private-key (#1414)

part of #1309

bin/probot-receive.js

@@ -6,8 +6,8 @@ require("dotenv").config();
 const path = require("path");
 const uuid = require("uuid");
 const program = require("commander");
+const { getPrivateKey } = require("@probot/get-private-key");
 
-const { findPrivateKey } = require("../lib/helpers/get-private-key");
 const {
   logWarningsForObsoleteEnvironmentVariables,
 } = require("../lib/helpers/log-warnings-for-obsolete-environment-variables");
@@ -36,7 +36,7 @@ program
   .option(
     "-P, --private-key <file>",
     "Path to certificate of the GitHub App",
-    findPrivateKey
+    getPrivateKey
   )
   .parse(process.argv);
 
@@ -46,7 +46,7 @@ if (!program.event || !program.payloadPath) {
   program.help();
 }
 
-const privateKey = findPrivateKey();
+const privateKey = getPrivateKey();
 if (!githubToken && (!program.app || !privateKey)) {
   console.warn(
     "No token specified and no certificate found, which means you will not be able to do authenticated requests to GitHub"

package.json

@@ -46,6 +46,7 @@
     "@octokit/request": "^5.1.0",
     "@octokit/types": "^5.0.1",
     "@octokit/webhooks": "^7.15.0",
+    "@probot/get-private-key": "^1.0.0",
     "@probot/octokit-plugin-config": "^1.0.0",
     "@probot/pino": "^1.1.2",
     "@types/express": "^4.17.2",

src/index.ts

@@ -1,22 +1,23 @@
 // tslint:disable-next-line: no-var-requires
 require("dotenv").config();
 
+import { Server } from "http";
+
 import express from "express";
 import Redis from "ioredis";
 import LRUCache from "lru-cache";
 import { Deprecation } from "deprecation";
 import pinoHttp from "pino-http";
+import { getPrivateKey } from "@probot/get-private-key";
 
 import type { WebhookEvent, Webhooks } from "@octokit/webhooks";
 import type { Logger } from "pino";
 
-import { Server } from "http";
 import { Application } from "./application";
 import { setupAppFactory } from "./apps/setup";
 import { Context, WebhookPayloadWithRepository } from "./context";
 import { ProbotOctokit } from "./octokit/probot-octokit";
 import { getLog } from "./helpers/get-log";
-import { findPrivateKey } from "./helpers/get-private-key";
 import { resolveAppFunction } from "./helpers/resolve-app-function";
 import { createServer } from "./server/create-server";
 import { createWebhookProxy } from "./helpers/webhook-proxy";
@@ -110,7 +111,8 @@ export class Probot {
           .parse(appFn);
 
         return {
-          privateKey: findPrivateKey(program.privateKey) || undefined,
+          privateKey:
+            getPrivateKey({ filepath: program.privateKey }) || undefined,
           id: program.app,
           port: program.port,
           host: program.host,
@@ -119,7 +121,7 @@ export class Probot {
           webhookProxy: program.webhookProxy,
         };
       }
-      const privateKey = findPrivateKey();
+      const privateKey = getPrivateKey();
       return {
         privateKey: (privateKey && privateKey.toString()) || undefined,
         id: Number(process.env.APP_ID),