Merge pull request #344 from Maxim-Mazurok/bot-prs-fix-and-idea

Open PRs from bot account fix & remove .idea
Maxim-Mazurok · Sep 10, 2020 · e99c0b5 · e99c0b5
2 parents af0bbe3 + 26b9f82
commit e99c0b5
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 71 deletions.
diff --git a/.idea/$PRODUCT_WORKSPACE_FILE$ b/.idea/$PRODUCT_WORKSPACE_FILE$
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/google-api-typings-generator.iml b/.idea/google-api-typings-generator.iml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/prettier.xml b/.idea/prettier.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/bin/auto-update/gitHelpers.ts b/bin/auto-update/gitHelpers.ts
@@ -83,6 +83,9 @@ export class GitHelpers {
     }
   };
 
+  /**
+   * @param gapiTypeName - gapi.client.*
+   */
   pushAndOpenPRIfItDoesNotExistAndIfNotOnlyRevisionChanged = async (
     gapiTypeName: string
   ): Promise<void> => {
@@ -91,6 +94,7 @@ export class GitHelpers {
       dtRepoOwner: owner,
       dtRepoName: repo,
       thisRepo,
+      authBot: openPrToken,
     } = this.settings;
 
     if (!this.openPRBranches) {
@@ -116,12 +120,14 @@ export class GitHelpers {
 
     try {
       await this.git.octokit.pulls.create({
+        headers: {
+          authorization: `token ${openPrToken}`,
+        },
         owner,
         repo,
         title: `[${gapiTypeName}] automatic update`,
         head: `${user}:${gapiTypeName}`,
         base: 'master',
-        // TODO: check for updates in the template (using retrieveCommunityProfileMetrics from black-panther-preview, maybe) but it doesn't seem to be updated often
         body: `
   - [x] Use a meaningful title for the pull request. Include the name of the package modified.
   - [x] Test the change in your own code. (Compile and run.)

diff --git a/bin/auto-update/index.ts b/bin/auto-update/index.ts
@@ -10,6 +10,10 @@ if (!process.env.GH_AUTH_TOKEN) {
   throw new Error('Please, set env var: GH_AUTH_TOKEN');
 }
 
+if (!process.env.GH_AUTH_TOKEN_BOT) {
+  throw new Error('Please, set env var: GH_AUTH_TOKEN_BOT');
+}
+
 export interface TypesBranchAndDirSettings {
   typesDirName: string; // directory name in DT
   typesBranchName: string; // branch name where generated types are in the generator repo
@@ -24,17 +28,19 @@ export interface Settings extends GitSettings, TypesBranchAndDirSettings {
   dtRepoName: string; // DefinitelyTyped repo name only
   pullRequestTemplateSHA: string; // SHA of PULL_REQUEST_TEMPLATE.md file from DT
   templateUpdateLabel: string; // label for issues regarding PR template update
+  authBot: string; // GH token for bot account (that will open PRs) with public_repo access
 }
 
 const settings: Settings = {
   dtForkPath: join(resolve(__dirname, '../..'), 'dt-fork'), // TODO: maybe use require('os').tmpdir() or something like that
   typesDirName: 'types',
   tempTypesDirName: 'temp-types',
   typesBranchName: 'types',
-  user: 'google-api-typings-generator',
-  userEmail: 'google-api-typings-generator@mazurok.com',
+  user: 'Maxim-Mazurok',
+  userEmail: 'maxim@mazurok.com',
   userName: 'Google API Typings Generator',
   auth: process.env.GH_AUTH_TOKEN,
+  authBot: process.env.GH_AUTH_TOKEN_BOT,
   dtRepoOwner: 'DefinitelyTyped',
   dtRepoName: 'DefinitelyTyped',
   thisRepo: 'google-api-typings-generator',

diff --git a/bin/get-latest-types.ts b/bin/get-latest-types.ts
@@ -7,7 +7,7 @@ import {TypesBranchAndDirSettings} from './auto-update';
 const pathToTypes = resolve(process.cwd(), process.argv[2]);
 
 const settings: GitSettings & TypesBranchAndDirSettings = {
-  user: 'google-api-typings-generator',
+  user: 'Maxim-Mazurok',
   auth: process.env.GH_AUTH_TOKEN || '', // token is optional
   thisRepo: 'google-api-typings-generator',
   typesBranchName: 'types',

diff --git a/tests/gitHelpers.spec.ts b/tests/gitHelpers.spec.ts
@@ -13,6 +13,7 @@ const settings: Settings = {
   userEmail: 'userEmail',
   userName: 'userName',
   auth: 'auth',
+  authBot: 'authBot',
   dtRepoOwner: 'dtRepoOwner',
   dtRepoName: 'dtRepoName',
   thisRepo: 'thisRepo',