Consider branch deletion protection rule (#162)

pascalgn · Sep 3, 2021 · d210980 · d210980
1 parent e7220c3
commit d210980
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 22 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -1051,26 +1051,38 @@ async function deleteBranch(octokit, pullRequest) {
     return;
   }
 
-  const { data: branch } = await octokit.repos.getBranch({
+  const branchQuery = {
     owner: pullRequest.head.repo.owner.login,
     repo: pullRequest.head.repo.name,
     branch: pullRequest.head.ref
-  });
+  };
+
+  const { data: branch } = await octokit.repos.getBranch(branchQuery);
 
   logger.trace("Branch:", branch);
 
   if (branch.protected) {
-    logger.info("Branch is protected and cannot be deleted:", branch.name);
-  } else {
-    logger.debug("Deleting branch", branch.name, "...");
-    await octokit.git.deleteRef({
-      owner: pullRequest.head.repo.owner.login,
-      repo: pullRequest.head.repo.name,
-      ref: `heads/${branch.name}`
-    });
+    const { data: protectionRules } = await octokit.repos.getBranchProtection(
+      branchQuery
+    );
 
-    logger.info("Merged branch has been deleted:", branch.name);
+    if (
+      protectionRules.allow_deletions &&
+      !protectionRules.allow_deletions.enabled
+    ) {
+      logger.info("Branch is protected and cannot be deleted:", branch.name);
+      return;
+    }
   }
+
+  logger.debug("Deleting branch", branch.name, "...");
+  await octokit.git.deleteRef({
+    owner: pullRequest.head.repo.owner.login,
+    repo: pullRequest.head.repo.name,
+    ref: `heads/${branch.name}`
+  });
+
+  logger.info("Merged branch has been deleted:", branch.name);
 }
 
 function skipPullRequest(context, pullRequest, approvalCount) {

diff --git a/lib/merge.js b/lib/merge.js
@@ -133,26 +133,38 @@ async function deleteBranch(octokit, pullRequest) {
     return;
   }
 
-  const { data: branch } = await octokit.repos.getBranch({
+  const branchQuery = {
     owner: pullRequest.head.repo.owner.login,
     repo: pullRequest.head.repo.name,
     branch: pullRequest.head.ref
-  });
+  };
+
+  const { data: branch } = await octokit.repos.getBranch(branchQuery);
 
   logger.trace("Branch:", branch);
 
   if (branch.protected) {
-    logger.info("Branch is protected and cannot be deleted:", branch.name);
-  } else {
-    logger.debug("Deleting branch", branch.name, "...");
-    await octokit.git.deleteRef({
-      owner: pullRequest.head.repo.owner.login,
-      repo: pullRequest.head.repo.name,
-      ref: `heads/${branch.name}`
-    });
+    const { data: protectionRules } = await octokit.repos.getBranchProtection(
+      branchQuery
+    );
 
-    logger.info("Merged branch has been deleted:", branch.name);
+    if (
+      protectionRules.allow_deletions &&
+      !protectionRules.allow_deletions.enabled
+    ) {
+      logger.info("Branch is protected and cannot be deleted:", branch.name);
+      return;
+    }
   }
+
+  logger.debug("Deleting branch", branch.name, "...");
+  await octokit.git.deleteRef({
+    owner: pullRequest.head.repo.owner.login,
+    repo: pullRequest.head.repo.name,
+    ref: `heads/${branch.name}`
+  });
+
+  logger.info("Merged branch has been deleted:", branch.name);
 }
 
 function skipPullRequest(context, pullRequest, approvalCount) {