refactor(probot)!: upgrade gcf-utils to probot@10, @octokit/rest@18 #963

bcoe · 2020-09-18T21:41:30Z

First pass at an attempt to get us on the latest version of probot, this is going to be somewhat gnarly.

bcoe · 2020-09-23T04:29:57Z

packages/gcf-utils/package.json

@@ -51,7 +52,7 @@
    "mocha": "^8.0.0",
    "nock": "^13.0.0",
    "sinon": "^9.0.0",
-    "sonic-boom": "^1.0.1",
+    "sonic-boom": "1.1.0",


the point release of sonic-boom breaks types.

packages/gcf-utils/src/gcf-utils.ts

bcoe

@sofisl/@gr2m take a look 😄

@gr2m thanks for your help planning this upgrade so far 👏

bcoe · 2020-09-23T04:31:41Z

packages/gcf-utils/test/gcf-bootstrapper.ts

-        app.on('schedule.repository', spy);
-        app.on('err', sinon.stub().throws());
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        app.on('schedule.repository' as any, spy);


Octokit is now strict about event names, I've been talking to @gr2m about how we might approach this going forward.

packages/gcf-utils/test/logging-octokit-plugin.ts

packages/gcf-utils/src/gcf-utils.ts

bcoe · 2020-09-23T04:33:33Z

packages/gcf-utils/src/gcf-utils.ts

+  // TODO: How do we still get access to this installation token?
+  async getAuthenticatedOctokit(installationId: number): Promise<Octokit> {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const app = (this.probot as any).apps[0] as Application;


@gr2m I think this is what we talked about earlier today, that can be used to give us an Octokit instance with permission to call octokit.apps.listReposAccessibleToInstallation?

yes, sorry for the need of this ugly hack, I hope make it obsolete soon

Just so we don't lose track, @bcoe could I trouble you to file an upstream bug and leave it in a comment here so we can come clean up?

packages/gcf-utils/src/gcf-utils.ts

gr2m · 2020-09-24T18:19:28Z

packages/gcf-utils/src/gcf-utils.ts

+  // TODO: How do we still get access to this installation token?
+  async getAuthenticatedOctokit(installationId: number): Promise<Octokit> {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const app = (this.probot as any).apps[0] as Application;


yes, sorry for the need of this ugly hack, I hope make it obsolete soon

Co-authored-by: Gregor Martynus <gregor@martynus.net>

google-cla · 2020-09-24T23:14:26Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

bcoe · 2020-09-24T23:15:51Z

@gr2m thank you for the review.

google-cla · 2020-09-29T01:48:22Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

google-cla · 2020-09-29T01:49:43Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

packages/gcf-utils/src/gcf-utils.ts

google-cla · 2020-09-29T01:55:12Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

google-cla · 2020-09-29T15:44:02Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

JustinBeckwith · 2020-09-29T15:46:32Z

packages/gcf-utils/src/gcf-utils.ts

+  // TODO: How do we still get access to this installation token?
+  async getAuthenticatedOctokit(installationId: number): Promise<Octokit> {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const app = (this.probot as any).apps[0] as Application;


Just so we don't lose track, @bcoe could I trouble you to file an upstream bug and leave it in a comment here so we can come clean up?

JustinBeckwith · 2020-09-29T15:47:02Z

packages/gcf-utils/test/gcf-bootstrapper.ts

-          });
+      sinon
+        .stub(bootstrapper, 'getAuthenticatedOctokit')
+        .returns(Promise.resolve(new Octokit()));


Shorten to .resolves(new Octokit())

JustinBeckwith · 2020-09-29T15:48:28Z

packages/release-please/src/release-please.ts

@@ -190,7 +197,8 @@ export = (app: Application) => {
    }
  });

-  app.on('schedule.repository', async context => {
+  // See: https://github.com/octokit/webhooks.js/issues/277
+  app.on('schedule.repository' as any, async context => {


Just to keep the build clean, please address the warnings here

JustinBeckwith · 2020-09-29T15:48:52Z

packages/release-please/test/release-please.ts

@@ -16,8 +16,18 @@ import myProbotApp from '../src/release-please';
 import {Runner} from '../src/runner';
 import {describe, it, beforeEach} from 'mocha';
 import {resolve} from 'path';
+
+// We provide our own GitHub instnace, similar to


typo in instnace :)

JustinBeckwith · 2020-09-29T15:49:47Z

packages/release-please/test/release-please.ts

        )
-        .reply(200, {content: config.toString('base64')});


This is gonna break stuff in other bots

gr2m · 2020-09-29T15:57:57Z

packages/release-please/test/release-please.ts

+        // see: https://github.com/probot/probot/issues/1367
+        name: 'pull_request.labeled' as any,


Remove .labeled from the name. labeled is the action, it is part of the payload:

repo-automation-bots/packages/release-please/test/fixtures/pull_request_labeled.json

Line 2 in e9637b1

"action": "labeled",

Suggested change

// see: https://github.com/probot/probot/issues/1367

name: 'pull_request.labeled' as any,

name: 'pull_request',

gr2m · 2020-09-29T15:58:12Z

packages/release-please/test/release-please.ts

+        // see: https://github.com/probot/probot/issues/1367
+        name: 'pull_request.labeled' as any,


Suggested change

// see: https://github.com/probot/probot/issues/1367

name: 'pull_request.labeled' as any,

name: 'pull_request',

google-cla · 2020-09-29T16:40:47Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

chore(probot): update dependencies

4eebb09

bcoe requested a review from a team September 18, 2020 21:41

google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label Sep 18, 2020

bcoe added 2 commits September 22, 2020 21:28

chore: finish first pass at upgrade attempt

1adaf68

Merge branch 'master' into attempt-upgrade

96ee2bd

bcoe commented Sep 23, 2020

View reviewed changes

packages/gcf-utils/src/gcf-utils.ts Outdated Show resolved Hide resolved

bcoe commented Sep 23, 2020

View reviewed changes

Merge branch 'master' into attempt-upgrade

4ae6e0d

bcoe mentioned this pull request Sep 23, 2020

Allow for custom events in receive() without warning octokit/webhooks.js#277

Open

gr2m reviewed Sep 24, 2020

View reviewed changes

Update packages/gcf-utils/src/gcf-utils.ts

0eb8b4b

Co-authored-by: Gregor Martynus <gregor@martynus.net>

google-cla bot added cla: no This human has *not* signed the Contributor License Agreement. and removed cla: yes This human has signed the Contributor License Agreement. labels Sep 24, 2020

bcoe added cla: yes This human has signed the Contributor License Agreement. and removed cla: no This human has *not* signed the Contributor License Agreement. labels Sep 24, 2020

test: add back missing test, upgrade release-please to ensure it works

aed08b4

google-cla bot added cla: no This human has *not* signed the Contributor License Agreement. and removed cla: yes This human has signed the Contributor License Agreement. labels Sep 29, 2020

Merge branch 'master' into attempt-upgrade

1cbaa85

bcoe added cla: yes This human has signed the Contributor License Agreement. and removed cla: no This human has *not* signed the Contributor License Agreement. labels Sep 29, 2020

bcoe commented Sep 29, 2020

View reviewed changes

packages/gcf-utils/src/gcf-utils.ts Show resolved Hide resolved

chore: fix linting

95f12e8

google-cla bot removed the cla: yes This human has signed the Contributor License Agreement. label Sep 29, 2020

google-cla bot added the cla: no This human has *not* signed the Contributor License Agreement. label Sep 29, 2020

bcoe added cla: yes This human has signed the Contributor License Agreement. and removed cla: no This human has *not* signed the Contributor License Agreement. labels Sep 29, 2020

bcoe mentioned this pull request Sep 29, 2020

feat(gcf-utils): write payload to tmp bucket #983

Merged

build: wrong version #

e9637b1

google-cla bot added cla: no This human has *not* signed the Contributor License Agreement. and removed cla: yes This human has signed the Contributor License Agreement. labels Sep 29, 2020

JustinBeckwith approved these changes Sep 29, 2020

View reviewed changes

gr2m reviewed Sep 29, 2020

View reviewed changes

chore: address code review

153d98a

bcoe added cla: yes This human has signed the Contributor License Agreement. and removed cla: no This human has *not* signed the Contributor License Agreement. labels Sep 29, 2020

bcoe changed the title ~~chore(probot): update dependencies~~ refactor(probot)!: upgrade gcf-utils to probot@10, @octokit/rest@18 Sep 29, 2020

bcoe merged commit a601f4a into master Sep 29, 2020

release-please bot mentioned this pull request Sep 29, 2020

chore: release 6.0.0 #984

Merged

bcoe deleted the attempt-upgrade branch September 29, 2020 17:00

github-actions bot mentioned this pull request Mar 18, 2021

chore: release gcf-utils 7.1.1 chingor13/repo-automation-bots#3

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(probot)!: upgrade gcf-utils to probot@10, @octokit/rest@18 #963

refactor(probot)!: upgrade gcf-utils to probot@10, @octokit/rest@18 #963

bcoe commented Sep 18, 2020 •

edited

Loading

bcoe Sep 23, 2020

bcoe left a comment

bcoe Sep 23, 2020

bcoe Sep 23, 2020

gr2m Sep 24, 2020

JustinBeckwith Sep 29, 2020

gr2m Sep 24, 2020

google-cla bot commented Sep 24, 2020

bcoe commented Sep 24, 2020

google-cla bot commented Sep 29, 2020

google-cla bot commented Sep 29, 2020

google-cla bot commented Sep 29, 2020

google-cla bot commented Sep 29, 2020

JustinBeckwith Sep 29, 2020

JustinBeckwith Sep 29, 2020

JustinBeckwith Sep 29, 2020

JustinBeckwith Sep 29, 2020

JustinBeckwith Sep 29, 2020

gr2m Sep 29, 2020

gr2m Sep 29, 2020

google-cla bot commented Sep 29, 2020

		// see: https://github.com/probot/probot/issues/1367
		name: 'pull_request.labeled' as any,

	// see: https://github.com/probot/probot/issues/1367
	name: 'pull_request.labeled' as any,
	name: 'pull_request',

refactor(probot)!: upgrade gcf-utils to probot@10, @octokit/rest@18 #963

refactor(probot)!: upgrade gcf-utils to probot@10, @octokit/rest@18 #963

Conversation

bcoe commented Sep 18, 2020 • edited Loading

Choose a reason for hiding this comment

bcoe left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

google-cla bot commented Sep 24, 2020

bcoe commented Sep 24, 2020

google-cla bot commented Sep 29, 2020

google-cla bot commented Sep 29, 2020

google-cla bot commented Sep 29, 2020

google-cla bot commented Sep 29, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

google-cla bot commented Sep 29, 2020

bcoe commented Sep 18, 2020 •

edited

Loading