Add support for committing submodules

Author: mheap

create-or-update-files.js

@@ -71,25 +71,32 @@ module.exports = function(octokit, opts) {
 
           let contents = properties.contents || properties;
           let mode = properties.mode || "100644";
+          let type = properties.type || "blob";
 
           if (!contents) {
             return reject(`No file contents provided for ${fileName}`);
           }
 
-          let file = (
-            await octokit.git.createBlob({
-              owner,
-              repo,
-              content: Buffer.from(contents).toString("base64"),
-              encoding: "base64"
-            })
-          ).data;
+          let fileSha;
+          if (type == "commit") {
+            fileSha = contents;
+          } else {
+            let file = (
+              await octokit.git.createBlob({
+                owner,
+                repo,
+                content: Buffer.from(contents).toString("base64"),
+                encoding: "base64"
+              })
+            ).data;
+            fileSha = file.sha;
+          }
 
           treeItems.push({
             path: fileName,
-            sha: file.sha,
+            sha: fileSha,
             mode: mode,
-            type: "blob"
+            type: type
           });
         }
 

create-or-update-files.test.js

@@ -141,6 +141,31 @@ test(`no file contents provided`, async () => {
   );
 });
 
+test(`success (submodule, branch exists)`, async () => {
+  const body = {
+    ...validRequest,
+    changes: [
+      {
+        message: "Your submodule commit message",
+        files: {
+          my_submodule: {
+            contents: "new-submodule-sha",
+            mode: "160000",
+            type: "commit"
+          }
+        }
+      }
+    ]
+  };
+
+  mockGetRef(branch, `sha-${branch}`, true);
+  mockCreateTreeSubmodule(`sha-${branch}`);
+  mockCommitSubmodule(`sha-${branch}`);
+  mockUpdateRef(branch);
+
+  await expect(run(body)).resolves.toEqual(branch);
+});
+
 test(`success (branch exists)`, async () => {
   const body = {
     ...validRequest
@@ -277,6 +302,31 @@ function mockCreateBlobFileThree() {
   );
 }
 
+function mockCreateTreeSubmodule(baseTree) {
+  const expectedBody = {
+    tree: [
+      {
+        path: "my_submodule",
+        sha: "new-submodule-sha",
+        mode: "160000",
+        type: "commit"
+      }
+    ],
+    base_tree: baseTree
+  };
+
+  const m = nock("https://api.github.com").post(
+    `/repos/${owner}/${repo}/git/trees`,
+    expectedBody
+  );
+
+  const body = {
+    sha: "4112258c05f8ce2b0570f1bbb1a330c0f9595ff9"
+  };
+
+  m.reply(200, body);
+}
+
 function mockCreateTree(baseTree) {
   const expectedBody = {
     tree: [
@@ -333,6 +383,25 @@ function mockCreateTreeSecond(baseTree) {
   m.reply(200, body);
 }
 
+function mockCommitSubmodule(baseTree) {
+  const expectedBody = {
+    message: "Your submodule commit message",
+    tree: "4112258c05f8ce2b0570f1bbb1a330c0f9595ff9",
+    parents: [baseTree]
+  };
+
+  const m = nock("https://api.github.com").post(
+    `/repos/${owner}/${repo}/git/commits`,
+    expectedBody
+  );
+
+  const body = {
+    sha: "ef105a72c03ce2743d90944c2977b1b5563b43c0"
+  };
+
+  m.reply(200, body);
+}
+
 function mockCommit(baseTree) {
   const expectedBody = {
     message: "Your commit message",