cli delete-service and reset

Author: ponachte

aggregator-platform/templates/instance-service-account.yaml

@@ -15,6 +15,7 @@ rules:
       - update
       - patch
       - delete
+      - deletecollection
 
   - apiGroups:
       - ""
@@ -26,4 +27,5 @@ rules:
       - create
       - update
       - patch
-      - delete
+      - delete
+      - deletecollection

cli/README.md

@@ -128,6 +128,14 @@ Show the currently active aggregator and its registered services.
 agg get-active
 ```
 
+#### `agg reset`
+
+Remove all aggregators and services from the config. Use when you removed the aggregator server.
+
+```bash
+agg reset
+```
+
 ---
 
 ### Service management
@@ -184,6 +192,31 @@ agg get-output --svc my-svc --agg <id>  # specific service and aggregator
 | `--svc <name>` | Service name (overrides active) |
 | `--agg <id>` | Aggregator ID to use instead of the active one |
 
+#### `agg delete-service`
+
+Delete a service from the active aggregator.
+
+```bash
+agg delete-service
+agg delete-service --svc my-svc                              # specific service
+agg delete-service --agg https://aggregator.example.org/id   # specific aggregator
+```
+
+| Option | Description |
+|---|---|
+| `--svc <name>` | Service name (overrides active) |
+| `--agg <id>` | Aggregator ID to use instead of the active one |
+
+---
+agg get-service --svc my-svc                              # specific service
+agg get-service --agg https://aggregator.example.org/id  # specific aggregator
+```
+
+| Option | Description |
+|---|---|
+| `--svc <name>` | Service name (overrides active) |
+| `--agg <id>` | Aggregator ID to use instead of the active one |
+
 ---
 
 ### Config management

cli/src/cli.ts

@@ -76,6 +76,16 @@ program
     await main({ agg: opts.agg, svc: opts.svc });
   });
 
+program
+  .command("delete-service")
+  .description("Delete a service on the aggregator")
+  .option("--agg <id>",   "Aggregator ID to use instead of active")
+  .option("--svc <name>", "Service name to use instead of active")
+  .action(async (opts) => {
+    const { main } = await import("./delete-service.js");
+    await main({ agg: opts.agg, svc: opts.svc });
+  });
+
 program
   .command("get-output")
   .description("Fetch service outputs")
@@ -99,6 +109,14 @@ program
     console.log(`✅ Config loaded from ${file}`);
   });
 
+program
+  .command("reset")
+  .description("Remove all aggregators and unset the active aggregator")
+  .action(() => {
+    updateConfig({ aggregators: {}, activeAggregator: null });
+    console.log("✅ All aggregators removed and active aggregator unset.");
+  });
+
 program
   .command("where-config")
   .description("Show config file location")

cli/src/delete-service.ts

@@ -0,0 +1,47 @@
+import { KeycloakOIDCAuth } from "./util.js";
+import { config, updateConfig } from "./config.js";
+
+export async function main(opts: { agg?: string, svc?: string } = {}) {
+  const aggId = opts.agg ?? config.activeAggregator;
+  if (!aggId) throw new Error("No active aggregator. Use --agg or run `agg set-active`.");
+
+  const agg = config.aggregators[aggId];
+  if (!agg) throw new Error(`Aggregator "${aggId}" not found.`);
+
+  const svcName = opts.svc ?? config.service.name;
+  if (!svcName) throw new Error("No service name provided. Use --svc");
+
+  const svc = agg.services[svcName];
+  if (!svc) throw new Error(`Service "${svcName}" not found on Aggregator "${aggId}"`);
+
+  const SERVICE_ENDPOINT = `${agg.id}/${svc.name}`;
+
+  console.log("=== Initializing Keycloak Authentication ===");
+  const auth = new KeycloakOIDCAuth();
+  await auth.init(config.auth.idp);
+  await auth.login(config.auth.username, config.auth.password, config.auth.clientId, config.auth.clientSecret);
+  console.log("🔐 Auth initialized successfully.");
+  const umaFetch = auth.createUMAFetch();
+
+  console.log("\n=== Deleting service ===");
+  console.log(`➡️  Endpoint: ${SERVICE_ENDPOINT}\n`);
+
+  try {
+    const response = await umaFetch(SERVICE_ENDPOINT, { method: "DELETE" });
+    console.log(`📡 Response status: ${response.status}`);
+    console.log("📄 Response body:\n");
+    console.log(await response.text() || "(empty response)");
+
+    if (response.ok) {
+      const { [svcName]: _, ...remainingServices } = agg.services;
+      const updatedAgg = { ...agg, services: remainingServices };
+      updateConfig({ aggregators: { ...config.aggregators, [aggId]: updatedAgg } });
+      console.log(`✅ Service "${svcName}" removed from aggregator "${aggId}" in config.`);
+    }
+  } catch (err: any) {
+    console.error("\n❌ Failed to delete service:");
+    console.error(err?.message || err);
+  }
+
+  console.log("\n=== Done ===");
+}

containers/aggregator/config/service_collection.go

@@ -279,7 +279,13 @@ func (collec *ServiceCollection) postService(w http.ResponseWriter, r *http.Requ
 func (collec *ServiceCollection) deleteService(w http.ResponseWriter, _ *http.Request, service model.Service) {
 	logrus.WithFields(logrus.Fields{"service_id": service.InstanceID}).Info("Request to delete service")
 
-	service.Stop()
+	err := service.Stop()
+	if err != nil {
+		logrus.WithError(err).Error("Failed to stop service")
+		http.Error(w, "Failed to stop service", http.StatusInternalServerError)
+		return
+	}
+
 	delete(collec.services, service.InstanceID)
 
 	collec.etagServices++