delete webhook on service deletion

src/components/cloud/CreateServiceForm.tsx

@@ -60,7 +60,7 @@ const createGithubWebhook = async (namespace: string, service) => {
   const ok = new Octokit({
     auth: account.access_token,
   });
-  ok.repos.createWebhook({
+  return await ok.repos.createWebhook({
     owner: service.ghPackageOwner,
     repo: service.ghPackageRepo,
     config: {
@@ -101,7 +101,11 @@ const createServiceFromForm = async (form: FormData) => {
     try {
       service.webhookSecret = crypto.randomBytes(16).toString("hex");
       await ensureGithubPullSecret(user.name);
-      await createGithubWebhook(user.name, service);
+      const { data: hook } = await createGithubWebhook(user.name, service);
+      service.annotations = {
+        "apps.deploycat.io/gh-webhook-id": hook.id.toString(),
+        "apps.deploycat.io/gh-repo": service.ghPackageRepo,
+      };
     } catch (e) {
       console.error(e);
     }

src/lib/knative.ts

@@ -128,6 +128,7 @@ export class Knative {
           annotations: {
             "apps.deploycat.io/webhook-secret": service.webhookSecret,
             "apps.deploycat.io/source": source,
+            ...(service.annotations ?? {}),
           },
         },
         spec: {

src/routes/cloud/apps/[app].tsx

@@ -18,6 +18,8 @@ import { rangeQuery } from "~/lib/prometheus";
 import { CheckBadgeIcon } from "@deploy-cat/heroicons-solid/24/solid/esm";
 import { StatusBadge } from "~/components/cloud/service/StatusBadge";
 import type { Service as KnativeService } from "~/lib/knative";
+import { getAccount } from "~/lib/auth";
+import { Octokit } from "@octokit/rest";
 
 const getService = cache(async (app: string) => {
   "use server";
@@ -35,6 +37,27 @@ const deleteServiceFromForm = async (form: FormData) => {
     name: form.get("name") as string,
   };
   const user = await getUser();
+  const currentService = await knative.getService(service.name, user.name);
+  if (
+    currentService.raw.metadata?.annotations["apps.deploycat.io/source"] ===
+    "ghcr"
+  ) {
+    const account = await getAccount();
+    const ok = new Octokit({
+      auth: account.access_token,
+    });
+    await ok.repos.deleteWebhook({
+      owner: user.name,
+      repo: currentService.raw.metadata.annotations[
+        "apps.deploycat.io/gh-repo"
+      ],
+      hook_id: Number(
+        currentService.raw.metadata.annotations[
+          "apps.deploycat.io/gh-webhook-id"
+        ]
+      ),
+    });
+  }
   await knative.deleteService(service.name, user.name);
   throw redirect("/cloud/apps");
 };