fix(ng-dev): improve failure message for repository rule violation

When a merge fails due to a repository rule violation, we provide a failure message pointing to our group membership based
access for merging.

Author: josephperrott

.github/local-actions/branch-manager/main.js

@@ -66,6 +66,19 @@ export async function mergePullRequest(prNumber: number, flags: PullRequestMerge
         Log.warn(`You can generate a token here: ${GITHUB_TOKEN_GENERATE_URL}`);
         return false;
       }
+      // Catch errors to the Github API for repository rule violations. We want to
+      // exit the script with a better explanation of the error.
+      if (
+        isGithubApiError(e) &&
+        e.status === 405 &&
+        e.message.startsWith('Repository rule violations found')
+      ) {
+        Log.error('  ✘  Repository Rule Violation. This typically indicates that you are not');
+        Log.error('     currently a member of the expected group for merge permissions in this');
+        Log.error('     repository. Have you been placed in the expected caretaking group?');
+        Log.debug('Github API request failed: ' + bold(e.message));
+        return false;
+      }
       if (isGithubApiError(e)) {
         Log.error('Github API request failed: ' + bold(e.message));
         return false;

ng-dev/pr/merge/merge-pull-request.ts

@@ -12,6 +12,7 @@ import {Octokit} from '@octokit/rest';
 import {RequestParameters} from '@octokit/types';
 import {RequestError} from '@octokit/request-error';
 import {query} from 'typed-graphqlify';
+import {Log} from '../logging';
 
 /**
  * An object representation of a Graphql Query to be used as a response type and
@@ -30,7 +31,17 @@ export interface GithubRepo {
 /** A Github client for interacting with the Github APIs. */
 export class GithubClient {
   /** The octokit instance actually performing API requests. */
-  protected _octokit: Octokit = new Octokit({...this._octokitOptions});
+  protected _octokit: Octokit = new Octokit({
+    // Move all default octokit logging into debug. We prefer handle all of the logging exposed
+    // to user's from Github ourselves.
+    log: {
+      debug: Log.debug,
+      error: Log.debug,
+      info: Log.debug,
+      warn: Log.debug,
+    },
+    ...this._octokitOptions,
+  });
 
   readonly pulls: Octokit['pulls'] = this._octokit.pulls;
   readonly orgs: Octokit['orgs'] = this._octokit.orgs;