Issue作成時のProbotにunit testを追加 + 全体のファイルを再度フォーマット (#505)

* feat: enhance GitHub Probot integration with new JIT config and improved server management

* fix: correct linter configuration by removing duplicate 'recommended' entry

* fix: reorder 'recommended' entry in linter configuration for clarity

* fix: update biome.jsonc structure and enhance workspace recommendations

Author: mafreud

biome.jsonc

@@ -1,11 +1,25 @@
 {
+    "assist": {
+        "actions": {
+            "source": {
+                "useSortedKeys": "on"
+            }
+        },
+        "enabled": true
+    },
+    "files": {
+        "includes": [
+            "**",
+            "!**/node_modules"
+        ]
+    },
     "linter": {
         "enabled": true,
         "rules": {
-            "recommended": true,
             "correctness": {
                 "noUnusedImports": "error"
-            }
+            },
+            "recommended": true
         }
     }
 }

openci-runner/firebase/functions/package-lock.json

@@ -1,19 +1,4 @@
 {
-	"name": "functions",
-	"scripts": {
-		"build": "tsc",
-		"build:watch": "tsc --watch",
-		"serve": "npm run build && firebase emulators:start --only functions",
-		"shell": "npm run build && firebase functions:shell",
-		"start": "npm run build && probot run ./lib/probot/index.js",
-		"deploy": "firebase deploy --only functions",
-		"logs": "firebase functions:log",
-		"test": "vitest run"
-	},
-	"engines": {
-		"node": "22"
-	},
-	"main": "lib/src/index.js",
 	"dependencies": {
 		"@octokit/rest": "^22.0.0",
 		"firebase-admin": "^13.5.0",
@@ -23,14 +8,28 @@
 		"probot": "^14.1.0"
 	},
 	"devDependencies": {
-		"@types/supertest": "^6.0.3",
 		"@vitest/coverage-v8": "^3.2.4",
 		"firebase-functions-test": "^3.1.0",
 		"smee-client": "^4.3.1",
 		"supertest": "^7.0.0",
 		"typescript": "^5.9.3",
 		"vitest": "^3.2.4"
 	},
+	"engines": {
+		"node": "22"
+	},
+	"main": "lib/src/index.js",
+	"name": "functions",
 	"private": true,
+	"scripts": {
+		"build": "tsc",
+		"build:watch": "tsc --watch",
+		"deploy": "firebase deploy --only functions",
+		"logs": "firebase functions:log",
+		"serve": "npm run build && firebase emulators:start --only functions",
+		"shell": "npm run build && firebase functions:shell",
+		"start": "npm run build && probot run ./lib/probot/index.js",
+		"test": "vitest run"
+	},
 	"type": "module"
 }

openci-runner/firebase/functions/package.json

@@ -1,6 +1,32 @@
+import type { Octokit } from "@octokit/rest";
+
 const runnerName = "openci-runner-beta";
 
 // biome-ignore lint/suspicious/noExplicitAny: <Fill the type later>
 export function isJobRequired(context: any): boolean {
 	return context.payload.workflow_job.labels.includes(runnerName);
 }
+
+export async function getJitConfig(
+	octokit: Octokit,
+	owner: string,
+	repo: string,
+	serverId: number,
+): Promise<string> {
+	const jitConfigRes = await octokit.request(
+		`POST /repos/{owner}/{repo}/actions/runners/generate-jitconfig`,
+		{
+			headers: {
+				"X-GitHub-Api-Version": "2022-11-28",
+			},
+			labels: ["openci-runner-beta"],
+			name: `OpenCI ランナー ${serverId}`,
+			owner: `${owner}`,
+			repo: `${repo}`,
+			runner_group_id: 1,
+			work_folder: "_work",
+		},
+	);
+
+	return jitConfigRes.data.encoded_jit_config;
+}

openci-runner/firebase/functions/probot/github.ts

@@ -1,5 +1,3 @@
-import type { Octokit } from "@octokit/rest";
-
 const baseUrl = "https://api.hetzner.cloud/v1/servers";
 
 export interface OctokitToken {
@@ -8,10 +6,10 @@ export interface OctokitToken {
 
 export async function deleteServer(id: string, apiKey: string) {
 	await fetch(`${baseUrl}/${id}`, {
-		method: "DELETE",
 		headers: {
 			Authorization: `Bearer ${apiKey}`,
 		},
+		method: "DELETE",
 	});
 }
 
@@ -22,19 +20,19 @@ export type HetznerResponse = {
 
 export async function createServer(apiKey: string): Promise<HetznerResponse> {
 	const body = {
-		name: crypto.randomUUID(),
+		image: "ubuntu-24.04",
 		location: "fsn1",
+		name: crypto.randomUUID(),
 		server_type: "cpx41",
-		image: "ubuntu-24.04",
 		ssh_keys: ["openci-runner-probot"],
 	};
 
 	const response = await fetch(baseUrl, {
-		method: "POST",
+		body: JSON.stringify(body),
 		headers: {
 			Authorization: `Bearer ${apiKey}`,
 		},
-		body: JSON.stringify(body),
+		method: "POST",
 	});
 
 	const responseJson = await response.json();
@@ -45,8 +43,8 @@ export async function createServer(apiKey: string): Promise<HetznerResponse> {
 	const serverId = server.id;
 
 	return {
-		serverId: serverId,
 		ipv4: ipv4,
+		serverId: serverId,
 	};
 }
 
@@ -63,30 +61,6 @@ export async function getServerStatusById(
 	return jsonRes.server.status;
 }
 
-export async function getJitConfig(
-	octokit: Octokit,
-	owner: string,
-	repo: string,
-	serverId: number,
-): Promise<string> {
-	const jitConfigRes = await octokit.request(
-		`POST /repos/{owner}/{repo}/actions/runners/generate-jitconfig`,
-		{
-			owner: `${owner}`,
-			repo: `${repo}`,
-			name: `OpenCI ランナー ${serverId}`,
-			runner_group_id: 1,
-			labels: ["openci-runner-beta"],
-			work_folder: "_work",
-			headers: {
-				"X-GitHub-Api-Version": "2022-11-28",
-			},
-		},
-	);
-
-	return jitConfigRes.data.encoded_jit_config;
-}
-
 export function initRunner(runnerConfig: string): string {
 	const command = `
 mkdir actions-runner

openci-runner/firebase/functions/probot/hetzner.ts

@@ -1,12 +1,11 @@
+import { setTimeout } from "node:timers/promises";
 import { Octokit } from "@octokit/rest";
 import { NodeSSH } from "node-ssh";
-import { setTimeout } from "node:timers/promises";
 import type { ApplicationFunction, Context, Probot } from "probot";
-import { isJobRequired } from "./github.js";
+import { getJitConfig, isJobRequired } from "./github.js";
 import {
 	createServer,
 	deleteServer,
-	getJitConfig,
 	getServerStatusById,
 	initRunner,
 	type OctokitToken,
@@ -19,9 +18,9 @@ export const appFn: ApplicationFunction = (app: Probot) => {
 	app.log.info("Yay! The app was loaded!");
 
 	// This is for debugging.
-	app.on("issues.reopened", async (context: Context) => {
+	app.on("issues.opened", async (context: Context) => {
 		return context.octokit.rest.issues.createComment(
-			context.issue({ body: "Probot is working!" }),
+			context.issue({ body: "Hello, World!" }),
 		);
 	});
 
@@ -71,9 +70,9 @@ export const appFn: ApplicationFunction = (app: Probot) => {
 			try {
 				const sshResult = await ssh.connect({
 					host: hetznerResponse.ipv4,
-					username: "root",
-					privateKey: process.env.HETZNER_SSH_PRIVATE_KEY,
 					passphrase: process.env.HETZNER_SSH_PASSPHRASE,
+					privateKey: process.env.HETZNER_SSH_PRIVATE_KEY,
+					username: "root",
 				});
 
 				const octokit = new Octokit({

openci-runner/firebase/functions/probot/index.ts

@@ -14,6 +14,8 @@ const hetznerSshPrivateKey = defineSecret("HETZNER_SSH_PRIVATE_KEY");
 
 export const githubWebhook = onRequest(
 	{
+		cpu: 8,
+		memory: "16GiB",
 		secrets: [
 			githubAppId,
 			githubPrivateKey,
@@ -22,24 +24,22 @@ export const githubWebhook = onRequest(
 			hetznerSshPassphrase,
 			hetznerSshPrivateKey,
 		],
-		memory: "16GiB",
-		cpu: 8,
 		timeoutSeconds: 300,
 	},
 	async (req, res) => {
 		log("githubWebhook has started");
 		const probot = await createNodeMiddleware(appFn, {
 			probot: createProbot({
-				overrides: {
-					appId: githubAppId.value(),
-					privateKey: githubPrivateKey.value(),
-					secret: githubWebhookSecret.value(),
-				},
 				env: {
 					HETZNER_API_KEY: hetznerApiKey.value(),
 					HETZNER_SSH_PASSPHRASE: hetznerSshPassphrase.value(),
 					HETZNER_SSH_PRIVATE_KEY: hetznerSshPrivateKey.value(),
 				},
+				overrides: {
+					appId: githubAppId.value(),
+					privateKey: githubPrivateKey.value(),
+					secret: githubWebhookSecret.value(),
+				},
 			}),
 			webhooksPath: "/",
 		});

openci-runner/firebase/functions/src/index.ts

@@ -1,18 +1,18 @@
 {
-  "action": "opened",
-  "issue": {
-    "number": 1,
-    "user": {
-      "login": "hiimbex"
-    }
-  },
-  "repository": {
-    "name": "testing-things",
-    "owner": {
-      "login": "hiimbex"
-    }
-  },
-  "installation": {
-    "id": 2
-  }
+	"action": "opened",
+	"installation": {
+		"id": 2
+	},
+	"issue": {
+		"number": 1,
+		"user": {
+			"login": "hiimbex"
+		}
+	},
+	"repository": {
+		"name": "testing-things",
+		"owner": {
+			"login": "hiimbex"
+		}
+	}
 }