From 9afd42565e67bd16d29f1955de73734be6ea1f79 Mon Sep 17 00:00:00 2001 From: Vadim Peretokin Date: Fri, 28 Nov 2025 09:31:13 +0100 Subject: [PATCH] Add manual branch deletion feature Closes #48 --- dashboard/builds.html | 43 +++++++++++++++-- images/ci-build/Dockerfile | 5 +- images/ci-build/delete-branch | 36 +++++++++++++++ images/ig-publisher/Dockerfile | 1 + images/ig-publisher/ci-files/delete | 3 ++ triggers/ig-commit-trigger/delete-job.json | 54 ++++++++++++++++++++++ triggers/ig-commit-trigger/index.js | 44 +++++++++++++++++- 7 files changed, 177 insertions(+), 9 deletions(-) create mode 100644 images/ci-build/delete-branch create mode 100644 images/ig-publisher/ci-files/delete create mode 100644 triggers/ig-commit-trigger/delete-job.json diff --git a/dashboard/builds.html b/dashboard/builds.html index 0e3e1544..7e57f6dc 100644 --- a/dashboard/builds.html +++ b/dashboard/builds.html @@ -176,6 +176,31 @@

FHIR IG Builds

}) } + const deleted = [] + function deleteBranch(branchnum, org, repo, branch) { + if (deleted.includes(branchnum)) { + return; + } + if (!confirm(`Delete branch "${branch}" from ${org}/${repo}? This cannot be undone.`)) { + return; + } + deleted.push(branchnum) + document.getElementById(`delete-branch-${branchnum}`).classList.add("text-muted"); + fetch("https://us-central1-fhir-org-starter-project.cloudfunctions.net/ig-commit-trigger", { + body: JSON.stringify({ + "action": "delete", + "ref": `refs/heads/${branch}`, + "repository": {"full_name": `${org}/${repo}`} + }), + headers: { + 'Content-Type': 'application/json' + }, + method: 'POST', + referrer: 'no-referrer', + mode: 'cors' + }) + } + function render({builds, qas}){ const sorter = (a, b) => { @@ -252,14 +277,22 @@

FHIR IG Builds

${date ? timeFormatter.format(date) : "???"} ${success ? "success" : "failure"} - -
- -
+
${choices.map(branch => `${branch.name + (branch.failing ? " [failing]" : "")}`).join(`\n`)}
+
+
+ +
+ ${choices.map(branch => `${branch.name}`).join(`\n`)} +
log gh diff --git a/images/ci-build/Dockerfile b/images/ci-build/Dockerfile index ff14d694..5c56d613 100644 --- a/images/ci-build/Dockerfile +++ b/images/ci-build/Dockerfile @@ -15,8 +15,9 @@ RUN useradd -m -r -s /bin/bash fhir_upload && \ VOLUME /home/fhir_upload/uploading -ADD publish publish-ig reindex /home/fhir_upload/ -RUN chown fhir_upload /home/fhir_upload/publish && chmod +x /home/fhir_upload/publish +ADD publish publish-ig reindex delete-branch /home/fhir_upload/ +RUN chown fhir_upload /home/fhir_upload/publish /home/fhir_upload/delete-branch && \ + chmod +x /home/fhir_upload/publish /home/fhir_upload/publish-ig /home/fhir_upload/reindex /home/fhir_upload/delete-branch COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf diff --git a/images/ci-build/delete-branch b/images/ci-build/delete-branch new file mode 100644 index 00000000..7d47af4c --- /dev/null +++ b/images/ci-build/delete-branch @@ -0,0 +1,36 @@ +#!/bin/bash + +set -e + +IG_ORG=$1 +IG_REPO=$2 +BRANCH=$3 + +if [ -z "$IG_ORG" ] || [ -z "$IG_REPO" ] || [ -z "$BRANCH" ]; then + echo "Usage: delete-branch ORG REPO BRANCH" + exit 1 +fi + +# Protect main branches from exempt orgs (but allow master to be deleted) +if [ "$BRANCH" = "main" ]; then + if [[ "$IG_ORG" =~ ^(HL7|FHIR|IHE|argonautproject)$ ]]; then + echo "Cannot delete protected main branch for $IG_ORG/$IG_REPO" + exit 1 + fi +fi + +TARGET_DIR=~/uploading/www/ig/$IG_ORG/$IG_REPO/branches/$BRANCH + +if [ ! -d "$TARGET_DIR" ]; then + echo "Branch directory does not exist: $TARGET_DIR" + exit 0 +fi + +echo "Deleting branch: $IG_ORG/$IG_REPO/$BRANCH" +rm -rf "$TARGET_DIR" + +# Trigger reindex +cd ~/reindex_queue +touch reindex_request_$(date --iso-8601=ns).sem + +echo "Deleted and reindex triggered" diff --git a/images/ig-publisher/Dockerfile b/images/ig-publisher/Dockerfile index c008e8dc..38920673 100644 --- a/images/ig-publisher/Dockerfile +++ b/images/ig-publisher/Dockerfile @@ -60,6 +60,7 @@ RUN apt-get update && apt-get -y install inotify-tools python3 python3-pip pytho ADD ./ci-files/watch-and-publish /usr/local/bin/watch-and-publish ADD ./ci-files/publish /usr/local/bin/publish +ADD ./ci-files/delete /usr/local/bin/delete RUN groupadd -r fhirgroup -g 2000 && \ useradd -r -u 1000 -g fhirgroup -m -d /home/fhiruser -s /sbin/nologin fhiruser && \ diff --git a/images/ig-publisher/ci-files/delete b/images/ig-publisher/ci-files/delete new file mode 100644 index 00000000..7995fb46 --- /dev/null +++ b/images/ig-publisher/ci-files/delete @@ -0,0 +1,3 @@ +#!/bin/bash +echo "Delete branch $1/$2/$3" +ssh ci-build ./delete-branch "$@" diff --git a/triggers/ig-commit-trigger/delete-job.json b/triggers/ig-commit-trigger/delete-job.json new file mode 100644 index 00000000..77be05dd --- /dev/null +++ b/triggers/ig-commit-trigger/delete-job.json @@ -0,0 +1,54 @@ +{ + "apiVersion": "batch/v1", + "kind": "Job", + "metadata": { + "labels": { }, + "namespace": "fhir" + }, + "spec": { + "activeDeadlineSeconds": 60, + "ttlSecondsAfterFinished": 30, + "template": { + "spec": { + "securityContext": { + "fsGroup": 2000, + "runAsGroup": 2000, + "runAsUser": 1000 + }, + "containers": [ + { + "args": [], + "command": [ + "/usr/local/bin/delete" + ], + "env": [], + "image": "gcr.io/fhir-org-starter-project/ig-build", + "imagePullPolicy": "Always", + "name": "ig-delete", + "resources": { + "requests": { + "memory": "128Mi" + } + }, + "volumeMounts": [ + { + "mountPath": "/etc/ci_build_keys", + "name": "keys" + } + ] + } + ], + "restartPolicy": "Never", + "volumes": [ + { + "name": "keys", + "secret": { + "defaultMode": 288, + "secretName": "ci-build-keys" + } + } + ] + } + } + } +} diff --git a/triggers/ig-commit-trigger/index.js b/triggers/ig-commit-trigger/index.js index 94d10843..13845880 100644 --- a/triggers/ig-commit-trigger/index.js +++ b/triggers/ig-commit-trigger/index.js @@ -1,6 +1,7 @@ import functions from "@google-cloud/functions-framework"; import * as k8s from "@kubernetes/client-node"; import jobSource from "./job.json" with { type: "json" }; +import deleteJobSource from "./delete-job.json" with { type: "json" }; import crypto from "crypto" @@ -19,11 +20,13 @@ functions.http("ig-commit-trigger", async function (req, res) { return; } + const action = req.body.action || "build"; + let org, repo, branch, commitHash; try { [org, repo] = req.body.repository.full_name.split("/"); branch = req.body.ref.split("/").slice(-1)[0]; - commitHash = "" + req.body.after; + commitHash = "" + (req.body.after || "delete"); if (!org || !repo || !branch) { throw "Bad inputs"; } @@ -40,8 +43,45 @@ functions.http("ig-commit-trigger", async function (req, res) { } const jobGroupId = crypto.createHash('sha256').update(`${org}-${repo}-${branch}`, 'utf8').digest('hex').slice(0, 63); - console.log("Job group id", jobGroupId); + console.log("Job group id", jobGroupId, "action", action); + + if (action === "delete") { + const jobId = `igdelete-${org}-${repo}-${branch}` + .toLocaleLowerCase() + .replace(/[^A-Za-z0-9]/g, "") + .slice(0, 63); + + const job = JSON.parse(JSON.stringify(deleteJobSource)); + job.metadata.name = jobId; + job.metadata.labels["job-group-id"] = jobGroupId; + job.spec.template.spec.containers[0].args = [org, repo, branch]; + + try { + await k8sBatch.createNamespacedJob({ + namespace: "fhir", + body: job + }); + + return res.status(200).json({ + deleted: true, + org: org, + repo: repo, + branch: branch, + jobId: jobId, + }); + } catch (e) { + if (e.body?.message?.includes("already exists")) { + return res + .status(200) + .json({ deleted: false, reason: "Delete job already exists" }); + } else { + console.error(e) + throw e; + } + } + } + // Build action const jobId = `igbuild-${commitHash.slice(0, 6)}-${org}-${repo}-${branch}` .toLocaleLowerCase() .replace(/[^A-Za-z0-9]/g, "")