improvement(fern-bot): the bot stops using docker to upgrade generato…

…rs (#1330)
fern-api · Sep 4, 2024 · c637fde · c637fde
1 parent 229967e
commit c637fde
Show file tree

Hide file tree

Showing 25 changed files with 985 additions and 255 deletions.
diff --git a/.github/workflows/deploy-fern-bot-dev.yml b/.github/workflows/deploy-fern-bot-dev.yml
@@ -20,6 +20,7 @@ env:
   GITHUB_APP_CLIENT_SECRET: ${{ secrets.FERN_BOT_DEV_GITHUB_APP_CLIENT_SECRET }}
   GITHUB_APP_WEBHOOK_SECRET: ${{ secrets.FERN_BOT_DEV_GITHUB_APP_WEBHOOK_SECRET }}
   DEFAULT_VENUS_ORIGIN: "https://venus-dev2.buildwithfern.com"
+  DEFAULT_FDR_ORIGIN: "https://registry-dev2.buildwithfern.com"
   CO_API_KEY: ${{ secrets.DEV_CO_API_KEY }}
 
 jobs:
@@ -37,4 +38,6 @@ jobs:
       - name: 🚀 serverless deploy
         env:
           CI: false
-        run: pnpm --filter "@fern-platform/fern-bot" release --stage development
+        run: |
+          pnpm --filter "@fern-platform/fern-bot" install
+          pnpm --filter "@fern-platform/fern-bot" release --stage development
diff --git a/.github/workflows/deploy-fern-bot-prod.yml b/.github/workflows/deploy-fern-bot-prod.yml
@@ -16,6 +16,7 @@ env:
   GITHUB_APP_CLIENT_SECRET: ${{ secrets.FERN_BOT_PROD_GITHUB_APP_CLIENT_SECRET }}
   GITHUB_APP_WEBHOOK_SECRET: ${{ secrets.FERN_BOT_PROD_GITHUB_APP_WEBHOOK_SECRET }}
   DEFAULT_VENUS_ORIGIN: "https://venus.buildwithfern.com"
+  DEFAULT_FDR_ORIGIN: "https://registry.buildwithfern.com"
   CO_API_KEY: ${{ secrets.PROD_CO_API_KEY }}
 
 jobs:
@@ -35,5 +36,7 @@ jobs:
         env:
           CI: false
         run: |
+          # Run compile to generate the dist folder for the Github dep
+          pnpm compile
           pnpm --filter "@fern-platform/fern-bot" install
           pnpm --filter "@fern-platform/fern-bot" release --stage production
diff --git a/.github/workflows/invoke-fern-bot-update-spec.yml b/.github/workflows/invoke-fern-bot-update-spec.yml
@@ -27,6 +27,7 @@ jobs:
       GITHUB_APP_CLIENT_SECRET: ${{ secrets.FERN_BOT_DEV_GITHUB_APP_CLIENT_SECRET }}
       GITHUB_APP_WEBHOOK_SECRET: ${{ secrets.FERN_BOT_DEV_GITHUB_APP_WEBHOOK_SECRET }}
       DEFAULT_VENUS_ORIGIN: "https://venus-dev2.buildwithfern.com"
+      DEFAULT_FDR_ORIGIN: "https://registry-dev2.buildwithfern.com"
       CO_API_KEY: ${{ secrets.DEV_CO_API_KEY }}
       REPO_TO_RUN_ON: ${{ github.event.inputs.repo }}
       CI: false
@@ -57,6 +58,7 @@ jobs:
       GITHUB_APP_CLIENT_SECRET: ${{ secrets.FERN_BOT_PROD_GITHUB_APP_CLIENT_SECRET }}
       GITHUB_APP_WEBHOOK_SECRET: ${{ secrets.FERN_BOT_PROD_GITHUB_APP_WEBHOOK_SECRET }}
       DEFAULT_VENUS_ORIGIN: "https://venus.buildwithfern.com"
+      DEFAULT_FDR_ORIGIN: "https://registry.buildwithfern.com"
       CO_API_KEY: ${{ secrets.PROD_CO_API_KEY }}
       REPO_TO_RUN_ON: ${{ github.event.inputs.repo }}
       CI: false

diff --git a/.github/workflows/invoke-fern-bot-upgrade-generators.yml b/.github/workflows/invoke-fern-bot-upgrade-generators.yml
@@ -27,6 +27,7 @@ jobs:
       GITHUB_APP_CLIENT_SECRET: ${{ secrets.FERN_BOT_DEV_GITHUB_APP_CLIENT_SECRET }}
       GITHUB_APP_WEBHOOK_SECRET: ${{ secrets.FERN_BOT_DEV_GITHUB_APP_WEBHOOK_SECRET }}
       DEFAULT_VENUS_ORIGIN: "https://venus-dev2.buildwithfern.com"
+      DEFAULT_FDR_ORIGIN: "https://registry-dev2.buildwithfern.com"
       CO_API_KEY: ${{ secrets.DEV_CO_API_KEY }}
       REPO_TO_RUN_ON: ${{ github.event.inputs.repo }}
     steps:
@@ -56,6 +57,7 @@ jobs:
       GITHUB_APP_CLIENT_SECRET: ${{ secrets.FERN_BOT_PROD_GITHUB_APP_CLIENT_SECRET }}
       GITHUB_APP_WEBHOOK_SECRET: ${{ secrets.FERN_BOT_PROD_GITHUB_APP_WEBHOOK_SECRET }}
       DEFAULT_VENUS_ORIGIN: "https://venus.buildwithfern.com"
+      DEFAULT_FDR_ORIGIN: "https://registry.buildwithfern.com"
       CO_API_KEY: ${{ secrets.PROD_CO_API_KEY }}
       REPO_TO_RUN_ON: ${{ github.event.inputs.repo }}
     steps:

diff --git a/.github/workflows/test-fern-bot.yml b/.github/workflows/test-fern-bot.yml
@@ -20,6 +20,7 @@ env:
   GITHUB_APP_CLIENT_SECRET: ${{ secrets.FERN_BOT_DEV_GITHUB_APP_CLIENT_SECRET }}
   GITHUB_APP_WEBHOOK_SECRET: ${{ secrets.FERN_BOT_DEV_GITHUB_APP_WEBHOOK_SECRET }}
   DEFAULT_VENUS_ORIGIN: "https://venus-dev2.buildwithfern.com"
+  DEFAULT_FDR_ORIGIN: "https://registry-dev2.buildwithfern.com"
   CO_API_KEY: ${{ secrets.DEV_CO_API_KEY }}
 
 jobs:
@@ -50,3 +51,8 @@ jobs:
           pnpm --filter "@fern-platform/fern-bot" invoke local --function updateRepoDataset --stage development
           pnpm --filter "@fern-platform/fern-bot" invoke local --function updateOpenApiSpec --stage development
           pnpm --filter "@fern-platform/fern-bot" invoke local --function updateOpenApiSpecs --stage development
+
+      - name: 🧪 Test
+        env:
+          CI: false
+        run: pnpm --filter "@fern-platform/fern-bot" test:ete
diff --git a/packages/commons/github/src/deleteBranch.ts b/packages/commons/github/src/deleteBranch.ts
@@ -0,0 +1,20 @@
+/* eslint-disable no-console */
+import { SimpleGit } from "simple-git";
+import { DEFAULT_REMOTE_NAME } from "./constants";
+
+export async function deleteBranch(git: SimpleGit, branchToDeleteName: string): Promise<void> {
+    await git.fetch(DEFAULT_REMOTE_NAME, branchToDeleteName);
+    const deleteResult = await git.branch(["-D", branchToDeleteName]);
+    // For some reason the API is not typed to return this, but the documentation
+    // says that it can return a BranchSingleDeleteResult, which is an interface, so we
+    // cannot do an instance check:
+    // https://www.npmjs.com/package/simple-git#git-branch
+    if ("success" in deleteResult) {
+        console.log(`Deleted branch ${branchToDeleteName}`);
+        if (deleteResult.success !== true) {
+            throw new Error("Failed to delete branch, received a failure response: " + JSON.stringify(deleteResult));
+        }
+    } else {
+        throw new Error("Failed to delete branch, received an unexpected response: " + JSON.stringify(deleteResult));
+    }
+}
diff --git a/packages/commons/github/src/getOrUpdateBranch.ts b/packages/commons/github/src/getOrUpdateBranch.ts
@@ -10,7 +10,7 @@ export async function getOrUpdateBranch(
     try {
         // If you can fetch the branch, checkout the branch
         await git.fetch(DEFAULT_REMOTE_NAME, branchToCheckoutName);
-        console.log("Branch exists, checking out");
+        console.log(`Branch (${branchToCheckoutName}) exists, checking out`);
         await git.checkout(branchToCheckoutName);
         // Merge the default branch into this branch to update it
         // prefer the default branch changes
@@ -20,7 +20,7 @@ export async function getOrUpdateBranch(
         // to the same branch that are not OpenAPI related, that we'd lose if we deleted and reupdated the spec.
         await git.merge(["-X", "theirs", defaultBranchName]);
     } catch (e) {
-        console.log("Branch does not exist, create and checkout");
+        console.log(`Branch (${branchToCheckoutName}) does not exist, create and checkout`);
         await git.checkoutBranch(branchToCheckoutName, defaultBranchName);
     }
 }
diff --git a/packages/commons/github/src/index.ts b/packages/commons/github/src/index.ts
@@ -1,5 +1,6 @@
 export { cloneRepository } from "./cloneRepository";
 export { createOrUpdatePullRequest } from "./createOrUpdatePullRequest";
+export { deleteBranch } from "./deleteBranch";
 export { getLatestTag } from "./getLatestTag";
 export { getOrUpdateBranch } from "./getOrUpdateBranch";
 export { parseRepository } from "./parseRepository";