fix(github): refactor to support latest octokit

package.json

@@ -98,7 +98,7 @@
     }
   },
   "dependencies": {
-    "@octokit/rest": "14.0.5",
+    "@octokit/rest": "15.9.4",
     "app-root-path": "^2.0.1",
     "babel-plugin-source-map-support": "^2.0.1",
     "babel-plugin-transform-runtime": "^6.23.0",

serverless.yml

@@ -8,7 +8,7 @@ provider:
   name: aws
   runtime: nodejs8.10
   memorySize: 2048 # optional, in MB, default is 1024
-  timeout: 30 # optional, in seconds, default is 6
+  timeout: 60 # optional, in seconds, default is 6
 
   stage: ${env:GTM_AWS_STAGE, 'dev'}
   region: ${env:GTM_AWS_REGION}

src/serverless/gtmGithubUtils.js

@@ -4,6 +4,7 @@ let json = require('format-json');
 if (process.env.GTM_GITHUB_DEBUG) process.env.DEBUG = 'octokit:rest*';
 let GitHubApi = require('@octokit/rest');
 let crypto = require('crypto');
+let https = require('https');
 let githubUpdaters = {
     pull_request: updateGitHubPullRequest,
     comment: updateGitHubComment,
@@ -17,13 +18,16 @@ async function connect(context) {
     console.log('Connecting to GitHub');
     console.log('GitHub SSL Validation: ' + String(ghEnforceValidSsl));
     let githubOptions = {
-        host: process.env.GTM_GITHUB_HOST || 'api.github.com',
-        debug: process.env.GTM_GITHUB_DEBUG || false,
-        timeout: parseInt(process.env.GTM_GITHUB_TIMEOUT) || 5000,
-        pathPrefix: process.env.GTM_GITHUB_PATH_PREFIX || '',
-        proxy: process.env.GTM_GITHUB_PROXY || '',
-        rejectUnauthorized: ghEnforceValidSsl
+        baseUrl: `https://${process.env.GTM_GITHUB_HOST || 'api.github.com'}${process.env.GTM_GITHUB_PATH_PREFIX ||
+            ''}`,
+        timeout: parseInt(process.env.GTM_GITHUB_TIMEOUT) || 5000
     };
+    if (process.env.GTM_GITHUB_PROXY) {
+        githubOptions.agent = new https.Agent({
+            proxy: process.env.GTM_GITHUB_PROXY,
+            rejectUnauthorized: false
+        });
+    }
 
     console.log('Creating GitHub API Connection');
     let github = new GitHubApi(githubOptions);
@@ -44,8 +48,8 @@ async function connect(context) {
 
     // test connection
     try {
-        let meta = await github.misc.getMeta();
-        console.log(`Connected to GitHub at ${githubOptions.host}. metadata: ${json.plain(meta)}`);
+        let meta = await github.misc.getMeta({});
+        console.log(`Connected to GitHub at ${githubOptions.baseUrl}. metadata: ${json.plain(meta)}`);
     } catch (e) {
         console.log(e);
         throw e;