deploy 2.0.0-dev-36

.cargo/config.toml

@@ -1,5 +1,2 @@
-[alias]
-xtask = "run --package xtask --"
-
 [build]
-rustflags = ["-Wunused-crate-dependencies"]
+rustflags = ["-Wunused-crate-dependencies"]

.devcontainer/dev.compose.yaml

@@ -1,6 +1,6 @@
 services:
   dev:
-    image: mcr.microsoft.com/devcontainers/rust:1-bookworm 
+    image: mcr.microsoft.com/devcontainers/rust:1-1-bullseye
     volumes:
       # Mount the root folder that contains .git
       - ../:/workspace:cached
@@ -10,19 +10,13 @@ services:
       - stacks:/etc/komodo/stacks
     command: sleep infinity
     ports:
-      - "9120:9120"
+      - "9121:9121"
     environment:
-      KOMODO_HOST: http://localhost:9120
       KOMODO_FIRST_SERVER: http://localhost:8120
       KOMODO_DATABASE_ADDRESS: db
       KOMODO_ENABLE_NEW_USERS: true
       KOMODO_LOCAL_AUTH: true
       KOMODO_JWT_SECRET: a_random_secret
-      VITE_KOMODO_HOST: http://localhost:9120
-      KOMODO_CORS_ALLOWED_ORIGINS: http://localhost:5173
-      KOMODO_CORS_ALLOW_CREDENTIALS: true
-      PERIPHERY_SSL_ENABLED: false
-      KOMODO_SESSION_ALLOW_CROSS_SITE: true
     links:
       - db
     # ...
@@ -36,4 +30,4 @@ volumes:
   data:
   repo-cache:
   repos:
-  stacks:
+  stacks:

.devcontainer/devcontainer.json

@@ -10,7 +10,7 @@
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {
-			"version": "22.12.0" 
+			"version": "20.12.2"
 		},
 		"ghcr.io/devcontainers-community/features/deno:1": {
 
@@ -28,8 +28,7 @@
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	"forwardPorts": [
-		5173,
-		9120
+		9121
 	],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
@@ -37,16 +36,11 @@
 
 	"runServices": [
 		"db"
-	],
+	]
 
 	// Configure tool-specific properties.
 	// "customizations": {},
 
 	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
 	// "remoteUser": "root"
-	
-	 "remoteEnv": {
-		// Avoid out of memory error when running `yarn build`
-		"NODE_OPTIONS": "--max-old-space-size=4096"
-	}
 }

.devcontainer/postCreate.sh

@@ -1,9 +1,3 @@
 #!/bin/sh
 
-cargo install typeshare-cli
-
-sudo mkdir -p /etc/komodo/keys
-sudo chown -R $(whoami) /etc/komodo
-
-sudo mkdir -p /config/keys
-sudo chown -R $(whoami) /config
+cargo install typeshare-cli

.github/workflows/ci.yml

@@ -1,56 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build:
-    name: Build & Test
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: stable
-
-      # - name: Cache cargo registry
-      #   uses: actions/cache@v4
-      #   with:
-      #     path: |
-      #       ~/.cargo/registry
-      #       ~/.cargo/git
-      #       target
-      #     key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-cargo-
-
-      - name: Build
-        run: cargo build --verbose
-
-      - name: Run tests
-        run: cargo test --verbose
-
-  fmt:
-    name: Format
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: stable
-          components: rustfmt
-
-      - name: Check formatting
-        run: cargo fmt --all -- --check

.gitignore

@@ -6,4 +6,8 @@ deno.lock
 .env.development
 .DS_Store
 .idea
+
+/frontend/build
+/lib/ts_client/build
+
 .dev

.vscode/tasks.json

@@ -106,62 +106,62 @@
             "problemMatcher": []
         },
         {
-            "label": "Init UI Client",
+            "label": "Init Frontend Client",
             "type": "shell",
             "command": "yarn link komodo_client && yarn install",
             "options": {
-                "cwd": "${workspaceFolder}/ui",
+                "cwd": "${workspaceFolder}/frontend",
             },
             "problemMatcher": []
         },
         {
-            "label": "Init UI",
+            "label": "Init Frontend",
             "dependsOn": [
                 "Build TS Client Types",
                 "Init TS Client",
-                "Init UI Client"
+                "Init Frontend Client"
             ],
             "dependsOrder": "sequence",
             "problemMatcher": []
         },
         {
-            "label": "Build UI",
+            "label": "Build Frontend",
             "type": "shell",
             "command": "yarn build",
             "options": {
-                "cwd": "${workspaceFolder}/ui",
+                "cwd": "${workspaceFolder}/frontend",
             },
             "problemMatcher": []
         },
         {
-            "label": "Prepare UI For Run",
+            "label": "Prepare Frontend For Run",
             "type": "shell",
-            "command": "cp -r ./client/core/ts/dist/. ui/public/client/.",
+            "command": "cp -r ./client/core/ts/dist/. frontend/public/client/.",
             "options": {
                 "cwd": "${workspaceFolder}",
             },
             "dependsOn": [
                 "Build TS Client Types",
-                "Build UI"
+                "Build Frontend"
             ],
             "dependsOrder": "sequence",
             "problemMatcher": []
         },
         {
-            "label": "Run UI",
+            "label": "Run Frontend",
             "type": "shell",
             "command": "yarn dev",
             "options": {
-                "cwd": "${workspaceFolder}/ui",
+                "cwd": "${workspaceFolder}/frontend",
             },
-            "dependsOn": ["Prepare UI For Run"],
+            "dependsOn": ["Prepare Frontend For Run"],
             "problemMatcher": []
         },
         {
             "label": "Init",
             "dependsOn": [
                 "Build Backend",
-                "Init UI"
+                "Init Frontend"
             ],
             "dependsOrder": "sequence",
             "problemMatcher": []
@@ -171,7 +171,7 @@
             "dependsOn": [
                 "Run Core",
                 "Run Periphery",
-                "Run UI"
+                "Run Frontend"
             ],
             "problemMatcher": []
         },

Cargo.toml

@@ -3,140 +3,146 @@ resolver = "2"
 members = [
 	"bin/*",
 	"lib/*",
-	"xtask",
 	"client/core/rs",
 	"client/periphery/rs",
 ]
 
 [workspace.package]
-version = "2.3.0-dev-34"
+version = "2.0.0-dev-36"
 edition = "2024"
+authors = ["mbecker20 <becker.maxh@gmail.com>"]
 license = "GPL-3.0-or-later"
 repository = "https://github.com/moghtech/komodo"
 homepage = "https://komo.do"
 
+[profile.release]
+strip = "debuginfo"
+
 [workspace.dependencies]
 # LOCAL
 komodo_client = { path = "client/core/rs" }
 periphery_client = { path = "client/periphery/rs" }
+environment_file = { path = "lib/environment_file" }
 environment = { path = "lib/environment" }
 interpolate = { path = "lib/interpolate" }
 formatting = { path = "lib/formatting" }
 transport = { path = "lib/transport" }
 database = { path = "lib/database" }
-encoding = { path = "lib/encoding" }
+response = { path = "lib/response" }
 command = { path = "lib/command" }
+config = { path = "lib/config" }
+logger = { path = "lib/logger" }
+cache = { path = "lib/cache" }
+noise = { path = "lib/noise" }
 git = { path = "lib/git" }
 
 # MOGH
-slack = { version = "2.0.0", package = "slack_client_rs", default-features = false, features = ["rustls"] }
-mogh_error = { version = "1.0.4", default-features = false }
+run_command = { version = "0.0.6", features = ["async_tokio"] }
+serror = { version = "0.5.3", default-features = false }
+slack = { version = "1.1.0", package = "slack_client_rs", default-features = false, features = ["rustls"] }
 derive_default_builder = "0.1.8"
+derive_empty_traits = "0.1.0"
 async_timing_util = "1.1.0"
-mogh_auth_client = "1.7.0"
-mogh_auth_server = "1.7.0"
-mogh_secret_file = "1.0.1"
-mogh_validations = "1.0.1"
-mogh_rate_limit = "1.0.1"
-partial_derive2 = "0.5.0"
-mongo_indexed = "2.1.0"
-mogh_resolver = "1.0.0"
-mogh_config = "1.1.0"
-mogh_logger = "1.3.4"
-mogh_server = "1.5.0"
-toml_pretty = "2.0.0"
-mogh_cache = "1.1.2"
-mogh_pki = "1.1.3"
-mungos = "3.7.0"
+partial_derive2 = "0.4.3"
+derive_variants = "1.0.0"
+mongo_indexed = "2.0.2"
+resolver_api = "3.0.0"
+toml_pretty = "1.2.0"
+mungos = "3.2.2"
 svi = "1.2.0"
 
 # ASYNC
-reqwest = { version = "0.13.4", default-features = false, features = ["json", "stream", "form", "query", "rustls"] }
-tokio = { version = "1.52.3", features = ["full"] }
-tokio-util = { version = "0.7.18", features = ["io", "codec"] }
-tokio-stream = { version = "0.1.18", features = ["sync"] }
-pin-project-lite = "0.2.17"
-futures-util = "0.3.32"
-arc-swap = "1.9.2"
+reqwest = { version = "0.12.23", default-features = false, features = ["json", "stream", "rustls-tls-native-roots"] }
+tokio = { version = "1.47.1", features = ["full"] }
+tokio-util = { version = "0.7.16", features = ["io", "codec"] }
+tokio-stream = { version = "0.1.17", features = ["sync"] }
+pin-project-lite = "0.2.16"
+futures = "0.3.31"
+futures-util = "0.3.31"
+arc-swap = "1.7.1"
 
 # SERVER
-tokio-tungstenite = { version = "0.29.0", features = ["rustls-tls-native-roots"] }
-axum = { version = "0.8.9", features = ["ws", "json", "macros"] }
-axum-extra = { version = "0.12.6", features = ["typed-header"] }
-
-# OPENAPI
-utoipa-scalar = { version = "0.3.0", features = ["axum"] }
-utoipa = "5.5.0"
+tokio-tungstenite = { version = "0.28.0", features = ["rustls-tls-native-roots"] }
+axum-extra = { version = "0.10.3", features = ["typed-header"] }
+tower-http = { version = "0.6.6", features = ["fs", "cors"] }
+axum-server = { version = "0.7.2", features = ["tls-rustls"] }
+axum = { version = "0.8.6", features = ["ws", "json", "macros"] }
 
 # SER/DE
 ipnetwork = { version = "0.21.1", features = ["serde"] }
-indexmap = { version = "2.14.0", features = ["serde"] }
-serde = { version = "1.0.228", features = ["derive"] }
-strum = { version = "0.28.0", features = ["derive"] }
+indexmap = { version = "2.11.4", features = ["serde"] }
+serde = { version = "1.0.227", features = ["derive"] }
+strum = { version = "0.27.2", features = ["derive"] }
 bson = { version = "2.15.0" } # must keep in sync with mongodb version
-toml = "1.1.2"
 serde_yaml_ng = "0.10.0"
-serde_json = "1.0.150"
-serde_qs = "1.1.2"
-url = "2.5.8"
+serde_json = "1.0.145"
+serde_qs = "0.15.0"
+toml = "0.9.7"
+url = "2.5.7"
 
 # ERROR
-anyhow = "1.0.103"
-thiserror = "2.0.18"
-
-# SYSTEM
-libc = "0.2.186"
+anyhow = "1.0.100"
+thiserror = "2.0.17"
 
 # LOGGING
-tracing = "0.1.44"
+opentelemetry-otlp = { version = "0.31.0", features = ["tls-roots", "reqwest-rustls"] }
+opentelemetry_sdk = { version = "0.31.0", features = ["rt-tokio"] }
+tracing-subscriber = { version = "0.3.20", features = ["json"] }
+opentelemetry-semantic-conventions = "0.31.0"
+tracing-opentelemetry = "0.32.0"
+opentelemetry = "0.31.0"
+tracing = "0.1.41"
 
 # CONFIG
-clap = { version = "4.6.1", features = ["derive"] }
+clap = { version = "4.5.48", features = ["derive"] }
 dotenvy = "0.15.7"
 envy = "0.4.2"
 
 # CRYPTO / AUTH
-uuid = { version = "1.23.4", features = ["v4", "fast-rng", "serde"] }
-rustls = { version = "0.23.41", features = ["aws-lc-rs"] }
-data-encoding = "2.11.0"
+uuid = { version = "1.18.1", features = ["v4", "fast-rng", "serde"] }
+jsonwebtoken = { version = "9.3.1", default-features = false } # locked back with octorust
+rustls = { version = "0.23.32", features = ["aws-lc-rs"] }
+pem-rfc7468 = { version = "0.7.0", features = ["alloc"] }
+openidconnect = "4.0.1"
 urlencoding = "2.1.3"
-bcrypt = "0.19.2"
-hmac = "0.13.0"
-sha1 = "0.11.0"
-sha2 = "0.11.0"
-rand = "0.10.1"
+nom_pem = "4.0.0"
+bcrypt = "0.17.1"
+base64 = "0.22.1"
+pkcs8 = "0.10.2"
+snow = "0.10.0"
+hmac = "0.12.1"
+sha1 = "0.10.6"
+sha2 = "0.10.9"
+rand = "0.9.2"
 hex = "0.4.3"
+spki = "0.7.3"
+der = "0.7.10"
 
 # SYSTEM
-hickory-resolver = "0.26.1"
 portable-pty = "0.9.0"
-shell-escape = "0.1.5"
-crossterm = "0.29.0"
-bollard = "0.21.0"
-sysinfo = "0.39.5"
-shlex = "2.0.1"
+bollard = "0.19.3"
+sysinfo = "0.37.1"
 
 # CLOUD
-aws-config = "1.8.18"
-aws-sdk-ec2 = "1.235.0"
-aws-credential-types = "1.2.14"
+aws-config = "1.8.6"
+aws-sdk-ec2 = "1.170.1"
+aws-credential-types = "1.2.6"
 
 ## CRON
-english-to-cron = "0.1.7"
+english-to-cron = "0.1.6"
 chrono-tz = "0.10.4"
-chrono = "0.4.45"
-croner = "3.0.1"
+chrono = "0.4.42"
+croner = "3.0.0"
 
 # MISC
-async-compression = { version = "0.4.42", features = ["tokio", "gzip"] }
-schemars = { version = "1.2.1", features = ["indexmap2"] }
+async-compression = { version = "0.4.32", features = ["tokio", "gzip"] }
 derive_builder = "0.20.2"
-comfy-table = "7.2.2"
-typeshare = "1.0.5"
+shell-escape = "0.1.5"
+comfy-table = "7.2.1"
+typeshare = "1.0.4"
+octorust = "0.10.0"
+dashmap = "6.1.0"
 wildcard = "0.3.0"
-colored = "3.1.1"
-bytes = "1.12.0"
-regex = "1.12.4"
-
-[profile.release]
-strip = "debuginfo"
+colored = "3.0.0"
+regex = "1.11.3"
+bytes = "1.10.1"

action/deploy-ui.ts

@@ -1,4 +0,0 @@
-const cmd = "km run -y action deploy-komodo-ui-change";
-new Deno.Command("bash", {
-  args: ["-c", cmd],
-}).spawn();

bin/binaries.Dockerfile

@@ -1,7 +1,7 @@
 ## Builds the Komodo Core, Periphery, and Util binaries
-## for a specific architecture. Requires OpenSSL 3 or later.
+## for a specific architecture.
 
-FROM rust:1.96.1-bookworm AS builder
+FROM rust:1.90.0-bullseye AS builder
 RUN cargo install cargo-strip
 
 WORKDIR /builder
@@ -12,7 +12,6 @@ COPY ./client/periphery ./client/periphery
 COPY ./bin/core ./bin/core
 COPY ./bin/periphery ./bin/periphery
 COPY ./bin/cli ./bin/cli
-COPY ./xtask ./xtask
 
 # Compile bin
 RUN \

bin/chef.binaries.Dockerfile

@@ -1,9 +1,9 @@
 ## Builds the Komodo Core, Periphery, and Util binaries
-## for a specific architecture. Requires OpenSSL 3 or later.
+## for a specific architecture.
 
 ## Uses chef for dependency caching to help speed up back-to-back builds.
 
-FROM lukemathwalker/cargo-chef:latest-rust-1.96.1-bookworm AS chef
+FROM lukemathwalker/cargo-chef:latest-rust-1.90.0-bullseye AS chef
 WORKDIR /builder
 
 # Plan just the RECIPE to see if things have changed

bin/cli/Cargo.toml

@@ -3,6 +3,7 @@ name = "komodo_cli"
 description = "Command line tool for Komodo"
 version.workspace = true
 edition.workspace = true
+authors.workspace = true
 license.workspace = true
 repository.workspace = true
 homepage.workspace = true
@@ -13,27 +14,23 @@ path = "src/main.rs"
 
 [dependencies]
 # local
-komodo_client = { workspace = true, features = ["cli"] }
-mogh_secret_file.workspace = true
-mogh_pki.workspace = true
+environment_file.workspace = true
+komodo_client.workspace = true
 database.workspace = true
-mogh_config.workspace = true
-mogh_logger.workspace = true
+config.workspace = true
+logger.workspace = true
+noise.workspace = true
 # external
 futures-util.workspace = true
 comfy-table.workspace = true
-tokio-util.workspace = true
 serde_json.workspace = true
-crossterm.workspace = true
 serde_qs.workspace = true
 wildcard.workspace = true
 tracing.workspace = true
 colored.workspace = true
 dotenvy.workspace = true
 anyhow.workspace = true
-bcrypt.workspace = true
 chrono.workspace = true
-rustls.workspace = true
 tokio.workspace = true
 serde.workspace = true
 clap.workspace = true

bin/cli/aio.Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.96.1-trixie AS builder
+FROM rust:1.90.0-bullseye AS builder
 RUN cargo install cargo-strip
 
 WORKDIR /builder

bin/cli/multi-arch.Dockerfile

@@ -1,7 +1,7 @@
 ## Assumes the latest binaries for x86_64 and aarch64 are already built (by binaries.Dockerfile).
 ## Since theres no heavy build here, QEMU multi-arch builds are fine for this image.
 
-ARG BINARIES_IMAGE=ghcr.io/moghtech/komodo-binaries:2
+ARG BINARIES_IMAGE=ghcr.io/moghtech/komodo-binaries:latest
 ARG X86_64_BINARIES=${BINARIES_IMAGE}-x86_64
 ARG AARCH64_BINARIES=${BINARIES_IMAGE}-aarch64
 
@@ -9,7 +9,7 @@ ARG AARCH64_BINARIES=${BINARIES_IMAGE}-aarch64
 FROM ${X86_64_BINARIES} AS x86_64
 FROM ${AARCH64_BINARIES} AS aarch64
 
-FROM debian:trixie-slim
+FROM debian:bullseye-slim
 
 WORKDIR /app
 

bin/cli/single-arch.Dockerfile

@@ -1,6 +1,6 @@
 ## Assumes the latest binaries for the required arch are already built (by binaries.Dockerfile).
 
-ARG BINARIES_IMAGE=ghcr.io/moghtech/komodo-binaries:2
+ARG BINARIES_IMAGE=ghcr.io/moghtech/komodo-binaries:latest
 
 # This is required to work with COPY --from
 FROM ${BINARIES_IMAGE} AS binaries

bin/cli/src/command/container.rs

@@ -7,7 +7,9 @@ use futures_util::{
   FutureExt, TryStreamExt, stream::FuturesUnordered,
 };
 use komodo_client::{
-  api::read::{self, ListAllContainers, ListServers},
+  api::read::{
+    InspectDockerContainer, ListAllDockerContainers, ListServers,
+  },
   entities::{
     config::cli::args::container::{
       Container, ContainerCommand, InspectContainer,
@@ -42,12 +44,11 @@ async fn list_containers(
     down,
     links,
     reverse,
-    containers: terms,
+    containers: names,
     images,
     networks,
     servers,
     format,
-    page,
     command: _,
   }: &Container,
 ) -> anyhow::Result<()> {
@@ -59,14 +60,8 @@ async fn list_containers(
         .into_iter()
         .map(|s| (s.id.clone(), s))
         .collect::<HashMap<_, _>>())),
-    client.read(ListAllContainers {
-      servers: Default::default(),
-      tags: Default::default(),
-      terms: terms.clone(),
-      state: Default::default(),
-      limit: Some(100),
-      // Page is more naturally given starting as 1, 2, 3.
-      page: if *page == 0 { 0 } else { *page - 1 },
+    client.read(ListAllDockerContainers {
+      servers: Default::default()
     }),
   )?;
 
@@ -82,6 +77,7 @@ async fn list_containers(
     (Some(server.name.as_str()), c)
   });
 
+  let names = parse_wildcards(names);
   let servers = parse_wildcards(servers);
   let images = parse_wildcards(images);
   let networks = parse_wildcards(networks);
@@ -108,6 +104,7 @@ async fn list_containers(
       );
       state_check
         && network_check
+        && matches_wildcards(&names, &[c.name.as_str()])
         && matches_wildcards(
           &servers,
           &server_name
@@ -147,13 +144,8 @@ pub async fn inspect_container(
         .into_iter()
         .map(|s| (s.id.clone(), s))
         .collect::<HashMap<_, _>>())),
-    client.read(ListAllContainers {
-      servers: inspect.servers.clone(),
-      tags: Default::default(),
-      terms: vec![inspect.container.clone()],
-      state: Default::default(),
-      limit: Some(300),
-      page: 0,
+    client.read(ListAllDockerContainers {
+      servers: Default::default()
     }),
   )?;
 
@@ -168,11 +160,25 @@ pub async fn inspect_container(
     c.server_id = Some(server.name.clone());
   });
 
+  let names = [inspect.container.to_string()];
+  let names = parse_wildcards(&names);
+  let servers = parse_wildcards(&inspect.servers);
+
   let mut containers = containers
     .into_iter()
+    .filter(|c| {
+      matches_wildcards(&names, &[c.name.as_str()])
+        && matches_wildcards(
+          &servers,
+          &c.server_id
+            .as_deref()
+            .map(|i| vec![i])
+            .unwrap_or_default(),
+        )
+    })
     .map(|c| async move {
       client
-        .read(read::InspectContainer {
+        .read(InspectDockerContainer {
           container: c.name,
           server: c.server_id.context("No server...")?,
         })

bin/cli/src/command/core_info.rs

@@ -1,13 +0,0 @@
-use anyhow::Context as _;
-use komodo_client::api::read::GetCoreInfo;
-
-pub async fn handle() -> anyhow::Result<()> {
-  let client = super::komodo_client().await?;
-  let info = client.read(GetCoreInfo {}).await?;
-  println!(
-    "{}",
-    serde_json::to_string_pretty(&info)
-      .context("Failed to serialize core info to JSON")?
-  );
-  Ok(())
-}

bin/cli/src/command/create/api_key.rs

@@ -1,101 +0,0 @@
-use anyhow::Context as _;
-use database::bson::doc;
-use komodo_client::{
-  api::read::FindUser,
-  entities::{
-    api_key::ApiKey, config::cli::args::create::CreateApiKey,
-    komodo_timestamp, random_string,
-  },
-};
-use serde_json::json;
-
-use crate::config::cli_config;
-
-pub async fn create(
-  CreateApiKey {
-    name,
-    for_user,
-    expires,
-    use_api,
-  }: &CreateApiKey,
-) -> anyhow::Result<()> {
-  let expires = if let Some(expires_days) = expires {
-    // now + expires in ms
-    komodo_timestamp() + expires_days * 24 * 60 * 60 * 1000
-  } else {
-    0
-  };
-
-  if *use_api {
-    // USE API
-    let client = crate::command::komodo_client().await?;
-
-    let keys = if let Some(username) = for_user {
-      // For service user
-      let user = client
-        .read(FindUser {
-          user: username.to_string(),
-        })
-        .await?;
-      client
-        .write(
-          komodo_client::api::write::CreateApiKeyForServiceUser {
-            user_id: user.id,
-            name: name.clone().unwrap_or_default(),
-            expires,
-          },
-        )
-        .await?
-    } else {
-      // For self
-      client
-        .auth_manage(komodo_client::api::auth::manage::CreateApiKey {
-          name: name.clone().unwrap_or_default(),
-          expires: expires as u64,
-        })
-        .await?
-    };
-
-    println!(
-      "{}",
-      serde_json::to_string_pretty(&keys)
-        .context("Failed to serialize api keys to JSON")?
-    );
-  } else {
-    // USE DATABASE
-    let db = database::Client::new(&cli_config().database).await?;
-
-    let user = db
-      .users
-      .find_one(doc! { "username": for_user })
-      .await
-      .context("Failed to query database for user")?
-      .context("No user found with given username")?;
-
-    let key = format!("K_{}_K", random_string(40));
-    let secret = format!("S_{}_S", random_string(40));
-    let hashed_secret = bcrypt::hash(&secret, 10)
-      .context("Failed at hashing secret string")?;
-
-    db.api_keys
-      .insert_one(&ApiKey {
-        name: name.clone().unwrap_or_default(),
-        user_id: user.id,
-        key: key.clone(),
-        secret: hashed_secret.clone(),
-        created_at: komodo_timestamp(),
-        expires,
-      })
-      .await?;
-
-    println!(
-      "{}",
-      serde_json::to_string_pretty(
-        &json!({ "key": key, "secret": secret })
-      )
-      .context("Failed to serialize api keys to JSON")?
-    );
-  }
-
-  Ok(())
-}

bin/cli/src/command/create/mod.rs

@@ -1,13 +0,0 @@
-use komodo_client::entities::config::cli::args::create::CreateCommand;
-
-mod api_key;
-mod onboarding_key;
-
-pub async fn handle(command: &CreateCommand) -> anyhow::Result<()> {
-  match command {
-    CreateCommand::ApiKey(api_key) => api_key::create(api_key).await,
-    CreateCommand::OnboardingKey(onboarding_key) => {
-      onboarding_key::create(onboarding_key).await
-    }
-  }
-}

bin/cli/src/command/create/onboarding_key.rs

@@ -1,46 +0,0 @@
-use anyhow::Context as _;
-use komodo_client::entities::{
-  config::cli::args::create::CreateOnboardingKey, komodo_timestamp,
-};
-
-pub async fn create(
-  CreateOnboardingKey {
-    name,
-    expires,
-    private_key,
-    tags,
-    privileged,
-    copy_server,
-    create_builder,
-  }: &CreateOnboardingKey,
-) -> anyhow::Result<()> {
-  let expires = if let Some(expires_days) = expires {
-    // now + expires in ms
-    komodo_timestamp() + expires_days * 24 * 60 * 60 * 1000
-  } else {
-    0
-  };
-
-  // USE API
-  let client = crate::command::komodo_client().await?;
-
-  let key = client
-    .write(komodo_client::api::write::CreateOnboardingKey {
-      name: name.clone().unwrap_or_default(),
-      expires,
-      private_key: private_key.clone(),
-      tags: tags.clone(),
-      privileged: *privileged,
-      copy_server: copy_server.clone().unwrap_or_default(),
-      create_builder: *create_builder,
-    })
-    .await?;
-
-  println!(
-    "{}",
-    serde_json::to_string_pretty(&key)
-      .context("Failed to serialize onboarding key to JSON")?
-  );
-
-  Ok(())
-}

bin/cli/src/command/database.rs

@@ -358,14 +358,7 @@ async fn v1_downgrade(yes: bool) -> anyhow::Result<()> {
     .await
     .context("Failed to downgrade Server schema")?;
 
-  db.collection::<Document>("Deployment")
-    .update_many(doc! {}, doc! { "$set": { "info": null } })
-    .await
-    .context("Failed to downgrade Deployment schema")?;
-
-  info!(
-    "V1 Downgrade complete. Ready to downgrade to komodo-core:1 ✅"
-  );
+  info!("V1 Downgrade complete. Ready to downgrade to komodo-core:1 ✅");
 
   Ok(())
 }

bin/cli/src/command/execute.rs

@@ -28,141 +28,488 @@ pub async fn handle(
   }
 
   println!("\n{}: Execution", "Mode".dimmed());
-
-  macro_rules! handle_execution {
-    (
-      execute: [$($ExecVariant:ident),* $(,)?],
-      batch: [$($BatchVariant:ident),* $(,)?],
-    ) => {{
-      // Print data
-      match execution {
-        $(Execution::$ExecVariant(data) => println!("{}: {data:?}", "Data".dimmed()),)*
-        $(Execution::$BatchVariant(data) => println!("{}: {data:?}", "Data".dimmed()),)*
-        Execution::CommitSync(data) => println!("{}: {data:?}", "Data".dimmed()),
-        Execution::Sleep(data) => println!("{}: {data:?}", "Data".dimmed()),
-        Execution::None(data) => println!("{}: {data:?}", "Data".dimmed()),
-      }
-
-      $crate::command::wait_for_enter("run execution", yes)?;
-
-      info!("Running Execution...");
-
-      let client = $crate::command::komodo_client().await?;
-
-      // Execute and get result
-      match execution.clone() {
-        $(
-          Execution::$ExecVariant(request) => client
-            .execute(request)
-            .await
-            .map(|u| ExecutionResult::Single(u.into())),
-        )*
-        $(
-          Execution::$BatchVariant(request) => {
-            client.execute(request).await.map(ExecutionResult::Batch)
-          }
-        )*
-        Execution::CommitSync(request) => client
-          .write(request)
-          .await
-          .map(|u| ExecutionResult::Single(u.into())),
-        Execution::Sleep(request) => {
-          let duration =
-            Duration::from_millis(request.duration_ms as u64);
-          tokio::time::sleep(duration).await;
-          println!("Finished sleeping!");
-          std::process::exit(0)
-        }
-        Execution::None(_) => unreachable!(),
-      }
-    }};
+  match execution {
+    Execution::None(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::RunAction(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::BatchRunAction(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::RunProcedure(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::BatchRunProcedure(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::RunBuild(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::BatchRunBuild(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::CancelBuild(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::Deploy(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::BatchDeploy(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PullDeployment(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::StartDeployment(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::RestartDeployment(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PauseDeployment(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::UnpauseDeployment(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::StopDeployment(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::DestroyDeployment(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::BatchDestroyDeployment(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::CloneRepo(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::BatchCloneRepo(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PullRepo(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::BatchPullRepo(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::BuildRepo(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::BatchBuildRepo(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::CancelRepoBuild(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::StartContainer(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::RestartContainer(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PauseContainer(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::UnpauseContainer(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::StopContainer(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::DestroyContainer(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::StartAllContainers(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::RestartAllContainers(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PauseAllContainers(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::UnpauseAllContainers(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::StopAllContainers(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PruneContainers(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::DeleteNetwork(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PruneNetworks(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::DeleteImage(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PruneImages(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::DeleteVolume(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PruneVolumes(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PruneDockerBuilders(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PruneBuildx(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PruneSystem(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::RunSync(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::CommitSync(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::DeployStack(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::BatchDeployStack(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::DeployStackIfChanged(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::BatchDeployStackIfChanged(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PullStack(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::BatchPullStack(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::StartStack(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::RestartStack(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PauseStack(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::UnpauseStack(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::StopStack(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::DestroyStack(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::BatchDestroyStack(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::RunStackService(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::TestAlerter(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::SendAlert(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::ClearRepoCache(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::BackupCoreDatabase(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::GlobalAutoUpdate(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::RotateAllServerKeys(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::Sleep(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
   }
 
-  let res = handle_execution!(
-    execute: [
-      RunAction,
-      CancelAction,
-      RunProcedure,
-      CancelProcedure,
-      RunBuild,
-      CancelBuild,
-      Deploy,
-      PullDeployment,
-      StartDeployment,
-      RestartDeployment,
-      PauseDeployment,
-      UnpauseDeployment,
-      StopDeployment,
-      DestroyDeployment,
-      CloneRepo,
-      PullRepo,
-      BuildRepo,
-      CancelRepoBuild,
-      StartContainer,
-      RestartContainer,
-      PauseContainer,
-      UnpauseContainer,
-      StopContainer,
-      DestroyContainer,
-      StartAllContainers,
-      RestartAllContainers,
-      PauseAllContainers,
-      UnpauseAllContainers,
-      StopAllContainers,
-      PruneContainers,
-      DeleteNetwork,
-      PruneNetworks,
-      DeleteImage,
-      PruneImages,
-      DeleteVolume,
-      PruneVolumes,
-      PruneDockerBuilders,
-      PruneBuildx,
-      PruneSystem,
-      RunSync,
-      DeployStack,
-      DeployStackIfChanged,
-      PullStack,
-      StartStack,
-      RestartStack,
-      PauseStack,
-      UnpauseStack,
-      StopStack,
-      DestroyStack,
-      RunStackService,
-      TestAlerter,
-      SendAlert,
-      RemoveSwarmNodes,
-      UpdateSwarmNode,
-      RemoveSwarmStacks,
-      RemoveSwarmServices,
-      CreateSwarmConfig,
-      RotateSwarmConfig,
-      RemoveSwarmConfigs,
-      CreateSwarmSecret,
-      RotateSwarmSecret,
-      RemoveSwarmSecrets,
-      ClearRepoCache,
-      BackupCoreDatabase,
-      GlobalAutoUpdate,
-      RotateAllServerKeys,
-      RotateCoreKeys,
-    ],
-    batch: [
-      BatchRunAction,
-      BatchRunProcedure,
-      BatchRunBuild,
-      BatchDeploy,
-      BatchDestroyDeployment,
-      BatchCloneRepo,
-      BatchPullRepo,
-      BatchBuildRepo,
-      BatchDeployStack,
-      BatchDeployStackIfChanged,
-      BatchPullStack,
-      BatchDestroyStack,
-    ],
-  );
+  super::wait_for_enter("run execution", yes)?;
+
+  info!("Running Execution...");
+
+  let client = super::komodo_client().await?;
+
+  let res = match execution.clone() {
+    Execution::RunAction(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::BatchRunAction(request) => {
+      client.execute(request).await.map(ExecutionResult::Batch)
+    }
+    Execution::RunProcedure(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::BatchRunProcedure(request) => {
+      client.execute(request).await.map(ExecutionResult::Batch)
+    }
+    Execution::RunBuild(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::BatchRunBuild(request) => {
+      client.execute(request).await.map(ExecutionResult::Batch)
+    }
+    Execution::CancelBuild(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::Deploy(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::BatchDeploy(request) => {
+      client.execute(request).await.map(ExecutionResult::Batch)
+    }
+    Execution::PullDeployment(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::StartDeployment(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::RestartDeployment(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::PauseDeployment(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::UnpauseDeployment(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::StopDeployment(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::DestroyDeployment(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::BatchDestroyDeployment(request) => {
+      client.execute(request).await.map(ExecutionResult::Batch)
+    }
+    Execution::CloneRepo(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::BatchCloneRepo(request) => {
+      client.execute(request).await.map(ExecutionResult::Batch)
+    }
+    Execution::PullRepo(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::BatchPullRepo(request) => {
+      client.execute(request).await.map(ExecutionResult::Batch)
+    }
+    Execution::BuildRepo(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::BatchBuildRepo(request) => {
+      client.execute(request).await.map(ExecutionResult::Batch)
+    }
+    Execution::CancelRepoBuild(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::StartContainer(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::RestartContainer(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::PauseContainer(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::UnpauseContainer(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::StopContainer(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::DestroyContainer(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::StartAllContainers(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::RestartAllContainers(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::PauseAllContainers(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::UnpauseAllContainers(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::StopAllContainers(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::PruneContainers(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::DeleteNetwork(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::PruneNetworks(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::DeleteImage(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::PruneImages(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::DeleteVolume(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::PruneVolumes(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::PruneDockerBuilders(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::PruneBuildx(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::PruneSystem(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::RunSync(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::CommitSync(request) => client
+      .write(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::DeployStack(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::BatchDeployStack(request) => {
+      client.execute(request).await.map(ExecutionResult::Batch)
+    }
+    Execution::DeployStackIfChanged(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::BatchDeployStackIfChanged(request) => {
+      client.execute(request).await.map(ExecutionResult::Batch)
+    }
+    Execution::PullStack(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::BatchPullStack(request) => {
+      client.execute(request).await.map(ExecutionResult::Batch)
+    }
+    Execution::StartStack(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::RestartStack(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::PauseStack(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::UnpauseStack(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::StopStack(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::DestroyStack(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::BatchDestroyStack(request) => {
+      client.execute(request).await.map(ExecutionResult::Batch)
+    }
+    Execution::RunStackService(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::TestAlerter(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::SendAlert(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::ClearRepoCache(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::BackupCoreDatabase(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::GlobalAutoUpdate(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::RotateAllServerKeys(request) => client
+      .execute(request)
+      .await
+      .map(|u| ExecutionResult::Single(u.into())),
+    Execution::Sleep(request) => {
+      let duration =
+        Duration::from_millis(request.duration_ms as u64);
+      tokio::time::sleep(duration).await;
+      println!("Finished sleeping!");
+      std::process::exit(0)
+    }
+    Execution::None(_) => unreachable!(),
+  };
 
   match res {
     Ok(ExecutionResult::Single(update)) => {

bin/cli/src/command/list.rs

@@ -7,8 +7,7 @@ use komodo_client::{
   api::read::{
     ListActions, ListAlerters, ListBuilders, ListBuilds,
     ListDeployments, ListProcedures, ListRepos, ListResourceSyncs,
-    ListSchedules, ListServers, ListStacks, ListSwarms, ListTags,
-    ListTerminals,
+    ListSchedules, ListServers, ListStacks, ListTags,
   },
   entities::{
     ResourceTargetVariant,
@@ -32,12 +31,10 @@ use komodo_client::{
     schedule::Schedule,
     server::{ServerListItem, ServerListItemInfo, ServerState},
     stack::{StackListItem, StackListItemInfo, StackState},
-    swarm::{SwarmListItem, SwarmListItemInfo, SwarmState},
     sync::{
       ResourceSyncListItem, ResourceSyncListItemInfo,
       ResourceSyncState,
     },
-    terminal::Terminal,
   },
 };
 use serde::Serialize;
@@ -54,49 +51,34 @@ pub async fn handle(list: &args::list::List) -> anyhow::Result<()> {
   match &list.command {
     None => list_all(list).await,
     Some(ListCommand::Servers(filters)) => {
-      list_resources::<ServerListItem>(filters, list.page, false)
-        .await
-    }
-    Some(ListCommand::Swarms(filters)) => {
-      list_resources::<SwarmListItem>(filters, list.page, false).await
+      list_resources::<ServerListItem>(filters, false).await
     }
     Some(ListCommand::Stacks(filters)) => {
-      list_resources::<StackListItem>(filters, list.page, false).await
+      list_resources::<StackListItem>(filters, false).await
     }
     Some(ListCommand::Deployments(filters)) => {
-      list_resources::<DeploymentListItem>(filters, list.page, false)
-        .await
+      list_resources::<DeploymentListItem>(filters, false).await
     }
     Some(ListCommand::Builds(filters)) => {
-      list_resources::<BuildListItem>(filters, list.page, false).await
+      list_resources::<BuildListItem>(filters, false).await
     }
     Some(ListCommand::Repos(filters)) => {
-      list_resources::<RepoListItem>(filters, list.page, false).await
+      list_resources::<RepoListItem>(filters, false).await
     }
     Some(ListCommand::Procedures(filters)) => {
-      list_resources::<ProcedureListItem>(filters, list.page, false)
-        .await
+      list_resources::<ProcedureListItem>(filters, false).await
     }
     Some(ListCommand::Actions(filters)) => {
-      list_resources::<ActionListItem>(filters, list.page, false)
-        .await
+      list_resources::<ActionListItem>(filters, false).await
     }
     Some(ListCommand::Syncs(filters)) => {
-      list_resources::<ResourceSyncListItem>(
-        filters, list.page, false,
-      )
-      .await
+      list_resources::<ResourceSyncListItem>(filters, false).await
     }
     Some(ListCommand::Builders(filters)) => {
-      list_resources::<BuilderListItem>(filters, list.page, false)
-        .await
+      list_resources::<BuilderListItem>(filters, false).await
     }
     Some(ListCommand::Alerters(filters)) => {
-      list_resources::<AlerterListItem>(filters, list.page, false)
-        .await
-    }
-    Some(ListCommand::Terminals(filters)) => {
-      list_terminals(filters).await
+      list_resources::<AlerterListItem>(filters, false).await
     }
     Some(ListCommand::Schedules(filters)) => {
       list_schedules(filters).await
@@ -111,7 +93,6 @@ async fn list_all(list: &args::list::List) -> anyhow::Result<()> {
   let (
     tags,
     mut servers,
-    mut swarms,
     mut stacks,
     mut deployments,
     mut builds,
@@ -124,15 +105,14 @@ async fn list_all(list: &args::list::List) -> anyhow::Result<()> {
       .into_iter()
       .map(|t| (t.id, t.name))
       .collect::<HashMap<_, _>>())),
-    ServerListItem::list(client, &filters, list.page, true),
-    SwarmListItem::list(client, &filters, list.page, true),
-    StackListItem::list(client, &filters, list.page, true),
-    DeploymentListItem::list(client, &filters, list.page, true),
-    BuildListItem::list(client, &filters, list.page, true),
-    RepoListItem::list(client, &filters, list.page, true),
-    ProcedureListItem::list(client, &filters, list.page, true),
-    ActionListItem::list(client, &filters, list.page, true),
-    ResourceSyncListItem::list(client, &filters, list.page, true),
+    ServerListItem::list(client, &filters, true),
+    StackListItem::list(client, &filters, true),
+    DeploymentListItem::list(client, &filters, true),
+    BuildListItem::list(client, &filters, true),
+    RepoListItem::list(client, &filters, true),
+    ProcedureListItem::list(client, &filters, true),
+    ActionListItem::list(client, &filters, true),
+    ResourceSyncListItem::list(client, &filters, true),
   )?;
 
   if !servers.is_empty() {
@@ -141,12 +121,6 @@ async fn list_all(list: &args::list::List) -> anyhow::Result<()> {
     println!();
   }
 
-  if !swarms.is_empty() {
-    fix_tags(&mut swarms, &tags);
-    print_items(swarms, filters.format, list.links)?;
-    println!();
-  }
-
   if !stacks.is_empty() {
     fix_tags(&mut stacks, &tags);
     print_items(stacks, filters.format, list.links)?;
@@ -194,7 +168,6 @@ async fn list_all(list: &args::list::List) -> anyhow::Result<()> {
 
 async fn list_resources<T>(
   filters: &ResourceFilters,
-  page: u64,
   minimal: bool,
 ) -> anyhow::Result<()>
 where
@@ -203,7 +176,7 @@ where
 {
   let client = crate::command::komodo_client().await?;
   let (mut resources, tags) = tokio::try_join!(
-    T::list(client, filters, page, minimal),
+    T::list(client, filters, minimal),
     client.read(ListTags::default()).map(|res| res.map(|res| res
       .into_iter()
       .map(|t| (t.id, t.name))
@@ -216,26 +189,6 @@ where
   Ok(())
 }
 
-async fn list_terminals(
-  filters: &ResourceFilters,
-) -> anyhow::Result<()> {
-  let client = crate::command::komodo_client().await?;
-  // let query = ResourceQuery::builder()
-  //   .tags(filters.tags.clone())
-  //   .templates(TemplatesQueryBehavior::Exclude)
-  //   .build();
-  let terminals = client
-    .read(ListTerminals {
-      target: None,
-      use_names: true,
-    })
-    .await?;
-  if !terminals.is_empty() {
-    print_items(terminals, filters.format, filters.links)?;
-  }
-  Ok(())
-}
-
 async fn list_schedules(
   filters: &ResourceFilters,
 ) -> anyhow::Result<()> {
@@ -302,7 +255,6 @@ where
   async fn list(
     client: &KomodoClient,
     filters: &ResourceFilters,
-    page: u64,
     // For use with root `km ls`
     minimal: bool,
   ) -> anyhow::Result<Vec<ResourceListItem<Self::Info>>>;
@@ -315,7 +267,6 @@ impl ListResources for ServerListItem {
   async fn list(
     client: &KomodoClient,
     filters: &ResourceFilters,
-    page: u64,
     _minimal: bool,
   ) -> anyhow::Result<Vec<Self>> {
     let servers = client
@@ -325,10 +276,6 @@ impl ListResources for ServerListItem {
           // .tag_behavior(TagQueryBehavior::Any)
           .templates(filters.templates)
           .build(),
-        limit: Some(100),
-        page: page.saturating_sub(1),
-        sort_by: Default::default(),
-        sort_desc: false,
       })
       .await?;
     let names = parse_wildcards(&filters.names);
@@ -358,68 +305,17 @@ impl ListResources for ServerListItem {
   }
 }
 
-impl ListResources for SwarmListItem {
-  type Info = SwarmListItemInfo;
-  async fn list(
-    client: &KomodoClient,
-    filters: &ResourceFilters,
-    page: u64,
-    _minimal: bool,
-  ) -> anyhow::Result<Vec<Self>> {
-    let servers = client
-      .read(ListSwarms {
-        query: ResourceQuery::builder()
-          .tags(filters.tags.clone())
-          // .tag_behavior(TagQueryBehavior::Any)
-          .templates(filters.templates)
-          .build(),
-        limit: Some(100),
-        page: page.saturating_sub(1),
-        sort_by: Default::default(),
-        sort_desc: false,
-      })
-      .await?;
-    let names = parse_wildcards(&filters.names);
-    let server_wildcards = parse_wildcards(&filters.servers);
-    let mut servers = servers
-      .into_iter()
-      .filter(|server| {
-        let state_check = if filters.all {
-          true
-        } else if filters.down {
-          !matches!(server.info.state, SwarmState::Healthy)
-        } else if filters.in_progress {
-          false
-        } else {
-          matches!(server.info.state, SwarmState::Healthy)
-        };
-        let name_items = &[server.name.as_str()];
-        state_check
-          && matches_wildcards(&names, name_items)
-          && matches_wildcards(&server_wildcards, name_items)
-      })
-      .collect::<Vec<_>>();
-    servers.sort_by(|a, b| {
-      a.info.state.cmp(&b.info.state).then(a.name.cmp(&b.name))
-    });
-    Ok(servers)
-  }
-}
-
 impl ListResources for StackListItem {
   type Info = StackListItemInfo;
   async fn list(
     client: &KomodoClient,
     filters: &ResourceFilters,
-    page: u64,
     _minimal: bool,
   ) -> anyhow::Result<Vec<Self>> {
     let (servers, mut stacks) = tokio::try_join!(
       client
         .read(ListServers {
           query: ResourceQuery::builder().build(),
-          limit: Some(0),
-          ..Default::default()
         })
         .map(|res| res.map(|res| res
           .into_iter()
@@ -431,10 +327,6 @@ impl ListResources for StackListItem {
           // .tag_behavior(TagQueryBehavior::Any)
           .templates(filters.templates)
           .build(),
-        limit: Some(100),
-        page: page.saturating_sub(1),
-        sort_by: Default::default(),
-        sort_desc: false
       })
     )?;
     stacks.iter_mut().for_each(|stack| {
@@ -490,15 +382,12 @@ impl ListResources for DeploymentListItem {
   async fn list(
     client: &KomodoClient,
     filters: &ResourceFilters,
-    page: u64,
     _minimal: bool,
   ) -> anyhow::Result<Vec<Self>> {
     let (servers, mut deployments) = tokio::try_join!(
       client
         .read(ListServers {
           query: ResourceQuery::builder().build(),
-          limit: Some(0),
-          ..Default::default()
         })
         .map(|res| res.map(|res| res
           .into_iter()
@@ -510,10 +399,6 @@ impl ListResources for DeploymentListItem {
           // .tag_behavior(TagQueryBehavior::Any)
           .templates(filters.templates)
           .build(),
-        limit: Some(100),
-        page: page.saturating_sub(1),
-        sort_by: Default::default(),
-        sort_desc: false
       })
     )?;
     deployments.iter_mut().for_each(|deployment| {
@@ -570,15 +455,12 @@ impl ListResources for BuildListItem {
   async fn list(
     client: &KomodoClient,
     filters: &ResourceFilters,
-    page: u64,
     minimal: bool,
   ) -> anyhow::Result<Vec<Self>> {
     let (builders, mut builds) = tokio::try_join!(
       client
         .read(ListBuilders {
           query: ResourceQuery::builder().build(),
-          limit: Some(0),
-          ..Default::default()
         })
         .map(|res| res.map(|res| res
           .into_iter()
@@ -590,10 +472,6 @@ impl ListResources for BuildListItem {
           // .tag_behavior(TagQueryBehavior::Any)
           .templates(filters.templates)
           .build(),
-        limit: Some(100),
-        page: page.saturating_sub(1),
-        sort_by: Default::default(),
-        sort_desc: false
       })
     )?;
     builds.iter_mut().for_each(|build| {
@@ -645,7 +523,6 @@ impl ListResources for RepoListItem {
   async fn list(
     client: &KomodoClient,
     filters: &ResourceFilters,
-    page: u64,
     minimal: bool,
   ) -> anyhow::Result<Vec<Self>> {
     let names = parse_wildcards(&filters.names);
@@ -656,10 +533,6 @@ impl ListResources for RepoListItem {
           // .tag_behavior(TagQueryBehavior::Any)
           .templates(filters.templates)
           .build(),
-        limit: Some(100),
-        page: page.saturating_sub(1),
-        sort_by: Default::default(),
-        sort_desc: false,
       })
       .await?
       .into_iter()
@@ -698,7 +571,6 @@ impl ListResources for ProcedureListItem {
   async fn list(
     client: &KomodoClient,
     filters: &ResourceFilters,
-    page: u64,
     minimal: bool,
   ) -> anyhow::Result<Vec<Self>> {
     let names = parse_wildcards(&filters.names);
@@ -709,10 +581,6 @@ impl ListResources for ProcedureListItem {
           // .tag_behavior(TagQueryBehavior::Any)
           .templates(filters.templates)
           .build(),
-        limit: Some(100),
-        page: page.saturating_sub(1),
-        sort_by: Default::default(),
-        sort_desc: false,
       })
       .await?
       .into_iter()
@@ -751,7 +619,6 @@ impl ListResources for ActionListItem {
   async fn list(
     client: &KomodoClient,
     filters: &ResourceFilters,
-    page: u64,
     minimal: bool,
   ) -> anyhow::Result<Vec<Self>> {
     let names = parse_wildcards(&filters.names);
@@ -762,10 +629,6 @@ impl ListResources for ActionListItem {
           // .tag_behavior(TagQueryBehavior::Any)
           .templates(filters.templates)
           .build(),
-        limit: Some(100),
-        page: page.saturating_sub(1),
-        sort_by: Default::default(),
-        sort_desc: false,
       })
       .await?
       .into_iter()
@@ -804,7 +667,6 @@ impl ListResources for ResourceSyncListItem {
   async fn list(
     client: &KomodoClient,
     filters: &ResourceFilters,
-    page: u64,
     minimal: bool,
   ) -> anyhow::Result<Vec<Self>> {
     let names = parse_wildcards(&filters.names);
@@ -815,10 +677,6 @@ impl ListResources for ResourceSyncListItem {
           // .tag_behavior(TagQueryBehavior::Any)
           .templates(filters.templates)
           .build(),
-        limit: Some(100),
-        page: page.saturating_sub(1),
-        sort_by: Default::default(),
-        sort_desc: false,
       })
       .await?
       .into_iter()
@@ -854,7 +712,6 @@ impl ListResources for BuilderListItem {
   async fn list(
     client: &KomodoClient,
     filters: &ResourceFilters,
-    page: u64,
     minimal: bool,
   ) -> anyhow::Result<Vec<Self>> {
     let names = parse_wildcards(&filters.names);
@@ -865,10 +722,6 @@ impl ListResources for BuilderListItem {
           // .tag_behavior(TagQueryBehavior::Any)
           .templates(filters.templates)
           .build(),
-        limit: Some(100),
-        page: page.saturating_sub(1),
-        sort_by: Default::default(),
-        sort_desc: false,
       })
       .await?
       .into_iter()
@@ -891,7 +744,6 @@ impl ListResources for AlerterListItem {
   async fn list(
     client: &KomodoClient,
     filters: &ResourceFilters,
-    page: u64,
     minimal: bool,
   ) -> anyhow::Result<Vec<Self>> {
     let names = parse_wildcards(&filters.names);
@@ -902,10 +754,6 @@ impl ListResources for AlerterListItem {
           // .tag_behavior(TagQueryBehavior::Any)
           .templates(filters.templates)
           .build(),
-        limit: Some(100),
-        page: page.saturating_sub(1),
-        sort_by: Default::default(),
-        sort_desc: false,
       })
       .await?
       .into_iter()
@@ -960,39 +808,6 @@ impl PrintTable for ResourceListItem<ServerListItemInfo> {
   }
 }
 
-impl PrintTable for ResourceListItem<SwarmListItemInfo> {
-  fn header(links: bool) -> &'static [&'static str] {
-    if links {
-      &["Swarm", "State", "Tags", "Link"]
-    } else {
-      &["Swarm", "State", "Tags"]
-    }
-  }
-  fn row(self, links: bool) -> Vec<Cell> {
-    let color = match self.info.state {
-      SwarmState::Healthy => Color::Green,
-      SwarmState::Unhealthy => Color::Red,
-      SwarmState::Down => Color::Blue,
-      SwarmState::Unknown => Color::Magenta,
-    };
-    let mut res = vec![
-      Cell::new(self.name).add_attribute(Attribute::Bold),
-      Cell::new(self.info.state.to_string())
-        .fg(color)
-        .add_attribute(Attribute::Bold),
-      Cell::new(self.tags.join(", ")),
-    ];
-    if links {
-      res.push(Cell::new(resource_link(
-        &cli_config().host,
-        ResourceTargetVariant::Server,
-        &self.id,
-      )))
-    }
-    res
-  }
-}
-
 impl PrintTable for ResourceListItem<StackListItemInfo> {
   fn header(links: bool) -> &'static [&'static str] {
     if links {
@@ -1319,28 +1134,6 @@ impl PrintTable for ResourceListItem<AlerterListItemInfo> {
   }
 }
 
-impl PrintTable for Terminal {
-  fn header(_links: bool) -> &'static [&'static str] {
-    &["Terminal", "Target", "Command", "Size", "Created"]
-  }
-  fn row(self, _links: bool) -> Vec<comfy_table::Cell> {
-    vec![
-      Cell::new(self.name).add_attribute(Attribute::Bold),
-      Cell::new(format!("{:?}", self.target)),
-      Cell::new(self.command),
-      Cell::new(if self.stored_size_kb < 1.0 {
-        format!("{:.1} KiB", self.stored_size_kb)
-      } else {
-        format!("{:.} KiB", self.stored_size_kb)
-      }),
-      Cell::new(
-        format_timetamp(self.created_at)
-          .unwrap_or_else(|_| String::from("Invalid created at")),
-      ),
-    ]
-  }
-}
-
 impl PrintTable for Schedule {
   fn header(links: bool) -> &'static [&'static str] {
     if links {
@@ -1353,7 +1146,7 @@ impl PrintTable for Schedule {
     let next_run = if let Some(ts) = self.next_scheduled_run {
       Cell::new(
         format_timetamp(ts)
-          .unwrap_or_else(|_| String::from("Invalid next ts")),
+          .unwrap_or(String::from("Invalid next ts")),
       )
       .add_attribute(Attribute::Bold)
     } else {

bin/cli/src/command/mod.rs

@@ -15,12 +15,9 @@ use wildcard::Wildcard;
 use crate::config::cli_config;
 
 pub mod container;
-pub mod core_info;
-pub mod create;
 pub mod database;
 pub mod execute;
 pub mod list;
-pub mod terminal;
 pub mod update;
 
 async fn komodo_client() -> anyhow::Result<&'static KomodoClient> {

bin/cli/src/command/terminal.rs

@@ -1,387 +0,0 @@
-use anyhow::{Context, anyhow};
-use colored::Colorize;
-use komodo_client::{
-  api::{
-    read::{GetServer, ListAllContainers, ListServers},
-    terminal::InitTerminal,
-  },
-  entities::{
-    config::cli::args::terminal::{Attach, Connect, Exec},
-    server::ServerQuery,
-    terminal::{
-      ContainerTerminalMode, TerminalRecreateMode,
-      TerminalResizeMessage, TerminalStdinMessage,
-    },
-  },
-  ws::terminal::TerminalWebsocket,
-};
-use tokio::io::{AsyncReadExt as _, AsyncWriteExt as _};
-use tokio_util::sync::CancellationToken;
-
-pub async fn handle_connect(
-  Connect {
-    server,
-    name,
-    command,
-    recreate,
-  }: &Connect,
-) -> anyhow::Result<()> {
-  handle_terminal_forwarding(server, async {
-    super::komodo_client()
-      .await?
-      .connect_server_terminal(
-        server.to_string(),
-        Some(name.to_string()),
-        Some(InitTerminal {
-          command: command.clone(),
-          recreate: if *recreate {
-            TerminalRecreateMode::Always
-          } else {
-            TerminalRecreateMode::DifferentCommand
-          },
-          mode: None,
-        }),
-      )
-      .await
-  })
-  .await
-}
-
-pub async fn handle_exec(
-  Exec {
-    server,
-    container,
-    shell,
-    recreate,
-  }: &Exec,
-) -> anyhow::Result<()> {
-  let server = get_server(server.clone(), container).await?;
-  handle_terminal_forwarding(
-    &format!("{server}/{container}"),
-    async {
-      super::komodo_client()
-        .await?
-        .connect_container_terminal(
-          server,
-          container.to_string(),
-          None,
-          Some(InitTerminal {
-            command: Some(shell.to_string()),
-            recreate: if *recreate {
-              TerminalRecreateMode::Always
-            } else {
-              TerminalRecreateMode::DifferentCommand
-            },
-            mode: Some(ContainerTerminalMode::Exec),
-          }),
-        )
-        .await
-    },
-  )
-  .await
-}
-
-pub async fn handle_attach(
-  Attach {
-    server,
-    container,
-    recreate,
-  }: &Attach,
-) -> anyhow::Result<()> {
-  let server = get_server(server.clone(), container).await?;
-  handle_terminal_forwarding(
-    &format!("{server}/{container}-attach"),
-    async {
-      super::komodo_client()
-        .await?
-        .connect_container_terminal(
-          server,
-          container.to_string(),
-          None,
-          Some(InitTerminal {
-            command: None,
-            recreate: if *recreate {
-              TerminalRecreateMode::Always
-            } else {
-              TerminalRecreateMode::DifferentCommand
-            },
-            mode: Some(ContainerTerminalMode::Attach),
-          }),
-        )
-        .await
-    },
-  )
-  .await
-}
-
-async fn get_server(
-  server: Option<String>,
-  container: &str,
-) -> anyhow::Result<String> {
-  // Don't need to find server for terminal,
-  // user provided it, early return.
-  if let Some(server) = server {
-    return Ok(server);
-  }
-
-  let client = super::komodo_client().await?;
-
-  let mut containers = client
-    .read(ListAllContainers {
-      servers: Default::default(),
-      tags: Default::default(),
-      terms: vec![container.to_string()],
-      state: Default::default(),
-      limit: Some(0),
-      page: 0,
-    })
-    .await?;
-
-  if containers.is_empty() {
-    return Err(anyhow!(
-      "Did not find any container matching {container}"
-    ));
-  }
-
-  if containers.len() == 1 {
-    let server_id = containers
-      .pop()
-      .context("Shouldn't happen")?
-      .server_id
-      .context("Container doesn't have server_id")?;
-    let server_name =
-      client.read(GetServer { server: server_id }).await?.name;
-    return Ok(server_name);
-  }
-
-  let servers = containers
-    .into_iter()
-    .flat_map(|container| container.server_id)
-    .collect::<Vec<_>>();
-
-  let servers = client
-    .read(ListServers {
-      query: ServerQuery::builder().names(servers).build(),
-      limit: Some(0),
-      ..Default::default()
-    })
-    .await?
-    .into_iter()
-    .map(|server| format!("\t- {}", server.name.bold()))
-    .collect::<Vec<_>>()
-    .join("\n");
-
-  Err(anyhow!(
-    "Multiple containers matching '{}' on Servers:\n{servers}",
-    container.bold(),
-  ))
-}
-
-async fn handle_terminal_forwarding<
-  C: Future<Output = anyhow::Result<TerminalWebsocket>>,
->(
-  label: &str,
-  connect: C,
-) -> anyhow::Result<()> {
-  // Need to forward multiple sources into ws write
-  let (write_tx, mut write_rx) =
-    tokio::sync::mpsc::channel::<TerminalStdinMessage>(1024);
-
-  // ================
-  //  SETUP RESIZING
-  // ================
-
-  // Subscribe to SIGWINCH for resize messages
-  let mut sigwinch = tokio::signal::unix::signal(
-    tokio::signal::unix::SignalKind::window_change(),
-  )
-  .context("failed to register SIGWINCH handler")?;
-
-  // Send first resize messsage, bailing if it fails to get the size.
-  write_tx.send(resize_message()?).await?;
-
-  let cancel = CancellationToken::new();
-
-  let forward_resize = async {
-    while future_or_cancel(sigwinch.recv(), &cancel)
-      .await
-      .flatten()
-      .is_some()
-    {
-      if let Ok(resize_message) = resize_message()
-        && write_tx.send(resize_message).await.is_err()
-      {
-        break;
-      }
-    }
-    cancel.cancel();
-  };
-
-  let forward_stdin = async {
-    let mut stdin = tokio::io::stdin();
-    let mut buf = [0u8; 8192];
-    while let Some(Ok(n)) =
-      future_or_cancel(stdin.read(&mut buf), &cancel).await
-    {
-      // EOF
-      if n == 0 {
-        break;
-      }
-      let bytes = &buf[..n];
-      // Check for disconnect sequence (alt + q)
-      if bytes == [197, 147] {
-        break;
-      }
-      // Forward bytes
-      if write_tx
-        .send(TerminalStdinMessage::Forward(bytes.to_vec()))
-        .await
-        .is_err()
-      {
-        break;
-      };
-    }
-    cancel.cancel();
-  };
-
-  // =====================
-  //  CONNECT AND FORWARD
-  // =====================
-
-  let (mut ws_write, mut ws_read) = connect.await?.split();
-
-  let forward_write = async {
-    while let Some(message) =
-      future_or_cancel(write_rx.recv(), &cancel).await.flatten()
-    {
-      if let Err(e) = ws_write.send_stdin_message(message).await {
-        cancel.cancel();
-        return Some(e);
-      };
-    }
-    cancel.cancel();
-    None
-  };
-
-  let forward_read = async {
-    let mut stdout = tokio::io::stdout();
-
-    // Write connection message
-    if let Err(e) = write_connection_message(&mut stdout, label)
-      .await
-      .context("Failed to write text to stdout")
-    {
-      cancel.cancel();
-      return Some(e);
-    }
-
-    while let Some(msg) =
-      future_or_cancel(ws_read.receive_stdout(), &cancel).await
-    {
-      let bytes = match msg {
-        Ok(Some(bytes)) => bytes,
-        Ok(None) => break,
-        Err(e) => {
-          cancel.cancel();
-          return Some(e.context("Websocket read error"));
-        }
-      };
-      if let Err(e) = stdout
-        .write_all(&bytes)
-        .await
-        .context("Failed to write text to stdout")
-      {
-        cancel.cancel();
-        return Some(e);
-      }
-      let _ = stdout.flush().await;
-    }
-    cancel.cancel();
-    None
-  };
-
-  let guard = RawModeGuard::enable_raw_mode()?;
-
-  let (_, _, write_error, read_error) = tokio::join!(
-    forward_resize,
-    forward_stdin,
-    forward_write,
-    forward_read
-  );
-
-  drop(guard);
-
-  if let Some(e) = write_error {
-    eprintln!("\nFailed to forward stdin | {e:#}");
-  }
-
-  if let Some(e) = read_error {
-    eprintln!("\nFailed to forward stdout | {e:#}");
-  }
-
-  println!("\n\n{} {}", "connection".bold(), "closed".red().bold());
-
-  // It doesn't seem to exit by itself after the raw mode stuff.
-  std::process::exit(0)
-}
-
-async fn write_connection_message(
-  stdout: &mut tokio::io::Stdout,
-  label: &str,
-) -> anyhow::Result<()> {
-  // Use message without ansi for correct length
-  let message_clean = format!("# Connected to {label} (km) #");
-  let bounder = "=".repeat(message_clean.chars().count());
-
-  let message = format!(
-    "# {} to {} {} #",
-    "Connected".green().bold(),
-    label.bold(),
-    "(km)".dimmed()
-  );
-
-  stdout
-    .write_all(
-      format!("\n{bounder}\r\n{message}\r\n{bounder}\r\n").as_bytes(),
-    )
-    .await?;
-  let _ = stdout.flush().await;
-
-  Ok(())
-}
-
-fn resize_message() -> anyhow::Result<TerminalStdinMessage> {
-  let (cols, rows) = crossterm::terminal::size()
-    .context("Failed to get terminal size")?;
-  Ok(TerminalStdinMessage::Resize(TerminalResizeMessage {
-    rows,
-    cols,
-  }))
-}
-
-struct RawModeGuard;
-
-impl RawModeGuard {
-  fn enable_raw_mode() -> anyhow::Result<Self> {
-    crossterm::terminal::enable_raw_mode()
-      .context("Failed to enable terminal raw mode")?;
-    Ok(Self)
-  }
-}
-impl Drop for RawModeGuard {
-  fn drop(&mut self) {
-    if let Err(e) = crossterm::terminal::disable_raw_mode() {
-      eprintln!("Failed to disable terminal raw mode | {e:?}");
-    }
-  }
-}
-
-async fn future_or_cancel<T, F: Future<Output = T>>(
-  fut: F,
-  cancel: &CancellationToken,
-) -> Option<T> {
-  tokio::select! {
-    res = fut => Some(res),
-    _ = cancel.cancelled() => None
-  }
-}

bin/cli/src/command/update/user.rs

@@ -26,9 +26,6 @@ pub async fn update(
     UpdateUserCommand::SuperAdmin { enabled, yes } => {
       update_super_admin(username, *enabled, *yes).await
     }
-    UpdateUserCommand::Clear2fa { yes } => {
-      clear_2fa(username, *yes).await
-    }
   }
 }
 
@@ -123,20 +120,3 @@ async fn update_super_admin(
 
   Ok(())
 }
-
-async fn clear_2fa(username: &str, yes: bool) -> anyhow::Result<()> {
-  println!("\n{}: Clear 2FA Methods\n", "Mode".dimmed());
-  println!(" - {}: {username}", "Username".dimmed());
-
-  crate::command::wait_for_enter("clear user 2FA methods", yes)?;
-
-  info!("Clearing 2FA methods...");
-
-  let db = database::Client::new(&cli_config().database).await?;
-
-  db.clear_user_2fa_methods(username).await?;
-
-  info!("2FA methods cleared ✅");
-
-  Ok(())
-}

bin/cli/src/config.rs

@@ -3,6 +3,7 @@ use std::{path::PathBuf, sync::OnceLock};
 use anyhow::Context;
 use clap::Parser;
 use colored::Colorize;
+use environment_file::maybe_read_item_from_file;
 use komodo_client::entities::{
   config::{
     DatabaseConfig,
@@ -13,7 +14,6 @@ use komodo_client::entities::{
   },
   logger::LogConfig,
 };
-use mogh_secret_file::maybe_read_item_from_file;
 
 pub fn cli_args() -> &'static CliArgs {
   static CLI_ARGS: OnceLock<CliArgs> = OnceLock::new();
@@ -28,7 +28,7 @@ pub fn cli_env() -> &'static Env {
     {
       Ok(env) => env,
       Err(e) => {
-        panic!("{e:?}")
+        panic!("{e:?}");
       }
     }
   })
@@ -74,7 +74,7 @@ pub fn cli_config() -> &'static CliConfig {
         "Config File Keywords".dimmed(),
       );
     }
-    let mut unparsed_config = (mogh_config::ConfigLoader {
+    let mut unparsed_config = (config::ConfigLoader {
       paths: &config_paths
         .iter()
         .map(PathBuf::as_path)
@@ -166,7 +166,7 @@ pub fn cli_config() -> &'static CliConfig {
       else {
         panic!("Profile config is not Object type.");
       };
-      mogh_config::merge_config(
+      config::merge_config(
         unparsed_config,
         profile_config.clone(),
         env.komodo_cli_merge_nested_config,
@@ -261,21 +261,12 @@ pub fn cli_config() -> &'static CliConfig {
           .komodo_cli_logging_pretty
           .unwrap_or(config.cli_logging.pretty),
         location: false,
-        ansi: env
-          .komodo_cli_logging_ansi
-          .unwrap_or(config.cli_logging.ansi),
-        timestamps: env
-          .komodo_cli_logging_timestamps
-          .unwrap_or(config.cli_logging.timestamps),
         otlp_endpoint: env
           .komodo_cli_logging_otlp_endpoint
           .unwrap_or(config.cli_logging.otlp_endpoint),
         opentelemetry_service_name: env
           .komodo_cli_logging_opentelemetry_service_name
           .unwrap_or(config.cli_logging.opentelemetry_service_name),
-        opentelemetry_scope_name: env
-          .komodo_cli_logging_opentelemetry_scope_name
-          .unwrap_or(config.cli_logging.opentelemetry_scope_name),
       },
       profile: config.profile,
     }

bin/cli/src/main.rs

@@ -2,7 +2,6 @@
 extern crate tracing;
 
 use anyhow::Context;
-use colored::Colorize;
 use komodo_client::entities::config::cli::args;
 
 use crate::config::cli_config;
@@ -12,10 +11,7 @@ mod config;
 
 async fn app() -> anyhow::Result<()> {
   dotenvy::dotenv().ok();
-  rustls::crypto::aws_lc_rs::default_provider()
-    .install_default()
-    .expect("Failed to install default crypto provider");
-  mogh_logger::init(&config::cli_config().cli_logging)?;
+  logger::init(&config::cli_config().cli_logging)?;
   let args = config::cli_args();
   let env = config::cli_env();
   let debug_load =
@@ -45,7 +41,12 @@ async fn app() -> anyhow::Result<()> {
       }
       Ok(())
     }
-    args::Command::CoreInfo => command::core_info::handle().await,
+    args::Command::Key { command } => {
+      noise::key::command::handle(command).await
+    }
+    args::Command::Database { command } => {
+      command::database::handle(command).await
+    }
     args::Command::Container(container) => {
       command::container::handle(container).await
     }
@@ -56,27 +57,9 @@ async fn app() -> anyhow::Result<()> {
     args::Command::Execute(args) => {
       command::execute::handle(&args.execution, args.yes).await
     }
-    args::Command::Create { command } => {
-      command::create::handle(command).await
-    }
     args::Command::Update { command } => {
       command::update::handle(command).await
     }
-    args::Command::Connect(connect) => {
-      command::terminal::handle_connect(connect).await
-    }
-    args::Command::Exec(exec) => {
-      command::terminal::handle_exec(exec).await
-    }
-    args::Command::Attach(attach) => {
-      command::terminal::handle_attach(attach).await
-    }
-    args::Command::Key { command } => {
-      mogh_pki::cli::handle(command, mogh_pki::PkiKind::Mutual).await
-    }
-    args::Command::Database { command } => {
-      command::database::handle(command).await
-    }
   }
 }
 
@@ -86,18 +69,7 @@ async fn main() -> anyhow::Result<()> {
     tokio::signal::unix::SignalKind::terminate(),
   )?;
   tokio::select! {
-    res = tokio::spawn(app()) => match res {
-      Ok(Err(e)) => {
-        eprintln!("{}: {e}", "ERROR".red());
-        std::process::exit(1)
-      }
-      Err(e) => {
-        eprintln!("{}: {e}", "ERROR".red());
-        std::process::exit(1)
-      },
-      Ok(_) => {}
-    },
-    _ = term_signal.recv() => {},
+    res = tokio::spawn(app()) => res?,
+    _ = term_signal.recv() => Ok(()),
   }
-  Ok(())
 }

bin/core/Cargo.toml

@@ -2,6 +2,7 @@
 name = "komodo_core"
 version.workspace = true
 edition.workspace = true
+authors.workspace = true
 license.workspace = true
 homepage.workspace = true
 repository.workspace = true
@@ -14,71 +15,71 @@ path = "src/main.rs"
 
 [dependencies]
 # local
-komodo_client = { workspace = true, features = ["core"] }
+komodo_client = { workspace = true, features = ["mongo"] }
 periphery_client.workspace = true
-mogh_validations.workspace = true
+environment_file.workspace = true
 interpolate.workspace = true
-mogh_secret_file.workspace = true
 formatting.workspace = true
-mogh_rate_limit.workspace = true
 transport.workspace = true
 database.workspace = true
-encoding.workspace = true
+response.workspace = true
 command.workspace = true
-mogh_config.workspace = true
-mogh_logger.workspace = true
-mogh_cache.workspace = true
-mogh_pki.workspace = true
+config.workspace = true
+logger.workspace = true
+cache.workspace = true
+noise.workspace = true
 git.workspace = true
 # mogh
-mogh_error = { workspace = true, features = ["axum"] }
-mogh_auth_client = { workspace = true, features = ["utoipa"] }
-mogh_auth_server.workspace = true
+serror = { workspace = true, features = ["axum"] }
 async_timing_util.workspace = true
 partial_derive2.workspace = true
-mogh_resolver.workspace = true
-mogh_server.workspace = true
+derive_variants.workspace = true
+resolver_api.workspace = true
 toml_pretty.workspace = true
 slack.workspace = true
 svi.workspace = true
 # external
 aws-credential-types.workspace = true
 english-to-cron.workspace = true
-data-encoding.workspace = true
-serde_yaml_ng.workspace = true
-utoipa-scalar.workspace = true
-futures-util.workspace = true
-aws-sdk-ec2.workspace = true
+openidconnect.workspace = true
+jsonwebtoken.workspace = true
+axum-server.workspace = true
 urlencoding.workspace = true
+aws-sdk-ec2.workspace = true
 aws-config.workspace = true
 tokio-util.workspace = true
 axum-extra.workspace = true
+tower-http.workspace = true
 serde_json.workspace = true
+serde_yaml_ng.workspace = true
 typeshare.workspace = true
 chrono-tz.workspace = true
 indexmap.workspace = true
+octorust.workspace = true
 wildcard.workspace = true
 arc-swap.workspace = true
-serde_qs.workspace = true
 colored.workspace = true
+dashmap.workspace = true
 tracing.workspace = true
 reqwest.workspace = true
+futures.workspace = true
+nom_pem.workspace = true
 dotenvy.workspace = true
 anyhow.workspace = true
-bcrypt.workspace = true
 croner.workspace = true
 chrono.workspace = true
+bcrypt.workspace = true
+base64.workspace = true
 rustls.workspace = true
-utoipa.workspace = true
 bytes.workspace = true
 tokio.workspace = true
 serde.workspace = true
-strum.workspace = true
 regex.workspace = true
 axum.workspace = true
 toml.workspace = true
 uuid.workspace = true
 envy.workspace = true
+rand.workspace = true
 hmac.workspace = true
 sha2.workspace = true
 hex.workspace = true

bin/core/aio.Dockerfile

@@ -1,7 +1,7 @@
 ## All in one, multi stage compile + runtime Docker build for your architecture.
 
 # Build Core
-FROM rust:1.96.1-trixie AS core-builder
+FROM rust:1.90.0-bullseye AS core-builder
 RUN cargo install cargo-strip
 
 WORKDIR /builder
@@ -11,23 +11,22 @@ COPY ./client/core/rs ./client/core/rs
 COPY ./client/periphery ./client/periphery
 COPY ./bin/core ./bin/core
 COPY ./bin/cli ./bin/cli
-COPY ./xtask ./xtask
 
 # Compile app
 RUN cargo build -p komodo_core --release && \
   cargo build -p komodo_cli --release && \
   cargo strip
 
-# Build UI
-FROM node:22.12-alpine AS ui-builder
+# Build Frontend
+FROM node:20.12-alpine AS frontend-builder
 WORKDIR /builder
-COPY ./ui ./ui
+COPY ./frontend ./frontend
 COPY ./client/core/ts ./client
 RUN cd client && yarn && yarn build && yarn link
-RUN cd ui && yarn link komodo_client && yarn && yarn build
+RUN cd frontend && yarn link komodo_client && yarn && yarn build
 
 # Final Image
-FROM debian:trixie-slim
+FROM debian:bullseye-slim
 
 COPY ./bin/core/starship.toml /starship.toml
 COPY ./bin/core/debian-deps.sh .
@@ -38,7 +37,7 @@ WORKDIR /app
 
 # Copy
 COPY ./config/core.config.toml /config/.default.config.toml
-COPY --from=ui-builder /builder/ui/dist /app/ui
+COPY --from=frontend-builder /builder/frontend/dist /app/frontend
 COPY --from=core-builder /builder/target/release/core /usr/local/bin/core
 COPY --from=core-builder /builder/target/release/km /usr/local/bin/km
 COPY --from=denoland/deno:bin /deno /usr/local/bin/deno
@@ -49,9 +48,6 @@ RUN mkdir /action-cache && \
   cd /action-cache && \
   deno install jsr:@std/yaml jsr:@std/toml
 
-COPY ./bin/entrypoint.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
-
 # Hint at the port
 EXPOSE 9120
 
@@ -59,11 +55,8 @@ ENV KOMODO_CLI_CONFIG_PATHS="/config"
 # This ensures any `komodo.cli.*` takes precedence over the Core `/config/*config.*`
 ENV KOMODO_CLI_CONFIG_KEYWORDS="*config.*,*komodo.cli*.*"
 
-ENTRYPOINT [ "entrypoint.sh" ]
 CMD [ "core" ]
 
-# Label to prevent Komodo from stopping with StopAllContainers
-LABEL komodo.skip="true"
 # Label for Ghcr
 LABEL org.opencontainers.image.source="https://github.com/moghtech/komodo"
 LABEL org.opencontainers.image.description="Komodo Core"

bin/core/multi-arch.Dockerfile

@@ -2,18 +2,18 @@
 ## Sets up the necessary runtime container dependencies for Komodo Core.
 ## Since theres no heavy build here, QEMU multi-arch builds are fine for this image.
 
-ARG BINARIES_IMAGE=ghcr.io/moghtech/komodo-binaries:2
-ARG UI_IMAGE=ghcr.io/moghtech/komodo-ui:2
+ARG BINARIES_IMAGE=ghcr.io/moghtech/komodo-binaries:latest
+ARG FRONTEND_IMAGE=ghcr.io/moghtech/komodo-frontend:latest
 ARG X86_64_BINARIES=${BINARIES_IMAGE}-x86_64
 ARG AARCH64_BINARIES=${BINARIES_IMAGE}-aarch64
 
 # This is required to work with COPY --from
 FROM ${X86_64_BINARIES} AS x86_64
 FROM ${AARCH64_BINARIES} AS aarch64
-FROM ${UI_IMAGE} AS ui
+FROM ${FRONTEND_IMAGE} AS frontend
 
 # Final Image
-FROM debian:trixie-slim
+FROM debian:bullseye-slim
 
 COPY ./bin/core/starship.toml /starship.toml
 COPY ./bin/core/debian-deps.sh .
@@ -28,14 +28,14 @@ COPY --from=x86_64 /core /app/core/linux/amd64
 COPY --from=aarch64 /core /app/core/linux/arm64
 RUN mv /app/core/${TARGETPLATFORM} /usr/local/bin/core && rm -r /app/core
 
-# Same for km
+# Same for util
 COPY --from=x86_64 /km /app/km/linux/amd64
 COPY --from=aarch64 /km /app/km/linux/arm64
 RUN mv /app/km/${TARGETPLATFORM} /usr/local/bin/km && rm -r /app/km
 
-# Copy default config / static ui / deno binary
+# Copy default config / static frontend / deno binary
 COPY ./config/core.config.toml /config/.default.config.toml
-COPY --from=ui /ui /app/ui
+COPY --from=frontend /frontend /app/frontend
 COPY --from=denoland/deno:bin /deno /usr/local/bin/deno
 
 # Set $DENO_DIR and preload external Deno deps
@@ -44,9 +44,6 @@ RUN mkdir /action-cache && \
   cd /action-cache && \
   deno install jsr:@std/yaml jsr:@std/toml
 
-COPY ./bin/entrypoint.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
-
 # Hint at the port
 EXPOSE 9120
 
@@ -54,11 +51,8 @@ ENV KOMODO_CLI_CONFIG_PATHS="/config"
 # This ensures any `komodo.cli.*` takes precedence over the Core `/config/*config.*`
 ENV KOMODO_CLI_CONFIG_KEYWORDS="*config.*,*komodo.cli*.*"
 
-ENTRYPOINT [ "entrypoint.sh" ]
 CMD [ "core" ]
 
-# Label to prevent Komodo from stopping with StopAllContainers
-LABEL komodo.skip="true"
 # Label for Ghcr
 LABEL org.opencontainers.image.source="https://github.com/moghtech/komodo"
 LABEL org.opencontainers.image.description="Komodo Core"

bin/core/single-arch.Dockerfile

@@ -1,20 +1,20 @@
 ## Assumes the latest binaries for the required arch are already built (by binaries.Dockerfile).
 ## Sets up the necessary runtime container dependencies for Komodo Core.
 
-ARG BINARIES_IMAGE=ghcr.io/moghtech/komodo-binaries:2
+ARG BINARIES_IMAGE=ghcr.io/moghtech/komodo-binaries:latest
 
 # This is required to work with COPY --from
 FROM ${BINARIES_IMAGE} AS binaries
 
-# Build UI
-FROM node:22.12-alpine AS ui-builder
+# Build Frontend
+FROM node:20.12-alpine AS frontend-builder
 WORKDIR /builder
-COPY ./ui ./ui
+COPY ./frontend ./frontend
 COPY ./client/core/ts ./client
 RUN cd client && yarn && yarn build && yarn link
-RUN cd ui && yarn link komodo_client && yarn && yarn build
+RUN cd frontend && yarn link komodo_client && yarn && yarn build
 
-FROM debian:trixie-slim
+FROM debian:bullseye-slim
 
 COPY ./bin/core/starship.toml /starship.toml
 COPY ./bin/core/debian-deps.sh .
@@ -22,7 +22,7 @@ RUN sh ./debian-deps.sh && rm ./debian-deps.sh
 	
 # Copy
 COPY ./config/core.config.toml /config/.default.config.toml
-COPY --from=ui-builder /builder/ui/dist /app/ui
+COPY --from=frontend-builder /builder/frontend/dist /app/frontend
 COPY --from=binaries /core /usr/local/bin/core
 COPY --from=binaries /km /usr/local/bin/km
 COPY --from=denoland/deno:bin /deno /usr/local/bin/deno
@@ -33,9 +33,6 @@ RUN mkdir /action-cache && \
 	cd /action-cache && \
 	deno install jsr:@std/yaml jsr:@std/toml
 
-COPY ./bin/entrypoint.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
-
 # Hint at the port
 EXPOSE 9120
 
@@ -43,11 +40,8 @@ ENV KOMODO_CLI_CONFIG_PATHS="/config"
 # This ensures any `komodo.cli.*` takes precedence over the Core `/config/*config.*`
 ENV KOMODO_CLI_CONFIG_KEYWORDS="*config.*,*komodo.cli*.*"
 
-ENTRYPOINT [ "entrypoint.sh" ]
 CMD [ "core" ]
 
-# Label to prevent Komodo from stopping with StopAllContainers
-LABEL komodo.skip="true"
 # Label for Ghcr
 LABEL org.opencontainers.image.source="https://github.com/moghtech/komodo"
 LABEL org.opencontainers.image.description="Komodo Core"

bin/core/src/alert/discord.rs

@@ -4,6 +4,7 @@ use serde::Serialize;
 
 use super::*;
 
+#[instrument(level = "debug")]
 pub async fn send_alert(
   url: &str,
   alert: &Alert,
@@ -16,52 +17,6 @@ pub async fn send_alert(
         "{level} | If you see this message, then Alerter **{name}** is **working**\n{link}"
       )
     }
-    AlertData::SwarmUnhealthy { id, name, err } => {
-      let link = resource_link(ResourceTargetVariant::Swarm, id);
-      match alert.level {
-        SeverityLevel::Ok => {
-          format!(
-            "{level} | Swarm **{name}** is now **healthy**\n{link}"
-          )
-        }
-        SeverityLevel::Critical => {
-          let err = err
-            .as_ref()
-            .map(|e| format!("\n**error**: {e:#?}"))
-            .unwrap_or_default();
-          format!(
-            "{level} | Swarm **{name}** is **unhealthy** ❌\n{link}{err}"
-          )
-        }
-        _ => unreachable!(),
-      }
-    }
-    AlertData::ServerUnreachable {
-      id,
-      name,
-      region,
-      err,
-    } => {
-      let region = fmt_region(region);
-      let link = resource_link(ResourceTargetVariant::Server, id);
-      match alert.level {
-        SeverityLevel::Ok => {
-          format!(
-            "{level} | **{name}**{region} is now **connected**\n{link}"
-          )
-        }
-        SeverityLevel::Critical => {
-          let err = err
-            .as_ref()
-            .map(|e| format!("\n**error**: {e:#?}"))
-            .unwrap_or_default();
-          format!(
-            "{level} | **{name}**{region} is **unreachable** ❌\n{link}{err}"
-          )
-        }
-        _ => unreachable!(),
-      }
-    }
     AlertData::ServerVersionMismatch {
       id,
       name,
@@ -84,6 +39,32 @@ pub async fn send_alert(
         }
       }
     }
+    AlertData::ServerUnreachable {
+      id,
+      name,
+      region,
+      err,
+    } => {
+      let region = fmt_region(region);
+      let link = resource_link(ResourceTargetVariant::Server, id);
+      match alert.level {
+        SeverityLevel::Ok => {
+          format!(
+            "{level} | **{name}**{region} is now **reachable**\n{link}"
+          )
+        }
+        SeverityLevel::Critical => {
+          let err = err
+            .as_ref()
+            .map(|e| format!("\n**error**: {e:#?}"))
+            .unwrap_or_default();
+          format!(
+            "{level} | **{name}**{region} is **unreachable** ❌\n{link}{err}"
+          )
+        }
+        _ => unreachable!(),
+      }
+    }
     AlertData::ServerCpu {
       id,
       name,
@@ -128,8 +109,6 @@ pub async fn send_alert(
     AlertData::ContainerStateChange {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
       server_id: _server_id,
       server_name,
       from,
@@ -137,64 +116,37 @@ pub async fn send_alert(
     } => {
       let link = resource_link(ResourceTargetVariant::Deployment, id);
       let to = fmt_docker_container_state(to);
-      let target = if let Some(swarm) = swarm_name {
-        format!("\nswarm: **{swarm}**")
-      } else if let Some(server) = server_name {
-        format!("\nserver: **{server}**")
-      } else {
-        String::new()
-      };
       format!(
-        "📦 Deployment **{name}** is now **{to}**{target}\nprevious: **{from}**\n{link}"
+        "📦 Deployment **{name}** is now **{to}**\nserver: **{server_name}**\nprevious: **{from}**\n{link}"
       )
     }
     AlertData::DeploymentImageUpdateAvailable {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
       server_id: _server_id,
       server_name,
       image,
     } => {
       let link = resource_link(ResourceTargetVariant::Deployment, id);
-      let target = if let Some(swarm) = swarm_name {
-        format!("\nswarm: **{swarm}**")
-      } else if let Some(server) = server_name {
-        format!("\nserver: **{server}**")
-      } else {
-        String::new()
-      };
       format!(
-        "⬆ Deployment **{name}** has an update available{target}\nimage: **{image}**\n{link}"
+        "⬆ Deployment **{name}** has an update available\nserver: **{server_name}**\nimage: **{image}**\n{link}"
       )
     }
     AlertData::DeploymentAutoUpdated {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
       server_id: _server_id,
       server_name,
       image,
     } => {
       let link = resource_link(ResourceTargetVariant::Deployment, id);
-      let target = if let Some(swarm) = swarm_name {
-        format!("\nswarm: **{swarm}**")
-      } else if let Some(server) = server_name {
-        format!("\nserver: **{server}**")
-      } else {
-        String::new()
-      };
       format!(
-        "⬆ Deployment **{name}** was updated automatically ⏫{target}\nimage: **{image}**\n{link}"
+        "⬆ Deployment **{name}** was updated automatically ⏫\nserver: **{server_name}**\nimage: **{image}**\n{link}"
       )
     }
     AlertData::StackStateChange {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
       server_id: _server_id,
       server_name,
       from,
@@ -202,44 +154,26 @@ pub async fn send_alert(
     } => {
       let link = resource_link(ResourceTargetVariant::Stack, id);
       let to = fmt_stack_state(to);
-      let target = if let Some(swarm) = swarm_name {
-        format!("\nswarm: **{swarm}**")
-      } else if let Some(server) = server_name {
-        format!("\nserver: **{server}**")
-      } else {
-        String::new()
-      };
       format!(
-        "🥞 Stack **{name}** is now {to}{target}\nprevious: **{from}**\n{link}"
+        "🥞 Stack **{name}** is now {to}\nserver: **{server_name}**\nprevious: **{from}**\n{link}"
       )
     }
     AlertData::StackImageUpdateAvailable {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
       server_id: _server_id,
       server_name,
       service,
       image,
     } => {
       let link = resource_link(ResourceTargetVariant::Stack, id);
-      let target = if let Some(swarm) = swarm_name {
-        format!("\nswarm: **{swarm}**")
-      } else if let Some(server) = server_name {
-        format!("\nserver: **{server}**")
-      } else {
-        String::new()
-      };
       format!(
-        "⬆ Stack **{name}** has an update available{target}\nservice: **{service}**\nimage: **{image}**\n{link}"
+        "⬆ Stack **{name}** has an update available\nserver: **{server_name}**\nservice: **{service}**\nimage: **{image}**\n{link}"
       )
     }
     AlertData::StackAutoUpdated {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
       server_id: _server_id,
       server_name,
       images,
@@ -248,15 +182,8 @@ pub async fn send_alert(
       let images_label =
         if images.len() > 1 { "images" } else { "image" };
       let images = images.join(", ");
-      let target = if let Some(swarm) = swarm_name {
-        format!("\nswarm: **{swarm}**")
-      } else if let Some(server) = server_name {
-        format!("\nserver: **{server}**")
-      } else {
-        String::new()
-      };
       format!(
-        "⬆ Stack **{name}** was updated automatically ⏫{target}\n{images_label}: **{images}**\n{link}"
+        "⬆ Stack **{name}** was updated automatically ⏫\nserver: **{server_name}**\n{images_label}: **{images}**\n{link}"
       )
     }
     AlertData::AwsBuilderTerminationFailed {
@@ -306,41 +233,39 @@ pub async fn send_alert(
       format!(
         "{level} | {message}{}",
         if details.is_empty() {
-          String::new()
+          format_args!("")
         } else {
-          format!("\n{details}")
+          format_args!("\n{details}")
         }
       )
     }
     AlertData::None {} => Default::default(),
   };
+  if !content.is_empty() {
+    let VariablesAndSecrets { variables, secrets } =
+      get_variables_and_secrets().await?;
+    let mut url_interpolated = url.to_string();
 
-  if content.is_empty() {
-    return Ok(());
+    let mut interpolator =
+      Interpolator::new(Some(&variables), &secrets);
+
+    interpolator.interpolate_string(&mut url_interpolated)?;
+
+    send_message(&url_interpolated, &content)
+      .await
+      .map_err(|e| {
+        let replacers = interpolator
+          .secret_replacers
+          .into_iter()
+          .collect::<Vec<_>>();
+        let sanitized_error =
+          svi::replace_in_string(&format!("{e:?}"), &replacers);
+        anyhow::Error::msg(format!(
+          "Error with slack request: {sanitized_error}"
+        ))
+      })?;
   }
-
-  let VariablesAndSecrets { variables, secrets } =
-    get_variables_and_secrets().await?;
-  let mut url_interpolated = url.to_string();
-
-  let mut interpolator =
-    Interpolator::new(Some(&variables), &secrets);
-
-  interpolator.interpolate_string(&mut url_interpolated)?;
-
-  send_message(&url_interpolated, &content)
-    .await
-    .map_err(|e| {
-      let replacers = interpolator
-        .secret_replacers
-        .into_iter()
-        .collect::<Vec<_>>();
-      let sanitized_error =
-        svi::replace_in_string(&format!("{e:?}"), &replacers);
-      anyhow::Error::msg(format!(
-        "Error with request to Discord: {sanitized_error}"
-      ))
-    })
+  Ok(())
 }
 
 async fn send_message(

bin/core/src/alert/mod.rs

@@ -1,6 +1,7 @@
 use anyhow::{Context, anyhow};
 use database::mungos::{find::find_collect, mongodb::bson::doc};
-use futures_util::future::join_all;
+use derive_variants::ExtractVariant;
+use futures::future::join_all;
 use interpolate::Interpolator;
 use komodo_client::entities::{
   ResourceTargetVariant,
@@ -10,6 +11,7 @@ use komodo_client::entities::{
   komodo_timestamp,
   stack::StackState,
 };
+use tracing::Instrument;
 
 use crate::helpers::query::get_variables_and_secrets;
 use crate::helpers::{
@@ -22,32 +24,40 @@ mod ntfy;
 mod pushover;
 mod slack;
 
+#[instrument(level = "debug")]
 pub async fn send_alerts(alerts: &[Alert]) {
   if alerts.is_empty() {
     return;
   }
 
-  let Ok(alerters) = find_collect(
-    &db_client().alerters,
-    doc! { "config.enabled": true },
-    None,
-  )
-  .await
-  .inspect_err(|e| {
-    error!(
+  let span =
+    info_span!("send_alerts", alerts = format!("{alerts:?}"));
+  async {
+    let Ok(alerters) = find_collect(
+      &db_client().alerters,
+      doc! { "config.enabled": true },
+      None,
+    )
+    .await
+    .inspect_err(|e| {
+      error!(
       "ERROR sending alerts | failed to get alerters from db | {e:#}"
     )
-  }) else {
-    return;
-  };
+    }) else {
+      return;
+    };
 
-  let handles = alerts
-    .iter()
-    .map(|alert| send_alert_to_alerters(&alerters, alert));
+    let handles = alerts
+      .iter()
+      .map(|alert| send_alert_to_alerters(&alerters, alert));
 
-  join_all(handles).await;
+    join_all(handles).await;
+  }
+  .instrument(span)
+  .await
 }
 
+#[instrument(level = "debug")]
 async fn send_alert_to_alerters(alerters: &[Alerter], alert: &Alert) {
   if alerters.is_empty() {
     return;
@@ -80,14 +90,14 @@ pub async fn send_alert_to_alerter(
     return Ok(());
   }
 
-  let alert_variant: AlertDataVariant = (&alert.data).into();
+  let alert_type = alert.data.extract_variant();
 
   // In the test case, we don't want the filters inside this
   // block to stop the test from being sent to the alerting endpoint.
-  if alert_variant != AlertDataVariant::Test {
+  if alert_type != AlertDataVariant::Test {
     // Don't send if alert type not configured on the alerter
     if !alerter.config.alert_types.is_empty()
-      && !alerter.config.alert_types.contains(&alert_variant)
+      && !alerter.config.alert_types.contains(&alert_type)
     {
       return Ok(());
     }
@@ -151,6 +161,7 @@ pub async fn send_alert_to_alerter(
   }
 }
 
+#[instrument(level = "debug")]
 async fn send_custom_alert(
   url: &str,
   alert: &Alert,
@@ -251,48 +262,6 @@ fn standard_alert_content(alert: &Alert) -> String {
         "{level} | If you see this message, then Alerter {name} is working\n{link}",
       )
     }
-    AlertData::SwarmUnhealthy { id, name, err } => {
-      let link = resource_link(ResourceTargetVariant::Swarm, id);
-      match alert.level {
-        SeverityLevel::Ok => {
-          format!("{level} | Swarm {name} is now healthy\n{link}")
-        }
-        SeverityLevel::Critical => {
-          let err = err
-            .as_ref()
-            .map(|e| format!("\nerror: {e:#?}"))
-            .unwrap_or_default();
-          format!(
-            "{level} | Swarm {name} is unhealthy ❌\n{link}{err}"
-          )
-        }
-        _ => unreachable!(),
-      }
-    }
-    AlertData::ServerUnreachable {
-      id,
-      name,
-      region,
-      err,
-    } => {
-      let region = fmt_region(region);
-      let link = resource_link(ResourceTargetVariant::Server, id);
-      match alert.level {
-        SeverityLevel::Ok => {
-          format!("{level} | {name}{region} is now connected\n{link}")
-        }
-        SeverityLevel::Critical => {
-          let err = err
-            .as_ref()
-            .map(|e| format!("\nerror: {e:#?}"))
-            .unwrap_or_default();
-          format!(
-            "{level} | {name}{region} is unreachable ❌\n{link}{err}"
-          )
-        }
-        _ => unreachable!(),
-      }
-    }
     AlertData::ServerVersionMismatch {
       id,
       name,
@@ -315,6 +284,30 @@ fn standard_alert_content(alert: &Alert) -> String {
         }
       }
     }
+    AlertData::ServerUnreachable {
+      id,
+      name,
+      region,
+      err,
+    } => {
+      let region = fmt_region(region);
+      let link = resource_link(ResourceTargetVariant::Server, id);
+      match alert.level {
+        SeverityLevel::Ok => {
+          format!("{level} | {name}{region} is now reachable\n{link}")
+        }
+        SeverityLevel::Critical => {
+          let err = err
+            .as_ref()
+            .map(|e| format!("\nerror: {e:#?}"))
+            .unwrap_or_default();
+          format!(
+            "{level} | {name}{region} is unreachable ❌\n{link}{err}"
+          )
+        }
+        _ => unreachable!(),
+      }
+    }
     AlertData::ServerCpu {
       id,
       name,
@@ -359,8 +352,6 @@ fn standard_alert_content(alert: &Alert) -> String {
     AlertData::ContainerStateChange {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
       server_id: _server_id,
       server_name,
       from,
@@ -368,64 +359,37 @@ fn standard_alert_content(alert: &Alert) -> String {
     } => {
       let link = resource_link(ResourceTargetVariant::Deployment, id);
       let to_state = fmt_docker_container_state(to);
-      let target = if let Some(swarm) = swarm_name {
-        format!("\nswarm: {swarm}")
-      } else if let Some(server) = server_name {
-        format!("\nserver: {server}")
-      } else {
-        String::new()
-      };
       format!(
-        "📦Deployment {name} is now {to_state}{target}\nprevious: {from}\n{link}",
+        "📦Deployment {name} is now {to_state}\nserver: {server_name}\nprevious: {from}\n{link}",
       )
     }
     AlertData::DeploymentImageUpdateAvailable {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
       server_id: _server_id,
       server_name,
       image,
     } => {
       let link = resource_link(ResourceTargetVariant::Deployment, id);
-      let target = if let Some(swarm) = swarm_name {
-        format!("\nswarm: {swarm}")
-      } else if let Some(server) = server_name {
-        format!("\nserver: {server}")
-      } else {
-        String::new()
-      };
       format!(
-        "⬆ Deployment {name} has an update available{target}\nimage: {image}\n{link}",
+        "⬆ Deployment {name} has an update available\nserver: {server_name}\nimage: {image}\n{link}",
       )
     }
     AlertData::DeploymentAutoUpdated {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
       server_id: _server_id,
       server_name,
       image,
     } => {
       let link = resource_link(ResourceTargetVariant::Deployment, id);
-      let target = if let Some(swarm) = swarm_name {
-        format!("\nswarm: {swarm}")
-      } else if let Some(server) = server_name {
-        format!("\nserver: {server}")
-      } else {
-        String::new()
-      };
       format!(
-        "⬆ Deployment {name} was updated automatically{target}\nimage: {image}\n{link}",
+        "⬆ Deployment {name} was updated automatically\nserver: {server_name}\nimage: {image}\n{link}",
       )
     }
     AlertData::StackStateChange {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
       server_id: _server_id,
       server_name,
       from,
@@ -433,44 +397,26 @@ fn standard_alert_content(alert: &Alert) -> String {
     } => {
       let link = resource_link(ResourceTargetVariant::Stack, id);
       let to_state = fmt_stack_state(to);
-      let target = if let Some(swarm) = swarm_name {
-        format!("\nswarm: {swarm}")
-      } else if let Some(server) = server_name {
-        format!("\nserver: {server}")
-      } else {
-        String::new()
-      };
       format!(
-        "🥞 Stack {name} is now {to_state}{target}\nprevious: {from}\n{link}",
+        "🥞 Stack {name} is now {to_state}\nserver: {server_name}\nprevious: {from}\n{link}",
       )
     }
     AlertData::StackImageUpdateAvailable {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
       server_id: _server_id,
       server_name,
       service,
       image,
     } => {
       let link = resource_link(ResourceTargetVariant::Stack, id);
-      let target = if let Some(swarm) = swarm_name {
-        format!("\nswarm: {swarm}")
-      } else if let Some(server) = server_name {
-        format!("\nserver: {server}")
-      } else {
-        String::new()
-      };
       format!(
-        "⬆ Stack {name} has an update available{target}\nservice: {service}\nimage: {image}\n{link}",
+        "⬆ Stack {name} has an update available\nserver: {server_name}\nservice: {service}\nimage: {image}\n{link}",
       )
     }
     AlertData::StackAutoUpdated {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
       server_id: _server_id,
       server_name,
       images,
@@ -479,15 +425,8 @@ fn standard_alert_content(alert: &Alert) -> String {
       let images_label =
         if images.len() > 1 { "images" } else { "image" };
       let images_str = images.join(", ");
-      let target = if let Some(swarm) = swarm_name {
-        format!("\nswarm: {swarm}")
-      } else if let Some(server) = server_name {
-        format!("\nserver: {server}")
-      } else {
-        String::new()
-      };
       format!(
-        "⬆ Stack {name} was updated automatically ⏫{target}\n{images_label}: {images_str}\n{link}",
+        "⬆ Stack {name} was updated automatically ⏫\nserver: {server_name}\n{images_label}: {images_str}\n{link}",
       )
     }
     AlertData::AwsBuilderTerminationFailed {
@@ -537,9 +476,9 @@ fn standard_alert_content(alert: &Alert) -> String {
       format!(
         "{level} | {message}{}",
         if details.is_empty() {
-          String::new()
+          format_args!("")
         } else {
-          format!("\n{details}")
+          format_args!("\n{details}")
         }
       )
     }

bin/core/src/alert/ntfy.rs

@@ -2,38 +2,17 @@ use std::sync::OnceLock;
 
 use super::*;
 
+#[instrument(level = "debug")]
 pub async fn send_alert(
   url: &str,
   email: Option<&str>,
   alert: &Alert,
 ) -> anyhow::Result<()> {
   let content = standard_alert_content(alert);
-  if content.is_empty() {
-    return Ok(());
+  if !content.is_empty() {
+    send_message(url, email, content).await?;
   }
-
-  let VariablesAndSecrets { variables, secrets } =
-    get_variables_and_secrets().await?;
-  let mut url_interpolated = url.to_string();
-
-  let mut interpolator =
-    Interpolator::new(Some(&variables), &secrets);
-
-  interpolator.interpolate_string(&mut url_interpolated)?;
-
-  send_message(&url_interpolated, email, content)
-    .await
-    .map_err(|e| {
-      let replacers = interpolator
-        .secret_replacers
-        .into_iter()
-        .collect::<Vec<_>>();
-      let sanitized_error =
-        svi::replace_in_string(&format!("{e:?}"), &replacers);
-      anyhow::Error::msg(format!(
-        "Error with request to Ntfy: {sanitized_error}"
-      ))
-    })
+  Ok(())
 }
 
 async fn send_message(
@@ -43,7 +22,7 @@ async fn send_message(
 ) -> anyhow::Result<()> {
   let mut request = http_client()
     .post(url)
-    .header("Title", "Komodo Alert")
+    .header("Title", "ntfy Alert")
     .body(content);
 
   if let Some(email) = email {
@@ -64,7 +43,9 @@ async fn send_message(
       )
     })?;
     Err(anyhow!(
-      "Failed to send message to ntfy | {status} | {text}",
+      "Failed to send message to ntfy | {} | {}",
+      status,
+      text
     ))
   }
 }

bin/core/src/alert/pushover.rs

@@ -2,35 +2,16 @@ use std::sync::OnceLock;
 
 use super::*;
 
+#[instrument(level = "debug")]
 pub async fn send_alert(
   url: &str,
   alert: &Alert,
 ) -> anyhow::Result<()> {
   let content = standard_alert_content(alert);
-  if content.is_empty() {
-    return Ok(());
+  if !content.is_empty() {
+    send_message(url, content).await?;
   }
-
-  let VariablesAndSecrets { variables, secrets } =
-    get_variables_and_secrets().await?;
-  let mut url_interpolated = url.to_string();
-
-  let mut interpolator =
-    Interpolator::new(Some(&variables), &secrets);
-
-  interpolator.interpolate_string(&mut url_interpolated)?;
-
-  send_message(&url_interpolated, content).await.map_err(|e| {
-    let replacers = interpolator
-      .secret_replacers
-      .into_iter()
-      .collect::<Vec<_>>();
-    let sanitized_error =
-      svi::replace_in_string(&format!("{e:?}"), &replacers);
-    anyhow::Error::msg(format!(
-      "Error with request to Pushover: {sanitized_error}"
-    ))
-  })
+  Ok(())
 }
 
 async fn send_message(

bin/core/src/alert/slack.rs

@@ -2,6 +2,7 @@ use ::slack::types::OwnedBlock as Block;
 
 use super::*;
 
+#[instrument(level = "debug")]
 pub async fn send_alert(
   url: &str,
   alert: &Alert,
@@ -24,82 +25,6 @@ pub async fn send_alert(
       ];
       (text, blocks.into())
     }
-    AlertData::SwarmUnhealthy { id, name, err } => {
-      match alert.level {
-        SeverityLevel::Ok => {
-          let text =
-            format!("{level} | Swarm *{name}* is now *healthy*");
-          let blocks = vec![
-            Block::header(level),
-            Block::section(format!(
-              "Swarm *{name}* is now *healthy*"
-            )),
-          ];
-          (text, blocks.into())
-        }
-        SeverityLevel::Critical => {
-          let text =
-            format!("{level} | Swarm *{name}* is *unhealthy* ❌");
-          let err = err
-            .as_ref()
-            .map(|e| format!("\nerror: {e:#?}"))
-            .unwrap_or_default();
-          let blocks = vec![
-            Block::header(level),
-            Block::section(format!(
-              "Swarm *{name}* is *unhealthy* ❌{err}"
-            )),
-            Block::section(resource_link(
-              ResourceTargetVariant::Server,
-              id,
-            )),
-          ];
-          (text, blocks.into())
-        }
-        _ => unreachable!(),
-      }
-    }
-    AlertData::ServerUnreachable {
-      id,
-      name,
-      region,
-      err,
-    } => {
-      let region = fmt_region(region);
-      match alert.level {
-        SeverityLevel::Ok => {
-          let text =
-            format!("{level} | *{name}*{region} is now *connected*");
-          let blocks = vec![
-            Block::header(level),
-            Block::section(format!(
-              "*{name}*{region} is now *connected*"
-            )),
-          ];
-          (text, blocks.into())
-        }
-        SeverityLevel::Critical => {
-          let text =
-            format!("{level} | *{name}*{region} is *unreachable* ❌");
-          let err = err
-            .as_ref()
-            .map(|e| format!("\nerror: {e:#?}"))
-            .unwrap_or_default();
-          let blocks = vec![
-            Block::header(level),
-            Block::section(format!(
-              "*{name}*{region} is *unreachable* ❌{err}"
-            )),
-            Block::section(resource_link(
-              ResourceTargetVariant::Server,
-              id,
-            )),
-          ];
-          (text, blocks.into())
-        }
-        _ => unreachable!(),
-      }
-    }
     AlertData::ServerVersionMismatch {
       id,
       name,
@@ -129,6 +54,47 @@ pub async fn send_alert(
       ];
       (text, blocks.into())
     }
+    AlertData::ServerUnreachable {
+      id,
+      name,
+      region,
+      err,
+    } => {
+      let region = fmt_region(region);
+      match alert.level {
+        SeverityLevel::Ok => {
+          let text =
+            format!("{level} | *{name}*{region} is now *reachable*");
+          let blocks = vec![
+            Block::header(level),
+            Block::section(format!(
+              "*{name}*{region} is now *reachable*"
+            )),
+          ];
+          (text, blocks.into())
+        }
+        SeverityLevel::Critical => {
+          let text =
+            format!("{level} | *{name}*{region} is *unreachable* ❌");
+          let err = err
+            .as_ref()
+            .map(|e| format!("\nerror: {e:#?}"))
+            .unwrap_or_default();
+          let blocks = vec![
+            Block::header(level),
+            Block::section(format!(
+              "*{name}*{region} is *unreachable* ❌{err}"
+            )),
+            Block::section(resource_link(
+              ResourceTargetVariant::Server,
+              id,
+            )),
+          ];
+          (text, blocks.into())
+        }
+        _ => unreachable!(),
+      }
+    }
     AlertData::ServerCpu {
       id,
       name,
@@ -274,26 +240,19 @@ pub async fn send_alert(
     }
     AlertData::ContainerStateChange {
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
-      server_id: _server_id,
       server_name,
       from,
       to,
       id,
+      ..
     } => {
       let to = fmt_docker_container_state(to);
       let text = format!("📦 Container *{name}* is now *{to}*");
-      let target = if let Some(swarm) = swarm_name {
-        format!("swarm: *{swarm}*\n")
-      } else if let Some(server) = server_name {
-        format!("server: *{server}*\n")
-      } else {
-        String::new()
-      };
       let blocks = vec![
         Block::header(text.clone()),
-        Block::section(format!("{target}previous: {from}",)),
+        Block::section(format!(
+          "server: {server_name}\nprevious: {from}",
+        )),
         Block::section(resource_link(
           ResourceTargetVariant::Deployment,
           id,
@@ -304,24 +263,17 @@ pub async fn send_alert(
     AlertData::DeploymentImageUpdateAvailable {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
-      server_id: _server_id,
       server_name,
+      server_id: _server_id,
       image,
     } => {
       let text =
         format!("⬆ Deployment *{name}* has an update available");
-      let target = if let Some(swarm) = swarm_name {
-        format!("swarm: *{swarm}*\n")
-      } else if let Some(server) = server_name {
-        format!("server: *{server}*\n")
-      } else {
-        String::new()
-      };
       let blocks = vec![
         Block::header(text.clone()),
-        Block::section(format!("{target}image: *{image}*",)),
+        Block::section(format!(
+          "server: *{server_name}*\nimage: *{image}*",
+        )),
         Block::section(resource_link(
           ResourceTargetVariant::Deployment,
           id,
@@ -332,24 +284,17 @@ pub async fn send_alert(
     AlertData::DeploymentAutoUpdated {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
-      server_id: _server_id,
       server_name,
+      server_id: _server_id,
       image,
     } => {
       let text =
         format!("⬆ Deployment *{name}* was updated automatically ⏫");
-      let target = if let Some(swarm) = swarm_name {
-        format!("swarm: *{swarm}*\n")
-      } else if let Some(server) = server_name {
-        format!("server: *{server}*\n")
-      } else {
-        String::new()
-      };
       let blocks = vec![
         Block::header(text.clone()),
-        Block::section(format!("{target}image: *{image}*",)),
+        Block::section(format!(
+          "server: *{server_name}*\nimage: *{image}*",
+        )),
         Block::section(resource_link(
           ResourceTargetVariant::Deployment,
           id,
@@ -359,26 +304,19 @@ pub async fn send_alert(
     }
     AlertData::StackStateChange {
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
-      server_id: _server_id,
       server_name,
       from,
       to,
       id,
+      ..
     } => {
       let to = fmt_stack_state(to);
       let text = format!("🥞 Stack *{name}* is now *{to}*");
-      let target = if let Some(swarm) = swarm_name {
-        format!("swarm: *{swarm}*\n")
-      } else if let Some(server) = server_name {
-        format!("server: *{server}*\n")
-      } else {
-        String::new()
-      };
       let blocks = vec![
         Block::header(text.clone()),
-        Block::section(format!("{target}previous: *{from}*",)),
+        Block::section(format!(
+          "server: *{server_name}*\nprevious: *{from}*",
+        )),
         Block::section(resource_link(
           ResourceTargetVariant::Stack,
           id,
@@ -389,25 +327,16 @@ pub async fn send_alert(
     AlertData::StackImageUpdateAvailable {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
-      server_id: _server_id,
       server_name,
+      server_id: _server_id,
       service,
       image,
     } => {
       let text = format!("⬆ Stack *{name}* has an update available");
-      let target = if let Some(swarm) = swarm_name {
-        format!("swarm: *{swarm}*\n")
-      } else if let Some(server) = server_name {
-        format!("server: *{server}*\n")
-      } else {
-        String::new()
-      };
       let blocks = vec![
         Block::header(text.clone()),
         Block::section(format!(
-          "{target}service: *{service}*\nimage: *{image}*",
+          "server: *{server_name}*\nservice: *{service}*\nimage: *{image}*",
         )),
         Block::section(resource_link(
           ResourceTargetVariant::Stack,
@@ -419,10 +348,8 @@ pub async fn send_alert(
     AlertData::StackAutoUpdated {
       id,
       name,
-      swarm_id: _swarm_id,
-      swarm_name,
-      server_id: _server_id,
       server_name,
+      server_id: _server_id,
       images,
     } => {
       let text =
@@ -430,18 +357,11 @@ pub async fn send_alert(
       let images_label =
         if images.len() > 1 { "images" } else { "image" };
       let images = images.join(", ");
-      let target = if let Some(swarm) = swarm_name {
-        format!("swarm: *{swarm}*\n")
-      } else if let Some(server) = server_name {
-        format!("server: *{server}*\n")
-      } else {
-        String::new()
-      };
       let blocks = vec![
         Block::header(text.clone()),
-        Block::section(
-          format!("{target}{images_label}: *{images}*",),
-        ),
+        Block::section(format!(
+          "server: *{server_name}*\n{images_label}: *{images}*",
+        )),
         Block::section(resource_link(
           ResourceTargetVariant::Stack,
           id,
@@ -548,32 +468,31 @@ pub async fn send_alert(
     }
     AlertData::None {} => Default::default(),
   };
-  if text.is_empty() {
-    return Ok(());
+  if !text.is_empty() {
+    let VariablesAndSecrets { variables, secrets } =
+      get_variables_and_secrets().await?;
+    let mut url_interpolated = url.to_string();
+
+    let mut interpolator =
+      Interpolator::new(Some(&variables), &secrets);
+
+    interpolator.interpolate_string(&mut url_interpolated)?;
+
+    let slack = ::slack::Client::new(url_interpolated);
+    slack
+      .send_owned_message_single(&text, blocks.as_deref())
+      .await
+      .map_err(|e| {
+        let replacers = interpolator
+          .secret_replacers
+          .into_iter()
+          .collect::<Vec<_>>();
+        let sanitized_error =
+          svi::replace_in_string(&format!("{e:?}"), &replacers);
+        anyhow::Error::msg(format!(
+          "Error with slack request: {sanitized_error}"
+        ))
+      })?;
   }
-  let VariablesAndSecrets { variables, secrets } =
-    get_variables_and_secrets().await?;
-  let mut url_interpolated = url.to_string();
-
-  let mut interpolator =
-    Interpolator::new(Some(&variables), &secrets);
-
-  interpolator.interpolate_string(&mut url_interpolated)?;
-
-  let slack = ::slack::Client::new(url_interpolated);
-  slack
-    .send_owned_message_single(&text, None, blocks.as_deref())
-    .await
-    .map_err(|e| {
-      let replacers = interpolator
-        .secret_replacers
-        .into_iter()
-        .collect::<Vec<_>>();
-      let sanitized_error =
-        svi::replace_in_string(&format!("{e:?}"), &replacers);
-      anyhow::Error::msg(format!(
-        "Error with request to Slack: {sanitized_error}"
-      ))
-    })?;
   Ok(())
 }

bin/core/src/api/auth.rs

@@ -0,0 +1,163 @@
+use std::{sync::OnceLock, time::Instant};
+
+use axum::{Router, extract::Path, http::HeaderMap, routing::post};
+use derive_variants::{EnumVariants, ExtractVariant};
+use komodo_client::{api::auth::*, entities::user::User};
+use reqwest::StatusCode;
+use resolver_api::Resolve;
+use response::Response;
+use serde::{Deserialize, Serialize};
+use serde_json::json;
+use serror::{AddStatusCode, Json};
+use typeshare::typeshare;
+use uuid::Uuid;
+
+use crate::{
+  auth::{
+    get_user_id_from_headers,
+    github::{self, client::github_oauth_client},
+    google::{self, client::google_oauth_client},
+    oidc::{self, client::oidc_client},
+  },
+  config::core_config,
+  helpers::query::get_user,
+  state::jwt_client,
+};
+
+use super::Variant;
+
+#[derive(Default)]
+pub struct AuthArgs {
+  pub headers: HeaderMap,
+}
+
+#[typeshare]
+#[derive(
+  Serialize, Deserialize, Debug, Clone, Resolve, EnumVariants,
+)]
+#[args(AuthArgs)]
+#[response(Response)]
+#[error(serror::Error)]
+#[variant_derive(Debug)]
+#[serde(tag = "type", content = "params")]
+#[allow(clippy::enum_variant_names, clippy::large_enum_variant)]
+pub enum AuthRequest {
+  GetLoginOptions(GetLoginOptions),
+  SignUpLocalUser(SignUpLocalUser),
+  LoginLocalUser(LoginLocalUser),
+  ExchangeForJwt(ExchangeForJwt),
+  GetUser(GetUser),
+}
+
+pub fn router() -> Router {
+  let mut router = Router::new()
+    .route("/", post(handler))
+    .route("/{variant}", post(variant_handler));
+
+  if core_config().local_auth {
+    info!("🔑 Local Login Enabled");
+  }
+
+  if github_oauth_client().is_some() {
+    info!("🔑 Github Login Enabled");
+    router = router.nest("/github", github::router())
+  }
+
+  if google_oauth_client().is_some() {
+    info!("🔑 Google Login Enabled");
+    router = router.nest("/google", google::router())
+  }
+
+  if core_config().oidc_enabled {
+    info!("🔑 OIDC Login Enabled");
+    router = router.nest("/oidc", oidc::router())
+  }
+
+  router
+}
+
+async fn variant_handler(
+  headers: HeaderMap,
+  Path(Variant { variant }): Path<Variant>,
+  Json(params): Json<serde_json::Value>,
+) -> serror::Result<axum::response::Response> {
+  let req: AuthRequest = serde_json::from_value(json!({
+    "type": variant,
+    "params": params,
+  }))?;
+  handler(headers, Json(req)).await
+}
+
+#[instrument(name = "AuthHandler", level = "debug", skip(headers))]
+async fn handler(
+  headers: HeaderMap,
+  Json(request): Json<AuthRequest>,
+) -> serror::Result<axum::response::Response> {
+  let timer = Instant::now();
+  let req_id = Uuid::new_v4();
+  debug!(
+    "/auth request {req_id} | METHOD: {:?}",
+    request.extract_variant()
+  );
+  let res = request.resolve(&AuthArgs { headers }).await;
+  if let Err(e) = &res {
+    debug!("/auth request {req_id} | error: {:#}", e.error);
+  }
+  let elapsed = timer.elapsed();
+  debug!("/auth request {req_id} | resolve time: {elapsed:?}");
+  res.map(|res| res.0)
+}
+
+fn login_options_reponse() -> &'static GetLoginOptionsResponse {
+  static GET_LOGIN_OPTIONS_RESPONSE: OnceLock<
+    GetLoginOptionsResponse,
+  > = OnceLock::new();
+  GET_LOGIN_OPTIONS_RESPONSE.get_or_init(|| {
+    let config = core_config();
+    GetLoginOptionsResponse {
+      local: config.local_auth,
+      github: github_oauth_client().is_some(),
+      google: google_oauth_client().is_some(),
+      oidc: oidc_client().load().is_some(),
+      registration_disabled: config.disable_user_registration,
+    }
+  })
+}
+
+impl Resolve<AuthArgs> for GetLoginOptions {
+  #[instrument(name = "GetLoginOptions", level = "debug", skip(self))]
+  async fn resolve(
+    self,
+    _: &AuthArgs,
+  ) -> serror::Result<GetLoginOptionsResponse> {
+    Ok(*login_options_reponse())
+  }
+}
+
+impl Resolve<AuthArgs> for ExchangeForJwt {
+  #[instrument(name = "ExchangeForJwt", level = "debug", skip(self))]
+  async fn resolve(
+    self,
+    _: &AuthArgs,
+  ) -> serror::Result<ExchangeForJwtResponse> {
+    jwt_client()
+      .redeem_exchange_token(&self.token)
+      .await
+      .map_err(Into::into)
+  }
+}
+
+impl Resolve<AuthArgs> for GetUser {
+  #[instrument(name = "GetUser", level = "debug", skip(self))]
+  async fn resolve(
+    self,
+    AuthArgs { headers }: &AuthArgs,
+  ) -> serror::Result<User> {
+    let user_id = get_user_id_from_headers(headers)
+      .await
+      .status_code(StatusCode::UNAUTHORIZED)?;
+    get_user(&user_id)
+      .await
+      .status_code(StatusCode::UNAUTHORIZED)
+  }
+}

bin/core/src/api/execute/action.rs

@@ -1,56 +1,49 @@
 use std::{
   collections::HashSet,
   path::{Path, PathBuf},
+  str::FromStr,
   sync::OnceLock,
 };
 
-use anyhow::Context as _;
-use command::{CommandOptions, run_komodo_standard_command};
-use database::{
-  bson::doc,
-  mungos::{by_id::update_one_by_id, mongodb::bson::to_document},
+use anyhow::Context;
+use command::run_komodo_command;
+use config::merge_objects;
+use database::mungos::{
+  by_id::update_one_by_id, mongodb::bson::to_document,
 };
 use interpolate::Interpolator;
 use komodo_client::{
-  api::execute::{
-    BatchExecutionResponse, BatchRunAction, CancelAction, RunAction,
+  api::{
+    execute::{BatchExecutionResponse, BatchRunAction, RunAction},
+    user::{CreateApiKey, CreateApiKeyResponse, DeleteApiKey},
   },
   entities::{
-    FileFormat, JsonObject, Operation,
+    FileFormat, JsonObject,
     action::Action,
     alert::{Alert, AlertData, SeverityLevel},
     config::core::CoreConfig,
     komodo_timestamp,
     permission::PermissionLevel,
-    random_string,
-    update::{Update, UpdateStatus},
+    update::Update,
     user::action_user,
   },
   parsers::parse_key_value_list,
 };
-use mogh_auth_client::api::manage::{
-  CreateApiKey, CreateApiKeyResponse,
-};
-use mogh_auth_server::api::manage::api_key::{
-  create_api_key, delete_api_key,
-};
-use mogh_config::merge_objects;
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 use tokio::fs;
-use tokio_util::sync::CancellationToken;
 
 use crate::{
   alert::send_alerts,
-  api::execute::ExecuteRequest,
-  auth::KomodoAuthImpl,
+  api::{execute::ExecuteRequest, user::UserArgs},
   config::core_config,
   helpers::{
     query::{VariablesAndSecrets, get_variables_and_secrets},
+    random_string,
     update::update_update,
   },
   permission::get_check_permissions,
   resource::refresh_action_state_cache,
-  state::{action_cancel_cache, action_states, db_client},
+  state::{action_states, db_client},
 };
 
 use super::ExecuteArgs;
@@ -66,50 +59,24 @@ impl super::BatchExecute for BatchRunAction {
 }
 
 impl Resolve<ExecuteArgs> for BatchRunAction {
-  #[instrument(
-    "BatchRunAction",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      pattern = self.pattern,
-      tags = self.tags.join(","),
-    )
-  )]
+  #[instrument(name = "BatchRunAction", skip(self, user), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs { user, task_id, .. }: &ExecuteArgs,
-  ) -> mogh_error::Result<BatchExecutionResponse> {
+    ExecuteArgs { user, .. }: &ExecuteArgs,
+  ) -> serror::Result<BatchExecutionResponse> {
     Ok(
-      super::batch_execute::<BatchRunAction>(
-        &self.pattern,
-        self.tags,
-        user,
-      )
-      .await?,
+      super::batch_execute::<BatchRunAction>(&self.pattern, user)
+        .await?,
     )
   }
 }
 
 impl Resolve<ExecuteArgs> for RunAction {
-  #[instrument(
-    "RunAction",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      action = self.action,
-    )
-  )]
+  #[instrument(name = "RunAction", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     let mut action = get_check_permissions::<Action>(
       &self.action,
       user,
@@ -152,93 +119,76 @@ impl Resolve<ExecuteArgs> for RunAction {
     let args = serde_json::to_string(&args)
       .context("Failed to serialize action run arguments")?;
 
-    let CreateApiKeyResponse { key, secret } = create_api_key(
-      &KomodoAuthImpl,
-      action_user().id.clone(),
-      CreateApiKey {
-        name: update.id.clone(),
-        expires: 0,
-      },
-    )
+    let CreateApiKeyResponse { key, secret } = CreateApiKey {
+      name: update.id.clone(),
+      expires: 0,
+    }
+    .resolve(&UserArgs {
+      user: action_user().to_owned(),
+    })
     .await?;
 
-    // Do next steps in seperate error handling block,
-    // and delete the API key before unwrapping the error.
-    // If Komodo shuts down during these steps, there will
-    // be a dangling api key in the DB with user_id: "000000000000000000000002".
-    // These need to be
-    let res = async {
-      let contents = &mut action.config.file_contents;
+    let contents = &mut action.config.file_contents;
 
-      // Wrap the file contents in the execution context.
-      *contents = full_contents(contents, &args, &key, &secret);
+    // Wrap the file contents in the execution context.
+    *contents = full_contents(contents, &args, &key, &secret);
 
-      let replacers = interpolate(
-        contents,
-        &mut update,
-        key.clone(),
-        secret.clone(),
-      )
-      .await?
-      .into_iter()
-      .collect::<Vec<_>>();
+    let replacers =
+      interpolate(contents, &mut update, key.clone(), secret.clone())
+        .await?
+        .into_iter()
+        .collect::<Vec<_>>();
 
-      let file = format!("{}.ts", random_string(10));
-      let path = core_config().action_directory.join(&file);
+    let file = format!("{}.ts", random_string(10));
+    let path = core_config().action_directory.join(&file);
 
-      mogh_secret_file::write_async(&path, contents)
+    if let Some(parent) = path.parent() {
+      fs::create_dir_all(parent)
         .await
-        .with_context(|| {
-          format!("Failed to write action file to {path:?}")
-        })?;
-
-      let CoreConfig { ssl_enabled, .. } = core_config();
-
-      let https_cert_flag = if *ssl_enabled {
-        " --unsafely-ignore-certificate-errors=localhost"
-      } else {
-        ""
-      };
-
-      let reload = if action.config.reload_deno_deps {
-        " --reload"
-      } else {
-        ""
-      };
-
-      let cancel = CancellationToken::new();
-
-      action_cancel_cache()
-        .insert(update.id.clone(), cancel.clone())
-        .await;
-
-      let mut res = run_komodo_standard_command(
-        // Keep this stage name as is, the UI will find the latest update log by matching the stage name
-        "Execute Action",
-        format!(
-          "deno run --allow-all{https_cert_flag}{reload} {}",
-          path.display()
-        ),
-        CommandOptions::default().cancel(cancel),
-      )
-      .await;
-
-      res.stdout = svi::replace_in_string(&res.stdout, &replacers)
-        .replace(&key, "<ACTION_API_KEY>");
-      res.stderr = svi::replace_in_string(&res.stderr, &replacers)
-        .replace(&secret, "<ACTION_API_SECRET>");
-
-      cleanup_run(file + ".js", &path).await;
-
-      update.logs.push(res);
-      update.finalize();
-
-      mogh_error::Ok(())
+        .with_context(|| format!("Failed to initialize Action file parent directory {parent:?}"))?;
     }
+
+    fs::write(&path, contents).await.with_context(|| {
+      format!("Failed to write action file to {path:?}")
+    })?;
+
+    let CoreConfig { ssl_enabled, .. } = core_config();
+
+    let https_cert_flag = if *ssl_enabled {
+      " --unsafely-ignore-certificate-errors=localhost"
+    } else {
+      ""
+    };
+
+    let reload = if action.config.reload_deno_deps {
+      " --reload"
+    } else {
+      ""
+    };
+
+    let mut res = run_komodo_command(
+      // Keep this stage name as is, the UI will find the latest update log by matching the stage name
+      "Execute Action",
+      None,
+      format!(
+        "deno run --allow-all{https_cert_flag}{reload} {}",
+        path.display()
+      ),
+    )
     .await;
 
-    if let Err(e) =
-      delete_api_key(&KomodoAuthImpl, &action_user().id, key).await
+    res.stdout = svi::replace_in_string(&res.stdout, &replacers)
+      .replace(&key, "<ACTION_API_KEY>");
+    res.stderr = svi::replace_in_string(&res.stderr, &replacers)
+      .replace(&secret, "<ACTION_API_SECRET>");
+
+    cleanup_run(file + ".js", &path).await;
+
+    if let Err(e) = (DeleteApiKey { key })
+      .resolve(&UserArgs {
+        user: action_user().to_owned(),
+      })
+      .await
     {
       warn!(
         "Failed to delete API key after action execution | {:#}",
@@ -246,9 +196,8 @@ impl Resolve<ExecuteArgs> for RunAction {
       );
     };
 
-    action_cancel_cache().remove(&update.id).await;
-
-    res?;
+    update.logs.push(res);
+    update.finalize();
 
     // Need to manually update the update before cache refresh,
     // and before broadcast with update_update.
@@ -268,6 +217,7 @@ impl Resolve<ExecuteArgs> for RunAction {
     update_update(update.clone()).await?;
 
     if !update.success && action.config.failure_alert {
+      warn!("action unsuccessful, alerting...");
       let target = update.target.clone();
       tokio::spawn(async move {
         let alert = Alert {
@@ -290,13 +240,12 @@ impl Resolve<ExecuteArgs> for RunAction {
   }
 }
 
-#[instrument("Interpolate", skip(contents, update, secret))]
 async fn interpolate(
   contents: &mut String,
   update: &mut Update,
   key: String,
   secret: String,
-) -> mogh_error::Result<HashSet<(String, String)>> {
+) -> serror::Result<HashSet<(String, String)>> {
   let VariablesAndSecrets {
     variables,
     mut secrets,
@@ -376,7 +325,6 @@ main()
 /// Cleans up file at given path.
 /// ALSO if $DENO_DIR is set,
 /// will clean up the generated file matching "file"
-#[instrument("CleanupRun")]
 async fn cleanup_run(file: String, path: &Path) {
   if let Err(e) = fs::remove_file(path).await {
     warn!(
@@ -396,7 +344,7 @@ fn deno_dir() -> Option<&'static Path> {
   DENO_DIR
     .get_or_init(|| {
       let deno_dir = std::env::var("DENO_DIR").ok()?;
-      Some(PathBuf::from(&deno_dir))
+      PathBuf::from_str(&deno_dir).ok()
     })
     .as_deref()
 }
@@ -476,65 +424,3 @@ fn parse_action_arguments(
       .context("Failed to parse Json to action args"),
   }
 }
-
-impl Resolve<ExecuteArgs> for CancelAction {
-  #[instrument(
-    "CancelAction",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      action = self.action,
-    )
-  )]
-  async fn resolve(
-    self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    let action = get_check_permissions::<Action>(
-      &self.action,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    let update_id = if let Some(update_id) = self.update_id
-      && !update_id.is_empty()
-    {
-      update_id
-    } else {
-      db_client()
-        .updates
-        .find_one(doc! {
-          "target.type": "Action",
-          "target.id": &action.id,
-          "operation": Operation::RunAction.as_ref(),
-          "status": UpdateStatus::InProgress.as_ref(),
-        })
-        .await?
-        .context("No active run to cancel found")?
-        .id
-    };
-
-    action_cancel_cache()
-      .get(&update_id)
-      .await
-      .context("Action run cancel token not found")?
-      .cancel();
-
-    let mut update = update.clone();
-    update.push_simple_log(
-      "Cancel Triggered",
-      "The action cancel has been triggered.",
-    );
-    update.finalize();
-    update_update(update.clone()).await?;
-
-    Ok(update)
-  }
-}

bin/core/src/api/execute/alerter.rs

@@ -1,8 +1,6 @@
 use anyhow::{Context, anyhow};
 use formatting::format_serror;
-use futures_util::{
-  StreamExt, TryStreamExt, stream::FuturesUnordered,
-};
+use futures::{TryStreamExt, stream::FuturesUnordered};
 use komodo_client::{
   api::execute::{SendAlert, TestAlerter},
   entities::{
@@ -12,9 +10,9 @@ use komodo_client::{
     permission::PermissionLevel,
   },
 };
-use mogh_error::AddStatusCodeError;
-use mogh_resolver::Resolve;
 use reqwest::StatusCode;
+use resolver_api::Resolve;
+use serror::AddStatusCodeError;
 
 use crate::{
   alert::send_alert_to_alerter, helpers::update::update_update,
@@ -24,23 +22,10 @@ use crate::{
 use super::ExecuteArgs;
 
 impl Resolve<ExecuteArgs> for TestAlerter {
-  #[instrument(
-    "TestAlerter",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      alerter = self.alerter,
-    )
-  )]
+  #[instrument(name = "TestAlerter", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
+    ExecuteArgs { user, update }: &ExecuteArgs,
   ) -> Result<Self::Response, Self::Error> {
     let alerter = get_check_permissions::<Alerter>(
       &self.alerter,
@@ -94,30 +79,15 @@ impl Resolve<ExecuteArgs> for TestAlerter {
 //
 
 impl Resolve<ExecuteArgs> for SendAlert {
-  #[instrument(
-    "SendAlert",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      request = format!("{self:?}"),
-    )
-  )]
+  #[instrument(name = "SendAlert", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
+    ExecuteArgs { user, update }: &ExecuteArgs,
   ) -> Result<Self::Response, Self::Error> {
     let alerters = list_full_for_user::<Alerter>(
       Default::default(),
-      None,
-      None,
       user,
-      PermissionLevel::Read.into(),
+      PermissionLevel::Execute.into(),
       &[],
     )
     .await?
@@ -132,28 +102,6 @@ impl Resolve<ExecuteArgs> for SendAlert {
     })
     .collect::<Vec<_>>();
 
-    let alerters = if user.admin {
-      alerters
-    } else {
-      // Only keep alerters with execute permissions
-      alerters
-        .into_iter()
-        .map(|alerter| async move {
-          get_check_permissions::<Alerter>(
-            &alerter.id,
-            user,
-            PermissionLevel::Execute.into(),
-          )
-          .await
-        })
-        .collect::<FuturesUnordered<_>>()
-        .collect::<Vec<_>>()
-        .await
-        .into_iter()
-        .flatten()
-        .collect()
-    };
-
     if alerters.is_empty() {
       return Err(anyhow!(
         "Could not find any valid alerters to send to, this required Execute permissions on the Alerter"

bin/core/src/api/execute/build.rs

@@ -14,21 +14,18 @@ use database::mungos::{
   },
 };
 use formatting::format_serror;
-use futures_util::future::join_all;
+use futures::future::join_all;
 use interpolate::Interpolator;
 use komodo_client::{
-  api::{
-    execute::{
-      BatchExecutionResponse, BatchRunBuild, CancelBuild, Deploy,
-      RunBuild,
-    },
-    write::RefreshBuildCache,
+  api::execute::{
+    BatchExecutionResponse, BatchRunBuild, CancelBuild, Deploy,
+    RunBuild,
   },
   entities::{
     alert::{Alert, AlertData, SeverityLevel},
     all_logs_success,
     build::{Build, BuildConfig},
-    builder::Builder,
+    builder::{Builder, BuilderConfig},
     deployment::DeploymentState,
     komodo_timestamp, optional_string,
     permission::PermissionLevel,
@@ -37,17 +34,15 @@ use komodo_client::{
     user::auto_redeploy_user,
   },
 };
-use mogh_resolver::Resolve;
 use periphery_client::api;
+use resolver_api::Resolve;
 use tokio_util::sync::CancellationToken;
-use uuid::Uuid;
 
 use crate::{
   alert::send_alerts,
-  api::write::WriteArgs,
   helpers::{
     build_git_token,
-    builder::{cleanup_builder_instance, connect_builder_periphery},
+    builder::{cleanup_builder_instance, get_builder_periphery},
     channel::build_cancel_channel,
     query::{
       VariablesAndSecrets, get_deployment_state,
@@ -71,50 +66,24 @@ impl super::BatchExecute for BatchRunBuild {
 }
 
 impl Resolve<ExecuteArgs> for BatchRunBuild {
-  #[instrument(
-    "BatchRunBuild",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      pattern = self.pattern,
-      tags = self.tags.join(","),
-    )
-  )]
+  #[instrument(name = "BatchRunBuild", skip(user), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs { user, task_id, .. }: &ExecuteArgs,
-  ) -> mogh_error::Result<BatchExecutionResponse> {
+    ExecuteArgs { user, .. }: &ExecuteArgs,
+  ) -> serror::Result<BatchExecutionResponse> {
     Ok(
-      super::batch_execute::<BatchRunBuild>(
-        &self.pattern,
-        self.tags,
-        user,
-      )
-      .await?,
+      super::batch_execute::<BatchRunBuild>(&self.pattern, user)
+        .await?,
     )
   }
 }
 
 impl Resolve<ExecuteArgs> for RunBuild {
-  #[instrument(
-    "RunBuild",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      build = self.build,
-    )
-  )]
+  #[instrument(name = "RunBuild", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     let mut build = get_check_permissions::<Build>(
       &self.build,
       user,
@@ -180,6 +149,9 @@ impl Resolve<ExecuteArgs> for RunBuild {
     let builder =
       resource::get::<Builder>(&build.config.builder_id).await?;
 
+    let is_server_builder =
+      matches!(&builder.config, BuilderConfig::Server(_));
+
     tokio::spawn(async move {
       let poll = async {
         loop {
@@ -188,13 +160,19 @@ impl Resolve<ExecuteArgs> for RunBuild {
             id = cancel_recv.recv() => id?
           };
           if incoming_build_id == build_id {
-            update.push_simple_log("Cancel acknowledged", "The build cancellation has been queued, it may still take some time.");
+            if is_server_builder {
+              update.push_error_log("Cancel acknowledged", "Build cancellation is not possible on server builders at this time. Use an AWS builder to enable this feature.");
+            } else {
+              update.push_simple_log("Cancel acknowledged", "The build cancellation has been queued, it may still take some time.");
+            }
             update.finalize();
             let id = update.id.clone();
             if let Err(e) = update_update(update).await {
-              warn!("Failed to modify Update {id} on db | {e:#}");
+              warn!("failed to modify Update {id} on db | {e:#}");
+            }
+            if !is_server_builder {
+              cancel_clone.cancel();
             }
-            cancel_clone.cancel();
             return Ok(());
           }
         }
@@ -208,23 +186,23 @@ impl Resolve<ExecuteArgs> for RunBuild {
     });
 
     // GET BUILDER PERIPHERY
-    let (periphery, cleanup_data) = match connect_builder_periphery(
+    let (periphery, cleanup_data) = match get_builder_periphery(
       build.name.clone(),
       Some(build.config.version),
       builder,
-      Some(&mut update),
+      &mut update,
     )
     .await
     {
       Ok(builder) => builder,
       Err(e) => {
         warn!(
-          "Failed to get Builder for Build {} | {e:#}",
+          "failed to get builder for build {} | {e:#}",
           build.name
         );
         update.logs.push(Log::error(
-          "Get Builder",
-          format_serror(&e.context("Failed to get Builder").into()),
+          "get builder",
+          format_serror(&e.context("failed to get builder").into()),
         ));
         return handle_early_return(
           update, build.id, build.name, false,
@@ -269,18 +247,18 @@ impl Resolve<ExecuteArgs> for RunBuild {
             replacers: Default::default(),
           }) => res,
         _ = cancel.cancelled() => {
-          debug!("Build cancelled during repo clone, cleaning up builder");
-          update.push_error_log("Build cancelled", String::from("Build cancelled during repo clone"));
+          debug!("build cancelled during clone, cleaning up builder");
+          update.push_error_log("build cancelled", String::from("user cancelled build during repo clone"));
           cleanup_builder_instance(periphery, cleanup_data, &mut update)
             .await;
-          debug!("Builder cleaned up");
+          info!("builder cleaned up");
           return handle_early_return(update, build.id, build.name, true).await
         },
       };
 
       let commit_message = match res {
         Ok(res) => {
-          debug!("Finished repo clone");
+          debug!("finished repo clone");
           update.logs.extend(res.res.logs);
           update.commit_hash =
             res.res.commit_hash.unwrap_or_default().to_string();
@@ -316,17 +294,10 @@ impl Resolve<ExecuteArgs> for RunBuild {
             commit_hash: optional_string(&update.commit_hash),
             // Unused for now
             additional_tags: Default::default(),
-          }) => res.context("Failed at call to Periphery to build"),
+          }) => res.context("failed at call to periphery to build"),
         _ = cancel.cancelled() => {
-          info!("Build cancelled during build, cleaning up builder");
-          if let Err(e) = periphery.request(api::build::CancelBuild {
-            id: build.id.clone()
-          })
-          .await
-          .context("Failed to cancel build execution on Server") {
-            update.push_error_log("Cancel Build", format_serror(&e.into()));
-          }
-          update.push_error_log("Build Cancelled", String::from("User cancelled build during image build step"));
+          info!("build cancelled during build, cleaning up builder");
+          update.push_error_log("build cancelled", String::from("user cancelled build during docker build"));
           cleanup_builder_instance(periphery, cleanup_data, &mut update)
             .await;
           return handle_early_return(update, build.id, build.name, true).await
@@ -339,10 +310,10 @@ impl Resolve<ExecuteArgs> for RunBuild {
           update.logs.extend(logs);
         }
         Err(e) => {
-          warn!("Error in build | {e:#}");
+          warn!("error in build | {e:#}");
           update.push_error_log(
-            "Build Error",
-            format_serror(&e.context("Failed to build").into()),
+            "build",
+            format_serror(&e.context("failed to build").into()),
           )
         }
       };
@@ -393,15 +364,13 @@ impl Resolve<ExecuteArgs> for RunBuild {
 
     update_update(update.clone()).await?;
 
-    let Build { id, name, .. } = build;
-
     if update.success {
       // don't hold response up for user
       tokio::spawn(async move {
-        handle_post_build_redeploy(&id).await;
+        handle_post_build_redeploy(&build.id).await;
       });
     } else {
-      let name = name.clone();
+      warn!("build unsuccessful, alerting...");
       let target = update.target.clone();
       let version = update.version;
       tokio::spawn(async move {
@@ -412,33 +381,27 @@ impl Resolve<ExecuteArgs> for RunBuild {
           resolved_ts: Some(komodo_timestamp()),
           resolved: true,
           level: SeverityLevel::Warning,
-          data: AlertData::BuildFailed { id, name, version },
+          data: AlertData::BuildFailed {
+            id: build.id,
+            name: build.name,
+            version,
+          },
         };
         send_alerts(&[alert]).await
       });
     }
 
-    if let Err(e) = (RefreshBuildCache { build: name })
-      .resolve(&WriteArgs { user: user.clone() })
-      .await
-    {
-      update.push_error_log(
-        "Refresh build cache",
-        format_serror(&e.error.into()),
-      );
-    }
-
     Ok(update.clone())
   }
 }
 
-#[instrument("HandleEarlyReturn", skip(update))]
+#[instrument(skip(update))]
 async fn handle_early_return(
   mut update: Update,
   build_id: String,
   build_name: String,
   is_cancel: bool,
-) -> mogh_error::Result<Update> {
+) -> serror::Result<Update> {
   update.finalize();
   // Need to manually update the update before cache refresh,
   // and before broadcast with add_update.
@@ -456,6 +419,7 @@ async fn handle_early_return(
   }
   update_update(update.clone()).await?;
   if !update.success && !is_cancel {
+    warn!("build unsuccessful, alerting...");
     let target = update.target.clone();
     let version = update.version;
     tokio::spawn(async move {
@@ -512,10 +476,10 @@ pub async fn validate_cancel_build(
     )?;
 
     match (latest_build, latest_cancel) {
-      (Some(build), Some(cancel))
-        if cancel.start_ts > build.start_ts =>
-      {
-        return Err(anyhow!("Build has already been cancelled"));
+      (Some(build), Some(cancel)) => {
+        if cancel.start_ts > build.start_ts {
+          return Err(anyhow!("Build has already been cancelled"));
+        }
       }
       (None, _) => return Err(anyhow!("No build in progress")),
       _ => {}
@@ -525,24 +489,11 @@ pub async fn validate_cancel_build(
 }
 
 impl Resolve<ExecuteArgs> for CancelBuild {
-  #[instrument(
-    "CancelBuild",
-    skip(user, update),
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      build = self.build,
-    )
-  )]
+  #[instrument(name = "CancelBuild", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     let build = get_check_permissions::<Build>(
       &self.build,
       user,
@@ -564,8 +515,8 @@ impl Resolve<ExecuteArgs> for CancelBuild {
     let mut update = update.clone();
 
     update.push_simple_log(
-      "Cancel Triggered",
-      "The build cancel has been triggered",
+      "cancel triggered",
+      "the build cancel has been triggered",
     );
     update_update(update.clone()).await?;
 
@@ -589,7 +540,7 @@ impl Resolve<ExecuteArgs> for CancelBuild {
       .await
       {
         warn!(
-          "Failed to set CancelBuild Update status Complete after timeout | {e:#}"
+          "failed to set CancelBuild Update status Complete after timeout | {e:#}"
         )
       }
     });
@@ -598,7 +549,7 @@ impl Resolve<ExecuteArgs> for CancelBuild {
   }
 }
 
-#[instrument("PostBuildRedeploy")]
+#[instrument]
 async fn handle_post_build_redeploy(build_id: &str) {
   let Ok(redeploy_deployments) = find_collect(
     &db_client().deployments,
@@ -634,11 +585,7 @@ async fn handle_post_build_redeploy(build_id: &str) {
               stop_signal: None,
               stop_time: None,
             }
-            .resolve(&ExecuteArgs {
-              user,
-              update,
-              task_id: Uuid::new_v4(),
-            })
+            .resolve(&ExecuteArgs { user, update })
             .await
           }
           .await;
@@ -664,14 +611,13 @@ async fn handle_post_build_redeploy(build_id: &str) {
 /// This will make sure that a build with non-none image registry has an account attached,
 /// and will check the core config for a token matching requirements.
 /// Otherwise it is left to periphery.
-#[instrument("ValidateRegistryTokens")]
 async fn validate_account_extract_registry_tokens(
   Build {
     config: BuildConfig { image_registry, .. },
     ..
   }: &Build,
   // Maps (domain, account) -> token
-) -> mogh_error::Result<Vec<(String, String, String)>> {
+) -> serror::Result<Vec<(String, String, String)>> {
   let mut res = HashMap::with_capacity(image_registry.capacity());
 
   for (domain, account) in image_registry

bin/core/src/api/execute/deployment.rs

@@ -1,39 +1,37 @@
 use std::sync::OnceLock;
 
 use anyhow::{Context, anyhow};
+use cache::TimeoutCache;
 use formatting::format_serror;
 use interpolate::Interpolator;
 use komodo_client::{
   api::execute::*,
   entities::{
-    SwarmOrServer, Version,
+    Version,
     build::{Build, ImageRegistryConfig},
     deployment::{
-      Deployment, DeploymentImage, DeploymentInfo,
-      extract_registry_domain,
+      Deployment, DeploymentImage, extract_registry_domain,
     },
     komodo_timestamp, optional_string,
     permission::PermissionLevel,
     server::Server,
     update::{Log, Update},
+    user::User,
   },
 };
-use mogh_cache::TimeoutCache;
-use mogh_error::AddStatusCodeError;
-use mogh_resolver::Resolve;
 use periphery_client::api;
-use reqwest::StatusCode;
+use resolver_api::Resolve;
 
 use crate::{
   helpers::{
     periphery_client,
     query::{VariablesAndSecrets, get_variables_and_secrets},
     registry_token,
-    swarm::swarm_request,
     update::update_update,
   },
-  monitor::{refresh_server_cache, refresh_swarm_cache},
-  resource::{self, setup_deployment_execution},
+  monitor::update_cache_for_server,
+  permission::get_check_permissions,
+  resource,
   state::action_states,
 };
 
@@ -51,61 +49,51 @@ impl super::BatchExecute for BatchDeploy {
 }
 
 impl Resolve<ExecuteArgs> for BatchDeploy {
-  #[instrument(
-    "BatchDeploy",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      pattern = self.pattern,
-      tags = self.tags.join(","),
-    )
-  )]
+  #[instrument(name = "BatchDeploy", skip(user), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs { user, task_id, .. }: &ExecuteArgs,
-  ) -> mogh_error::Result<BatchExecutionResponse> {
+    ExecuteArgs { user, .. }: &ExecuteArgs,
+  ) -> serror::Result<BatchExecutionResponse> {
     Ok(
-      super::batch_execute::<BatchDeploy>(
-        &self.pattern,
-        self.tags,
-        user,
-      )
-      .await?,
+      super::batch_execute::<BatchDeploy>(&self.pattern, user)
+        .await?,
     )
   }
 }
 
+async fn setup_deployment_execution(
+  deployment: &str,
+  user: &User,
+) -> anyhow::Result<(Deployment, Server)> {
+  let deployment = get_check_permissions::<Deployment>(
+    deployment,
+    user,
+    PermissionLevel::Execute.into(),
+  )
+  .await?;
+
+  if deployment.config.server_id.is_empty() {
+    return Err(anyhow!("Deployment has no Server configured"));
+  }
+
+  let server =
+    resource::get::<Server>(&deployment.config.server_id).await?;
+
+  if !server.config.enabled {
+    return Err(anyhow!("Attached Server is not enabled"));
+  }
+
+  Ok((deployment, server))
+}
+
 impl Resolve<ExecuteArgs> for Deploy {
-  #[instrument(
-    "Deploy",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      deployment = self.deployment,
-      stop_signal = format!("{:?}", self.stop_signal),
-      stop_time = self.stop_time,
-    )
-  )]
+  #[instrument(name = "Deploy", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
-    let (mut deployment, swarm_or_server) =
-      setup_deployment_execution(
-        &self.deployment,
-        user,
-        PermissionLevel::Execute.into(),
-      )
-      .await?;
-
-    swarm_or_server.verify_has_target()?;
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
+    let (mut deployment, server) =
+      setup_deployment_execution(&self.deployment, user).await?;
 
     // get the action state for the deployment (or insert default).
     let action_state = action_states()
@@ -120,23 +108,33 @@ impl Resolve<ExecuteArgs> for Deploy {
 
     let mut update = update.clone();
 
-    // Send update after setting action state, this way UI gets correct state.
+    // Send update after setting action state, this way frontend gets correct state.
     update_update(update.clone()).await?;
 
     // This block resolves the attached Build to an actual versioned image
     let (version, registry_token) = match &deployment.config.image {
       DeploymentImage::Build { build_id, version } => {
         let build = resource::get::<Build>(build_id).await?;
+        let image_names = build.get_image_names();
+        let image_name = image_names
+          .first()
+          .context("No image name could be created")
+          .context("Failed to create image name")?;
         let version = if version.is_none() {
           build.config.version
         } else {
           *version
         };
-        let image_name = build.get_deployment_image_name();
-        let image_tag = build.get_deployment_image_tag(version);
+        let version_str = version.to_string();
+        // Potentially add the build image_tag postfix
+        let version_str = if build.config.image_tag.is_empty() {
+          version_str
+        } else {
+          format!("{version_str}-{}", build.config.image_tag)
+        };
         // replace image with corresponding build image.
         deployment.config.image = DeploymentImage::Image {
-          image: format!("{image_name}:{image_tag}"),
+          image: format!("{image_name}:{version_str}"),
         };
         let first_registry = build
           .config
@@ -205,85 +203,27 @@ impl Resolve<ExecuteArgs> for Deploy {
     update.version = version;
     update_update(update.clone()).await?;
 
-    let deployment_id = deployment.id.clone();
-    // Track the name the container / service is deployed under,
-    // so the Deployment stays matched to it even if the
-    // name configuration changes before the next deploy.
-    let fresh_name = deployment.custom_name().to_string();
-    let prev_deployed_name = deployment.info.deployed_name.clone();
-    let mut deployed = false;
-
-    match swarm_or_server {
-      SwarmOrServer::None => unreachable!(),
-      SwarmOrServer::Swarm(swarm) => {
-        match swarm_request(
-          &swarm.config.server_ids,
-          api::swarm::CreateSwarmService {
-            deployment,
-            registry_token,
-            replacers: secret_replacers.into_iter().collect(),
-          },
-        )
-        .await
-        {
-          Ok(logs) => {
-            refresh_swarm_cache(&swarm, true).await;
-            deployed = logs.iter().all(|log| log.success);
-            update.logs.extend(logs)
-          }
-          Err(e) => {
-            update.push_error_log(
-              "Create Swarm Service",
-              format_serror(&e.into()),
-            );
-          }
-        };
-      }
-      SwarmOrServer::Server(server) => {
-        match periphery_client(&server)
-          .await?
-          .request(api::container::RunContainer {
-            deployment,
-            stop_signal: self.stop_signal,
-            stop_time: self.stop_time,
-            registry_token,
-            replacers: secret_replacers.into_iter().collect(),
-          })
-          .await
-        {
-          Ok(log) => {
-            refresh_server_cache(&server, true).await;
-            deployed = log.success;
-            update.logs.push(log)
-          }
-          Err(e) => {
-            update.push_error_log(
-              "Deploy Container",
-              format_serror(&e.into()),
-            );
-          }
-        };
-      }
-    }
-
-    if let Err(e) = resource::update_info::<Deployment>(
-      &deployment_id,
-      &DeploymentInfo {
-        latest_image_digest: Default::default(),
-        deployed_name: if deployed {
-          fresh_name
-        } else {
-          prev_deployed_name
-        },
-      },
-    )
-    .await
+    match periphery_client(&server)
+      .await?
+      .request(api::container::Deploy {
+        deployment,
+        stop_signal: self.stop_signal,
+        stop_time: self.stop_time,
+        registry_token,
+        replacers: secret_replacers.into_iter().collect(),
+      })
+      .await
     {
-      warn!(
-        "Failed to update deployment {} info after deploy | {e:#}",
-        deployment_id
-      );
-    }
+      Ok(log) => update.logs.push(log),
+      Err(e) => {
+        update.push_error_log(
+          "Deploy Container",
+          format_serror(&e.into()),
+        );
+      }
+    };
+
+    update_cache_for_server(&server, true).await;
 
     update.finalize();
     update_update(update.clone()).await?;
@@ -303,14 +243,6 @@ fn pull_cache() -> &'static PullCache {
   PULL_CACHE.get_or_init(Default::default)
 }
 
-#[instrument(
-  "PullDeploymentInner",
-  skip_all,
-  fields(
-    deployment = deployment.id,
-    server = server.id
-  )
-)]
 pub async fn pull_deployment_inner(
   deployment: Deployment,
   server: &Server,
@@ -413,7 +345,7 @@ pub async fn pull_deployment_inner(
       Err(e) => Log::error("Pull image", format_serror(&e.into())),
     };
 
-    refresh_server_cache(server, true).await;
+    update_cache_for_server(server, true).await;
     anyhow::Ok(log)
   }
   .await;
@@ -426,37 +358,13 @@ pub async fn pull_deployment_inner(
 }
 
 impl Resolve<ExecuteArgs> for PullDeployment {
-  #[instrument(
-    "PullDeployment",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      deployment = self.deployment,
-    )
-  )]
+  #[instrument(name = "PullDeployment", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
-    let (deployment, swarm_or_server) = setup_deployment_execution(
-      &self.deployment,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    let SwarmOrServer::Server(server) = swarm_or_server else {
-      return Err(
-        anyhow!("PullDeployment should not be called for Deployment in Swarm Mode")
-          .status_code(StatusCode::BAD_REQUEST),
-      );
-    };
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
+    let (deployment, server) =
+      setup_deployment_execution(&self.deployment, user).await?;
 
     // get the action state for the deployment (or insert default).
     let action_state = action_states()
@@ -470,7 +378,7 @@ impl Resolve<ExecuteArgs> for PullDeployment {
       action_state.update(|state| state.pulling = true)?;
 
     let mut update = update.clone();
-    // Send update after setting action state, this way UI gets correct state.
+    // Send update after setting action state, this way frontend gets correct state.
     update_update(update.clone()).await?;
 
     let log = pull_deployment_inner(deployment, &server).await?;
@@ -484,37 +392,13 @@ impl Resolve<ExecuteArgs> for PullDeployment {
 }
 
 impl Resolve<ExecuteArgs> for StartDeployment {
-  #[instrument(
-    "StartDeployment",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      deployment = self.deployment,
-    )
-  )]
+  #[instrument(name = "StartDeployment", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
-    let (deployment, swarm_or_server) = setup_deployment_execution(
-      &self.deployment,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    let SwarmOrServer::Server(server) = swarm_or_server else {
-      return Err(
-        anyhow!("StartDeployment should not be called for Deployment in Swarm Mode")
-          .status_code(StatusCode::BAD_REQUEST),
-      );
-    };
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
+    let (deployment, server) =
+      setup_deployment_execution(&self.deployment, user).await?;
 
     // get the action state for the deployment (or insert default).
     let action_state = action_states()
@@ -529,13 +413,13 @@ impl Resolve<ExecuteArgs> for StartDeployment {
 
     let mut update = update.clone();
 
-    // Send update after setting action state, this way UI gets correct state.
+    // Send update after setting action state, this way frontend gets correct state.
     update_update(update.clone()).await?;
 
     let log = match periphery_client(&server)
       .await?
       .request(api::container::StartContainer {
-        name: deployment.deployed_name().to_string(),
+        name: deployment.name,
       })
       .await
     {
@@ -547,7 +431,7 @@ impl Resolve<ExecuteArgs> for StartDeployment {
     };
 
     update.logs.push(log);
-    refresh_server_cache(&server, true).await;
+    update_cache_for_server(&server, true).await;
     update.finalize();
     update_update(update.clone()).await?;
 
@@ -556,37 +440,13 @@ impl Resolve<ExecuteArgs> for StartDeployment {
 }
 
 impl Resolve<ExecuteArgs> for RestartDeployment {
-  #[instrument(
-    "RestartDeployment",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      deployment = self.deployment,
-    )
-  )]
+  #[instrument(name = "RestartDeployment", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
-    let (deployment, swarm_or_server) = setup_deployment_execution(
-      &self.deployment,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    let SwarmOrServer::Server(server) = swarm_or_server else {
-      return Err(
-        anyhow!("RestartDeployment should not be called for Deployment in Swarm Mode")
-          .status_code(StatusCode::BAD_REQUEST),
-      );
-    };
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
+    let (deployment, server) =
+      setup_deployment_execution(&self.deployment, user).await?;
 
     // get the action state for the deployment (or insert default).
     let action_state = action_states()
@@ -601,13 +461,13 @@ impl Resolve<ExecuteArgs> for RestartDeployment {
 
     let mut update = update.clone();
 
-    // Send update after setting action state, this way UI gets correct state.
+    // Send update after setting action state, this way frontend gets correct state.
     update_update(update.clone()).await?;
 
     let log = match periphery_client(&server)
       .await?
       .request(api::container::RestartContainer {
-        name: deployment.deployed_name().to_string(),
+        name: deployment.name,
       })
       .await
     {
@@ -621,7 +481,7 @@ impl Resolve<ExecuteArgs> for RestartDeployment {
     };
 
     update.logs.push(log);
-    refresh_server_cache(&server, true).await;
+    update_cache_for_server(&server, true).await;
     update.finalize();
     update_update(update.clone()).await?;
 
@@ -630,37 +490,13 @@ impl Resolve<ExecuteArgs> for RestartDeployment {
 }
 
 impl Resolve<ExecuteArgs> for PauseDeployment {
-  #[instrument(
-    "PauseDeployment",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      deployment = self.deployment,
-    )
-  )]
+  #[instrument(name = "PauseDeployment", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
-    let (deployment, swarm_or_server) = setup_deployment_execution(
-      &self.deployment,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    let SwarmOrServer::Server(server) = swarm_or_server else {
-      return Err(
-        anyhow!("PauseDeployment should not be called for Deployment in Swarm Mode")
-          .status_code(StatusCode::BAD_REQUEST),
-      );
-    };
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
+    let (deployment, server) =
+      setup_deployment_execution(&self.deployment, user).await?;
 
     // get the action state for the deployment (or insert default).
     let action_state = action_states()
@@ -675,13 +511,13 @@ impl Resolve<ExecuteArgs> for PauseDeployment {
 
     let mut update = update.clone();
 
-    // Send update after setting action state, this way UI gets correct state.
+    // Send update after setting action state, this way frontend gets correct state.
     update_update(update.clone()).await?;
 
     let log = match periphery_client(&server)
       .await?
       .request(api::container::PauseContainer {
-        name: deployment.deployed_name().to_string(),
+        name: deployment.name,
       })
       .await
     {
@@ -693,7 +529,7 @@ impl Resolve<ExecuteArgs> for PauseDeployment {
     };
 
     update.logs.push(log);
-    refresh_server_cache(&server, true).await;
+    update_cache_for_server(&server, true).await;
     update.finalize();
     update_update(update.clone()).await?;
 
@@ -702,37 +538,13 @@ impl Resolve<ExecuteArgs> for PauseDeployment {
 }
 
 impl Resolve<ExecuteArgs> for UnpauseDeployment {
-  #[instrument(
-    "UnpauseDeployment",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      deployment = self.deployment,
-    )
-  )]
+  #[instrument(name = "UnpauseDeployment", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
-    let (deployment, swarm_or_server) = setup_deployment_execution(
-      &self.deployment,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    let SwarmOrServer::Server(server) = swarm_or_server else {
-      return Err(
-        anyhow!("UnpauseDeployment should not be called for Deployment in Swarm Mode")
-          .status_code(StatusCode::BAD_REQUEST),
-      );
-    };
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
+    let (deployment, server) =
+      setup_deployment_execution(&self.deployment, user).await?;
 
     // get the action state for the deployment (or insert default).
     let action_state = action_states()
@@ -747,13 +559,13 @@ impl Resolve<ExecuteArgs> for UnpauseDeployment {
 
     let mut update = update.clone();
 
-    // Send update after setting action state, this way UI gets correct state.
+    // Send update after setting action state, this way frontend gets correct state.
     update_update(update.clone()).await?;
 
     let log = match periphery_client(&server)
       .await?
       .request(api::container::UnpauseContainer {
-        name: deployment.deployed_name().to_string(),
+        name: deployment.name,
       })
       .await
     {
@@ -767,7 +579,7 @@ impl Resolve<ExecuteArgs> for UnpauseDeployment {
     };
 
     update.logs.push(log);
-    refresh_server_cache(&server, true).await;
+    update_cache_for_server(&server, true).await;
     update.finalize();
     update_update(update.clone()).await?;
 
@@ -776,39 +588,13 @@ impl Resolve<ExecuteArgs> for UnpauseDeployment {
 }
 
 impl Resolve<ExecuteArgs> for StopDeployment {
-  #[instrument(
-    "StopDeployment",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      deployment = self.deployment,
-      signal = format!("{:?}", self.signal),
-      time = self.time,
-    )
-  )]
+  #[instrument(name = "StopDeployment", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
-    let (deployment, swarm_or_server) = setup_deployment_execution(
-      &self.deployment,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    let SwarmOrServer::Server(server) = swarm_or_server else {
-      return Err(
-        anyhow!("StopDeployment should not be called for Deployment in Swarm Mode")
-          .status_code(StatusCode::BAD_REQUEST),
-      );
-    };
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
+    let (deployment, server) =
+      setup_deployment_execution(&self.deployment, user).await?;
 
     // get the action state for the deployment (or insert default).
     let action_state = action_states()
@@ -823,13 +609,13 @@ impl Resolve<ExecuteArgs> for StopDeployment {
 
     let mut update = update.clone();
 
-    // Send update after setting action state, this way UI gets correct state.
+    // Send update after setting action state, this way frontend gets correct state.
     update_update(update.clone()).await?;
 
     let log = match periphery_client(&server)
       .await?
       .request(api::container::StopContainer {
-        name: deployment.deployed_name().to_string(),
+        name: deployment.name,
         signal: self
           .signal
           .unwrap_or(deployment.config.termination_signal)
@@ -849,7 +635,7 @@ impl Resolve<ExecuteArgs> for StopDeployment {
     };
 
     update.logs.push(log);
-    refresh_server_cache(&server, true).await;
+    update_cache_for_server(&server, true).await;
     update.finalize();
     update_update(update.clone()).await?;
 
@@ -869,24 +655,14 @@ impl super::BatchExecute for BatchDestroyDeployment {
 }
 
 impl Resolve<ExecuteArgs> for BatchDestroyDeployment {
-  #[instrument(
-    "BatchDestroyDeployment",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      pattern = self.pattern,
-      tags = self.tags.join(","),
-    )
-  )]
+  #[instrument(name = "BatchDestroyDeployment", skip(user), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs { user, task_id, .. }: &ExecuteArgs,
-  ) -> mogh_error::Result<BatchExecutionResponse> {
+    ExecuteArgs { user, .. }: &ExecuteArgs,
+  ) -> serror::Result<BatchExecutionResponse> {
     Ok(
       super::batch_execute::<BatchDestroyDeployment>(
         &self.pattern,
-        self.tags,
         user,
       )
       .await?,
@@ -895,34 +671,13 @@ impl Resolve<ExecuteArgs> for BatchDestroyDeployment {
 }
 
 impl Resolve<ExecuteArgs> for DestroyDeployment {
-  #[instrument(
-    "DestroyDeployment",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      deployment = self.deployment,
-      signal = format!("{:?}", self.signal),
-      time = self.time,
-    )
-  )]
+  #[instrument(name = "DestroyDeployment", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
-    let (deployment, swarm_or_server) = setup_deployment_execution(
-      &self.deployment,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    swarm_or_server.verify_has_target()?;
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
+    let (deployment, server) =
+      setup_deployment_execution(&self.deployment, user).await?;
 
     // get the action state for the deployment (or insert default).
     let action_state = action_states()
@@ -937,86 +692,34 @@ impl Resolve<ExecuteArgs> for DestroyDeployment {
 
     let mut update = update.clone();
 
-    // Send update after setting action state, this way UI gets correct state.
+    // Send update after setting action state, this way frontend gets correct state.
     update_update(update.clone()).await?;
 
-    let log = match swarm_or_server {
-      SwarmOrServer::None => unreachable!(),
-      SwarmOrServer::Swarm(swarm) => {
-        match swarm_request(
-          &swarm.config.server_ids,
-          api::swarm::RemoveSwarmServices {
-            services: vec![deployment.deployed_name().to_string()],
-          },
-        )
-        .await
-        {
-          Ok(log) => {
-            refresh_swarm_cache(&swarm, true).await;
-            log
-          }
-          Err(e) => Log::error(
-            "Remove Swarm Service",
-            format_serror(
-              &e.context("Failed to remove swarm service").into(),
-            ),
-          ),
-        }
-      }
-      SwarmOrServer::Server(server) => {
-        match periphery_client(&server)
-          .await?
-          .request(api::container::RemoveContainer {
-            name: deployment.deployed_name().to_string(),
-            signal: self
-              .signal
-              .unwrap_or(deployment.config.termination_signal)
-              .into(),
-            time: self
-              .time
-              .unwrap_or(deployment.config.termination_timeout)
-              .into(),
-          })
-          .await
-        {
-          Ok(log) => {
-            refresh_server_cache(&server, true).await;
-            log
-          }
-          Err(e) => Log::error(
-            "Destroy Container",
-            format_serror(
-              &e.context("Failed to destroy container").into(),
-            ),
-          ),
-        }
-      }
-    };
-
-    // Clear the tracked deployed name once the container / service
-    // is confirmed removed, so the next deploy uses the fresh name.
-    if log.success
-      && let Err(e) = resource::update_info::<Deployment>(
-        &deployment.id,
-        &DeploymentInfo {
-          latest_image_digest: deployment
-            .info
-            .latest_image_digest
-            .clone(),
-          deployed_name: Default::default(),
-        },
-      )
+    let log = match periphery_client(&server)
+      .await?
+      .request(api::container::RemoveContainer {
+        name: deployment.name,
+        signal: self
+          .signal
+          .unwrap_or(deployment.config.termination_signal)
+          .into(),
+        time: self
+          .time
+          .unwrap_or(deployment.config.termination_timeout)
+          .into(),
+      })
       .await
     {
-      warn!(
-        "Failed to clear deployment {} ({}) deployed name after destroy | {e:#}",
-        deployment.name, deployment.id,
-      );
-    }
+      Ok(log) => log,
+      Err(e) => Log::error(
+        "stop container",
+        format_serror(&e.context("failed to stop container").into()),
+      ),
+    };
 
     update.logs.push(log);
     update.finalize();
-
+    update_cache_for_server(&server, true).await;
     update_update(update.clone()).await?;
 
     Ok(update)

bin/core/src/api/execute/maintenance.rs

@@ -1,45 +1,35 @@
 use std::{fmt::Write as _, sync::OnceLock};
 
 use anyhow::{Context, anyhow};
-use command::{CommandOptions, run_komodo_standard_command};
-use database::{
-  bson::{Document, doc},
-  mungos::find::find_collect,
-};
+use command::run_komodo_command;
+use database::mungos::{find::find_collect, mongodb::bson::doc};
 use formatting::{bold, format_serror};
-use futures_util::{StreamExt, stream::FuturesOrdered};
+use futures::StreamExt;
 use komodo_client::{
   api::execute::{
     BackupCoreDatabase, ClearRepoCache, GlobalAutoUpdate,
-    RotateAllServerKeys, RotateCoreKeys,
+    RotateAllServerKeys,
   },
   entities::{
-    SwarmOrServer, deployment::DeploymentState, server::ServerState,
-    stack::StackState, swarm::SwarmState,
+    deployment::DeploymentState, server::ServerState,
+    stack::StackState,
   },
 };
-use mogh_error::AddStatusCodeError;
-use mogh_resolver::Resolve;
-use periphery_client::api;
 use reqwest::StatusCode;
+use resolver_api::Resolve;
+use serror::AddStatusCodeError;
 use tokio::sync::Mutex;
 
 use crate::{
-  api::{
-    execute::ExecuteArgs,
-    write::{
-      check_deployment_for_update_inner, check_stack_for_update_inner,
-    },
-  },
-  config::{core_config, core_keys},
-  helpers::{
-    periphery_client, query::find_swarm_or_server,
-    update::update_update,
+  api::execute::{
+    ExecuteArgs, pull_deployment_inner, pull_stack_inner,
   },
+  config::core_config,
+  helpers::update::update_update,
   resource::rotate_server_keys,
   state::{
     db_client, deployment_status_cache, server_status_cache,
-    stack_status_cache, swarm_status_cache,
+    stack_status_cache,
   },
 };
 
@@ -51,21 +41,13 @@ fn clear_repo_cache_lock() -> &'static Mutex<()> {
 
 impl Resolve<ExecuteArgs> for ClearRepoCache {
   #[instrument(
-    "ClearRepoCache",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id
-    )
+    name = "ClearRepoCache",
+    skip(user, update),
+    fields(user_id = user.id, update_id = update.id)
   )]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
+    ExecuteArgs { user, update }: &ExecuteArgs,
   ) -> Result<Self::Response, Self::Error> {
     if !user.admin {
       return Err(
@@ -134,21 +116,13 @@ fn backup_database_lock() -> &'static Mutex<()> {
 
 impl Resolve<ExecuteArgs> for BackupCoreDatabase {
   #[instrument(
-    "BackupCoreDatabase",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-    )
+    name = "BackupCoreDatabase",
+    skip(user, update),
+    fields(user_id = user.id, update_id = update.id)
   )]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
+    ExecuteArgs { user, update }: &ExecuteArgs,
   ) -> Result<Self::Response, Self::Error> {
     if !user.admin {
       return Err(
@@ -165,10 +139,10 @@ impl Resolve<ExecuteArgs> for BackupCoreDatabase {
 
     update_update(update.clone()).await?;
 
-    let res = run_komodo_standard_command(
+    let res = run_komodo_command(
       "Backup Core Database",
+      None,
       "km database backup --yes",
-      CommandOptions::default(),
     )
     .await;
 
@@ -191,21 +165,13 @@ fn global_update_lock() -> &'static Mutex<()> {
 
 impl Resolve<ExecuteArgs> for GlobalAutoUpdate {
   #[instrument(
-    "GlobalAutoUpdate",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-    )
+    name = "GlobalAutoUpdate",
+    skip(user, update),
+    fields(user_id = user.id, update_id = update.id)
   )]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
+    ExecuteArgs { user, update }: &ExecuteArgs,
   ) -> Result<Self::Response, Self::Error> {
     if !user.admin {
       return Err(
@@ -227,9 +193,6 @@ impl Resolve<ExecuteArgs> for GlobalAutoUpdate {
     let servers = find_collect(&db_client().servers, None, None)
       .await
       .context("Failed to query for servers from database")?;
-    let swarms = find_collect(&db_client().swarms, None, None)
-      .await
-      .context("Failed to query for swarms from database")?;
 
     let query = doc! {
       "$or": [
@@ -238,13 +201,13 @@ impl Resolve<ExecuteArgs> for GlobalAutoUpdate {
       ]
     };
 
-    let stacks =
-      find_collect(&db_client().stacks, query.clone(), None)
-        .await
-        .context("Failed to query for stacks from database")?;
+    let (stacks, repos) = tokio::try_join!(
+      find_collect(&db_client().stacks, query.clone(), None),
+      find_collect(&db_client().repos, None, None)
+    )
+    .context("Failed to query for resources from database")?;
 
     let server_status_cache = server_status_cache();
-    let swarm_status_cache = swarm_status_cache();
     let stack_status_cache = stack_status_cache();
 
     // Will be edited later at update.logs[0]
@@ -255,71 +218,54 @@ impl Resolve<ExecuteArgs> for GlobalAutoUpdate {
       else {
         continue;
       };
-
-      // Only check running stacks.
+      // Only pull running stacks.
       if !matches!(status.curr.state, StackState::Running) {
         continue;
       }
-
-      let swarm_or_server = find_swarm_or_server(
-        &stack.config.swarm_id,
-        &swarms,
-        &stack.config.server_id,
-        &servers,
-      )?;
-
-      // Ensure server / swarm is reachable
-      match &swarm_or_server {
-        SwarmOrServer::None => continue,
-        SwarmOrServer::Server(server) => {
-          if !server_status_cache
-            .get(&server.id)
-            .await
-            .map(|s| matches!(s.state, ServerState::Ok))
-            .unwrap_or_default()
-          {
-            continue;
-          }
-        }
-        SwarmOrServer::Swarm(swarm) => {
-          if !swarm_status_cache
-            .get(&swarm.id)
-            .await
-            .map(|s| {
-              matches!(
-                s.state,
-                SwarmState::Healthy | SwarmState::Unhealthy
-              )
-            })
-            .unwrap_or_default()
-          {
-            continue;
-          }
-        }
-      }
-
-      if let Err(e) = check_stack_for_update_inner(
-        stack.id,
-        &swarm_or_server,
-        self.skip_auto_update,
-        true,
-        false,
-      )
-      .await
+      if let Some(server) =
+        servers.iter().find(|s| s.id == stack.config.server_id)
+        // This check is probably redundant along with running check
+        // but shouldn't hurt
+        && server_status_cache
+          .get(&server.id)
+          .await
+          .map(|s| matches!(s.state, ServerState::Ok))
+          .unwrap_or_default()
       {
-        update.push_error_log(
-          &format!("Check Stack {}", stack.name),
-          format_serror(&e.into()),
-        );
-      } else {
-        if !update.logs[0].stdout.is_empty() {
-          update.logs[0].stdout.push('\n');
+        let name = stack.name.clone();
+        let repo = if stack.config.linked_repo.is_empty() {
+          None
+        } else {
+          let Some(repo) =
+            repos.iter().find(|r| r.id == stack.config.linked_repo)
+          else {
+            update.push_error_log(
+              &format!("Pull Stack {name}"),
+              format!(
+                "Did not find any Repo matching {}",
+                stack.config.linked_repo
+              ),
+            );
+            continue;
+          };
+          Some(repo.clone())
+        };
+        if let Err(e) =
+          pull_stack_inner(stack, Vec::new(), server, repo, None)
+            .await
+        {
+          update.push_error_log(
+            &format!("Pull Stack {name}"),
+            format_serror(&e.into()),
+          );
+        } else {
+          if !update.logs[0].stdout.is_empty() {
+            update.logs[0].stdout.push('\n');
+          }
+          update.logs[0]
+            .stdout
+            .push_str(&format!("Pulled Stack {} ✅", bold(name)));
         }
-
-        update.logs[0].stdout.push_str(&format!(
-          "Checked Stack {} ✅",
-          bold(&stack.name)
-        ));
       }
     }
 
@@ -328,77 +274,43 @@ impl Resolve<ExecuteArgs> for GlobalAutoUpdate {
       find_collect(&db_client().deployments, query, None)
         .await
         .context("Failed to query for deployments from database")?;
-
     for deployment in deployments {
       let Some(status) =
         deployment_status_cache.get(&deployment.id).await
       else {
         continue;
       };
-
-      // Only check running deployments.
+      // Only pull running deployments.
       if !matches!(status.curr.state, DeploymentState::Running) {
         continue;
       }
-
-      let swarm_or_server = find_swarm_or_server(
-        &deployment.config.swarm_id,
-        &swarms,
-        &deployment.config.server_id,
-        &servers,
-      )?;
-
-      // Ensure server / swarm is reachable
-      match &swarm_or_server {
-        SwarmOrServer::None => continue,
-        SwarmOrServer::Server(server) => {
-          if !server_status_cache
-            .get(&server.id)
-            .await
-            .map(|s| matches!(s.state, ServerState::Ok))
-            .unwrap_or_default()
-          {
-            continue;
-          }
-        }
-        SwarmOrServer::Swarm(swarm) => {
-          if !swarm_status_cache
-            .get(&swarm.id)
-            .await
-            .map(|s| {
-              matches!(
-                s.state,
-                SwarmState::Healthy | SwarmState::Unhealthy
-              )
-            })
-            .unwrap_or_default()
-          {
-            continue;
-          }
-        }
-      }
-
-      let name = deployment.name.clone();
-
-      if let Err(e) = check_deployment_for_update_inner(
-        deployment,
-        &swarm_or_server,
-        self.skip_auto_update,
-        true,
-      )
-      .await
+      if let Some(server) =
+        servers.iter().find(|s| s.id == deployment.config.server_id)
+        // This check is probably redundant along with running check
+        // but shouldn't hurt
+        && server_status_cache
+          .get(&server.id)
+          .await
+          .map(|s| matches!(s.state, ServerState::Ok))
+          .unwrap_or_default()
       {
-        update.push_error_log(
-          &format!("Check Deployment {name}"),
-          format_serror(&e.into()),
-        );
-      } else {
-        if !update.logs[0].stdout.is_empty() {
-          update.logs[0].stdout.push('\n');
+        let name = deployment.name.clone();
+        if let Err(e) =
+          pull_deployment_inner(deployment, server).await
+        {
+          update.push_error_log(
+            &format!("Pull Deployment {name}"),
+            format_serror(&e.into()),
+          );
+        } else {
+          if !update.logs[0].stdout.is_empty() {
+            update.logs[0].stdout.push('\n');
+          }
+          update.logs[0].stdout.push_str(&format!(
+            "Pulled Deployment {} ✅",
+            bold(name)
+          ));
         }
-        update.logs[0]
-          .stdout
-          .push_str(&format!("Checked Deployment {} ✅", bold(name)));
       }
     }
 
@@ -418,22 +330,9 @@ fn global_rotate_lock() -> &'static Mutex<()> {
 }
 
 impl Resolve<ExecuteArgs> for RotateAllServerKeys {
-  #[instrument(
-    "RotateAllServerKeys",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-    )
-  )]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
+    ExecuteArgs { user, update }: &ExecuteArgs,
   ) -> Result<Self::Response, Self::Error> {
     if !user.admin {
       return Err(
@@ -444,7 +343,7 @@ impl Resolve<ExecuteArgs> for RotateAllServerKeys {
 
     let _lock = global_rotate_lock()
       .try_lock()
-      .context("Key rotation already in progress...")?;
+      .context("Rotate All Server Keys already in progress...")?;
 
     let mut update = update.clone();
 
@@ -452,7 +351,7 @@ impl Resolve<ExecuteArgs> for RotateAllServerKeys {
 
     let mut servers = db_client()
       .servers
-      .find(Document::new())
+      .find(doc! { "config.enabled": true })
       .await
       .context("Failed to query servers from database")?;
 
@@ -468,14 +367,6 @@ impl Resolve<ExecuteArgs> for RotateAllServerKeys {
           continue;
         }
       };
-      if !server.config.auto_rotate_keys {
-        let _ = write!(
-          &mut log,
-          "\nSkipping {}: Key Rotation Disabled ⚙️",
-          bold(&server.name)
-        );
-        continue;
-      }
       let Some(status) = server_status_cache.get(&server.id).await
       else {
         let _ = write!(
@@ -485,24 +376,14 @@ impl Resolve<ExecuteArgs> for RotateAllServerKeys {
         );
         continue;
       };
-      match status.state {
-        ServerState::Disabled => {
-          let _ = write!(
-            &mut log,
-            "\nSkipping {}: Server Disabled ⚙️",
-            bold(&server.name)
-          );
-          continue;
-        }
-        ServerState::NotOk => {
-          let _ = write!(
-            &mut log,
-            "\nSkipping {}: Server Not Ok ⚠️",
-            bold(&server.name)
-          );
-          continue;
-        }
-        _ => {}
+      if !matches!(status.state, ServerState::Ok) {
+        let _ = write!(
+          &mut log,
+          "\nSkipping {}: {} ⚠️",
+          bold(&server.name),
+          status.state
+        );
+        continue;
       }
       match rotate_server_keys(&server).await {
         Ok(_) => {
@@ -534,138 +415,3 @@ impl Resolve<ExecuteArgs> for RotateAllServerKeys {
     Ok(update)
   }
 }
-
-impl Resolve<ExecuteArgs> for RotateCoreKeys {
-  #[instrument(
-    "RotateCoreKeys",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      force = self.force,
-    )
-  )]
-  async fn resolve(
-    self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    if !user.admin {
-      return Err(
-        anyhow!("This method is admin only.")
-          .status_code(StatusCode::FORBIDDEN),
-      );
-    }
-
-    let _lock = global_rotate_lock()
-      .try_lock()
-      .context("Key rotation already in progress...")?;
-
-    let mut update = update.clone();
-
-    update_update(update.clone()).await?;
-
-    let core_keys = core_keys();
-
-    if !core_keys.rotatable() {
-      return Err(anyhow!("Core `private_key` must be pointing to file, for example 'file:/config/keys/core.key'").into());
-    };
-
-    let server_status_cache = server_status_cache();
-    let servers =
-      find_collect(&db_client().servers, Document::new(), None)
-        .await
-        .context("Failed to query servers from database")?
-        .into_iter()
-        .map(|server| async move {
-          let state = server_status_cache
-            .get(&server.id)
-            .await
-            .map(|s| s.state)
-            .unwrap_or(ServerState::NotOk);
-          (server, state)
-        })
-        .collect::<FuturesOrdered<_>>()
-        .collect::<Vec<_>>()
-        .await;
-
-    if !self.force
-      && let Some((server, _)) = servers
-        .iter()
-        .find(|(_, state)| matches!(state, ServerState::NotOk))
-    {
-      return Err(
-        anyhow!("Server {} is NotOk, stopping key rotation. Pass `force: true` to continue anyways.", server.name).into(),
-      );
-    }
-
-    let public_key = core_keys
-      .rotate(mogh_pki::PkiKind::Mutual)
-      .await?
-      .into_inner();
-
-    info!("New Public Key: {public_key}");
-
-    let mut log = format!("New Public Key: {public_key}\n");
-
-    for (server, state) in servers {
-      match state {
-        ServerState::Disabled => {
-          let _ = write!(
-            &mut log,
-            "\nSkipping {}: Server Disabled ⚙️",
-            bold(&server.name)
-          );
-          continue;
-        }
-        ServerState::NotOk => {
-          // Shouldn't be reached unless 'force: true'
-          let _ = write!(
-            &mut log,
-            "\nSkipping {}: Server Not Ok ⚠️",
-            bold(&server.name)
-          );
-          continue;
-        }
-        _ => {}
-      }
-      let periphery = periphery_client(&server).await?;
-      let res = periphery
-        .request(api::keys::RotateCorePublicKey {
-          public_key: public_key.clone(),
-        })
-        .await;
-      match res {
-        Ok(_) => {
-          let _ = write!(
-            &mut log,
-            "\nRotated key for {} ✅",
-            bold(&server.name)
-          );
-        }
-        Err(e) => {
-          update.push_error_log(
-            "Key Rotation Failure",
-            format_serror(
-              &e.context(format!(
-                "Failed to rotate for {}. The new Core public key will have to be added manually.",
-                bold(&server.name)
-              ))
-              .into(),
-            ),
-          );
-        }
-      }
-    }
-
-    update.push_simple_log("Rotate Core Keys", log);
-    update.finalize();
-    update_update(update.clone()).await?;
-
-    Ok(update)
-  }
-}

bin/core/src/api/execute/mod.rs

@@ -1,4 +1,4 @@
-use std::pin::Pin;
+use std::{pin::Pin, time::Instant};
 
 use anyhow::Context;
 use axum::{
@@ -6,34 +6,29 @@ use axum::{
 };
 use axum_extra::{TypedHeader, headers::ContentType};
 use database::mungos::by_id::find_one_by_id;
+use derive_variants::{EnumVariants, ExtractVariant};
 use formatting::format_serror;
-use futures_util::future::join_all;
+use futures::future::join_all;
 use komodo_client::{
   api::execute::*,
   entities::{
     Operation,
     permission::PermissionLevel,
-    resource::ResourceQuery,
     update::{Log, Update},
     user::User,
   },
 };
-use mogh_auth_server::middleware::authenticate_request;
-use mogh_error::Json;
-use mogh_error::JsonString;
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
+use response::JsonString;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use strum::{Display, EnumDiscriminants};
+use serror::Json;
 use typeshare::typeshare;
 use uuid::Uuid;
 
 use crate::{
-  auth::KomodoAuthImpl,
-  helpers::{
-    query::get_all_tags,
-    update::{init_execution_update, update_update},
-  },
+  auth::auth_request,
+  helpers::update::{init_execution_update, update_update},
   resource::{KomodoResource, list_full_for_user_using_pattern},
   state::db_client,
 };
@@ -47,29 +42,52 @@ mod procedure;
 mod repo;
 mod server;
 mod stack;
-mod swarm;
 mod sync;
 
 use super::Variant;
 
+pub use {
+  deployment::pull_deployment_inner, stack::pull_stack_inner,
+};
+
 pub struct ExecuteArgs {
-  /// The task id.
-  /// Unique for every '/execute' call.
-  pub task_id: Uuid,
   pub user: User,
   pub update: Update,
 }
 
 #[typeshare]
 #[derive(
-  Serialize, Deserialize, Debug, Clone, Resolve, EnumDiscriminants,
+  Serialize, Deserialize, Debug, Clone, Resolve, EnumVariants,
 )]
-#[strum_discriminants(name(ExecuteRequestMethod), derive(Display))]
+#[variant_derive(Debug)]
 #[args(ExecuteArgs)]
 #[response(JsonString)]
-#[error(mogh_error::Error)]
+#[error(serror::Error)]
 #[serde(tag = "type", content = "params")]
 pub enum ExecuteRequest {
+  // ==== SERVER ====
+  StartContainer(StartContainer),
+  RestartContainer(RestartContainer),
+  PauseContainer(PauseContainer),
+  UnpauseContainer(UnpauseContainer),
+  StopContainer(StopContainer),
+  DestroyContainer(DestroyContainer),
+  StartAllContainers(StartAllContainers),
+  RestartAllContainers(RestartAllContainers),
+  PauseAllContainers(PauseAllContainers),
+  UnpauseAllContainers(UnpauseAllContainers),
+  StopAllContainers(StopAllContainers),
+  PruneContainers(PruneContainers),
+  DeleteNetwork(DeleteNetwork),
+  PruneNetworks(PruneNetworks),
+  DeleteImage(DeleteImage),
+  PruneImages(PruneImages),
+  DeleteVolume(DeleteVolume),
+  PruneVolumes(PruneVolumes),
+  PruneDockerBuilders(PruneDockerBuilders),
+  PruneBuildx(PruneBuildx),
+  PruneSystem(PruneSystem),
+
   // ==== STACK ====
   DeployStack(DeployStack),
   BatchDeployStack(BatchDeployStack),
@@ -115,77 +133,37 @@ pub enum ExecuteRequest {
   // ==== PROCEDURE ====
   RunProcedure(RunProcedure),
   BatchRunProcedure(BatchRunProcedure),
-  CancelProcedure(CancelProcedure),
 
   // ==== ACTION ====
   RunAction(RunAction),
   BatchRunAction(BatchRunAction),
-  CancelAction(CancelAction),
-
-  // ==== SYNC ====
-  RunSync(RunSync),
 
   // ==== ALERTER ====
   TestAlerter(TestAlerter),
   SendAlert(SendAlert),
 
-  // ==== SERVER ====
-  StartContainer(StartContainer),
-  RestartContainer(RestartContainer),
-  PauseContainer(PauseContainer),
-  UnpauseContainer(UnpauseContainer),
-  StopContainer(StopContainer),
-  DestroyContainer(DestroyContainer),
-  StartAllContainers(StartAllContainers),
-  RestartAllContainers(RestartAllContainers),
-  PauseAllContainers(PauseAllContainers),
-  UnpauseAllContainers(UnpauseAllContainers),
-  StopAllContainers(StopAllContainers),
-  PruneContainers(PruneContainers),
-  DeleteNetwork(DeleteNetwork),
-  PruneNetworks(PruneNetworks),
-  DeleteImage(DeleteImage),
-  PruneImages(PruneImages),
-  DeleteVolume(DeleteVolume),
-  PruneVolumes(PruneVolumes),
-  PruneDockerBuilders(PruneDockerBuilders),
-  PruneBuildx(PruneBuildx),
-  PruneSystem(PruneSystem),
-
-  // ==== SWARM ====
-  RemoveSwarmNodes(RemoveSwarmNodes),
-  UpdateSwarmNode(UpdateSwarmNode),
-  RemoveSwarmStacks(RemoveSwarmStacks),
-  RemoveSwarmServices(RemoveSwarmServices),
-  CreateSwarmConfig(CreateSwarmConfig),
-  RotateSwarmConfig(RotateSwarmConfig),
-  RemoveSwarmConfigs(RemoveSwarmConfigs),
-  CreateSwarmSecret(CreateSwarmSecret),
-  RotateSwarmSecret(RotateSwarmSecret),
-  RemoveSwarmSecrets(RemoveSwarmSecrets),
+  // ==== SYNC ====
+  RunSync(RunSync),
 
   // ==== MAINTENANCE ====
   ClearRepoCache(ClearRepoCache),
   BackupCoreDatabase(BackupCoreDatabase),
   GlobalAutoUpdate(GlobalAutoUpdate),
   RotateAllServerKeys(RotateAllServerKeys),
-  RotateCoreKeys(RotateCoreKeys),
 }
 
 pub fn router() -> Router {
   Router::new()
     .route("/", post(handler))
     .route("/{variant}", post(variant_handler))
-    .layer(middleware::from_fn(
-      authenticate_request::<KomodoAuthImpl, true>,
-    ))
+    .layer(middleware::from_fn(auth_request))
 }
 
 async fn variant_handler(
   user: Extension<User>,
   Path(Variant { variant }): Path<Variant>,
   Json(params): Json<serde_json::Value>,
-) -> mogh_error::Result<(TypedHeader<ContentType>, String)> {
+) -> serror::Result<(TypedHeader<ContentType>, String)> {
   let req: ExecuteRequest = serde_json::from_value(json!({
     "type": variant,
     "params": params,
@@ -196,7 +174,7 @@ async fn variant_handler(
 async fn handler(
   Extension(user): Extension<User>,
   Json(request): Json<ExecuteRequest>,
-) -> mogh_error::Result<(TypedHeader<ContentType>, String)> {
+) -> serror::Result<(TypedHeader<ContentType>, String)> {
   let res = match inner_handler(request, user).await? {
     ExecutionResult::Single(update) => serde_json::to_string(&update)
       .context("Failed to serialize Update")?,
@@ -224,7 +202,7 @@ pub fn inner_handler(
   >,
 > {
   Box::pin(async move {
-    let task_id = Uuid::new_v4();
+    let req_id = Uuid::new_v4();
 
     // Need to validate no cancel is active before any update is created.
     // This ensures no double update created if Cancel is called more than once for the same request.
@@ -240,14 +218,14 @@ pub fn inner_handler(
     // here either.
     if update.operation == Operation::None {
       return Ok(ExecutionResult::Batch(
-        task(task_id, request, user, update).await?,
+        task(req_id, request, user, update).await?,
       ));
     }
 
     // Spawn a task for the execution which continues
     // running after this method returns.
     let handle =
-      tokio::spawn(task(task_id, request, user, update.clone()));
+      tokio::spawn(task(req_id, request, user, update.clone()));
 
     // Spawns another task to monitor the first for failures,
     // and add the log to Update about it (which primary task can't do because it errored out)
@@ -256,19 +234,11 @@ pub fn inner_handler(
       async move {
         let log = match handle.await {
           Ok(Err(e)) => {
-            warn!(
-              api = "Execute",
-              task_id = task_id.to_string(),
-              "/execute request task error: {e:#}",
-            );
+            warn!("/execute request {req_id} task error: {e:#}",);
             Log::error("Task Error", format_serror(&e.into()))
           }
           Err(e) => {
-            warn!(
-              api = "Execute",
-              task_id = task_id.to_string(),
-              "/execute request spawn error: {e:?}",
-            );
+            warn!("/execute request {req_id} spawn error: {e:?}",);
             Log::error("Spawn Error", format!("{e:#?}"))
           }
           _ => return,
@@ -282,8 +252,8 @@ pub fn inner_handler(
           let mut update =
             find_one_by_id(&db_client().updates, &update_id)
               .await
-              .context("Failed to query to db")?
-              .context("No Update exists with given id")?;
+              .context("failed to query to db")?
+              .context("no update exists with given id")?;
           update.logs.push(log);
           update.finalize();
           update_update(update).await
@@ -292,10 +262,7 @@ pub fn inner_handler(
 
         if let Err(e) = res {
           warn!(
-            api = "Execute",
-            task_id = task_id.to_string(),
-            update_id,
-            "Failed to modify Update with task error log | {e:#}"
+            "failed to update update with task error log | {e:#}"
           );
         }
       }
@@ -305,33 +272,25 @@ pub fn inner_handler(
   })
 }
 
+#[instrument(
+  name = "ExecuteRequest",
+  skip(user, update),
+  fields(
+    user_id = user.id,
+    update_id = update.id,
+    request = format!("{:?}", request.extract_variant()))
+  )
+]
 async fn task(
-  id: Uuid,
+  req_id: Uuid,
   request: ExecuteRequest,
   user: User,
   update: Update,
 ) -> anyhow::Result<String> {
-  let method: ExecuteRequestMethod = (&request).into();
+  info!("/execute request {req_id} | user: {}", user.username);
+  let timer = Instant::now();
 
-  let user_id = user.id.clone();
-  let username = user.username.clone();
-
-  info!(
-    api = "Execute",
-    task_id = id.to_string(),
-    method = method.to_string(),
-    user_id,
-    username,
-    "EXECUTE REQUEST",
-  );
-
-  let res = match request
-    .resolve(&ExecuteArgs {
-      user,
-      update,
-      task_id: id,
-    })
-    .await
+  let res = match request.resolve(&ExecuteArgs { user, update }).await
   {
     Err(e) => Err(e.error),
     Ok(JsonString::Err(e)) => Err(
@@ -341,16 +300,12 @@ async fn task(
   };
 
   if let Err(e) = &res {
-    warn!(
-      api = "Execute",
-      task_id = id.to_string(),
-      method = method.to_string(),
-      user_id,
-      username,
-      "EXECUTE REQUEST | ERROR: {e:#}"
-    );
+    warn!("/execute request {req_id} error: {e:#}");
   }
 
+  let elapsed = timer.elapsed();
+  debug!("/execute request {req_id} | resolve time: {elapsed:?}");
+
   res
 }
 
@@ -359,32 +314,18 @@ trait BatchExecute {
   fn single_request(name: String) -> ExecuteRequest;
 }
 
-#[instrument("BatchExecute", skip(user))]
 async fn batch_execute<E: BatchExecute>(
   pattern: &str,
-  tags: Vec<String>,
   user: &User,
 ) -> anyhow::Result<BatchExecutionResponse> {
-  let all_tags = if tags.is_empty() {
-    vec![]
-  } else {
-    get_all_tags(None).await?
-  };
-
   let resources = list_full_for_user_using_pattern::<E::Resource>(
     pattern,
-    ResourceQuery {
-      tags,
-      ..Default::default()
-    },
-    None,
-    None,
+    Default::default(),
     user,
     PermissionLevel::Execute.into(),
-    &all_tags,
+    &[],
   )
   .await?;
-
   let futures = resources.into_iter().map(|resource| {
     let user = user.clone();
     async move {

bin/core/src/api/execute/procedure.rs

@@ -1,14 +1,12 @@
 use std::pin::Pin;
 
-use anyhow::Context as _;
 use database::mungos::{
   by_id::update_one_by_id, mongodb::bson::to_document,
 };
 use formatting::{Color, bold, colored, format_serror, muted};
 use komodo_client::{
   api::execute::{
-    BatchExecutionResponse, BatchRunProcedure, CancelProcedure,
-    RunProcedure,
+    BatchExecutionResponse, BatchRunProcedure, RunProcedure,
   },
   entities::{
     alert::{Alert, AlertData, SeverityLevel},
@@ -19,16 +17,15 @@ use komodo_client::{
     user::User,
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 use tokio::sync::Mutex;
-use tokio_util::sync::CancellationToken;
 
 use crate::{
   alert::send_alerts,
   helpers::{procedure::execute_procedure, update::update_update},
   permission::get_check_permissions,
   resource::refresh_procedure_state_cache,
-  state::{action_states, db_client, procedure_cancel_cache},
+  state::{action_states, db_client},
 };
 
 use super::{ExecuteArgs, ExecuteRequest};
@@ -41,45 +38,24 @@ impl super::BatchExecute for BatchRunProcedure {
 }
 
 impl Resolve<ExecuteArgs> for BatchRunProcedure {
-  #[instrument(
-    "BatchRunProcedure",
-    skip_all,
-    fields(operator = user.id)
-  )]
+  #[instrument(name = "BatchRunProcedure", skip(user), fields(user_id = user.id))]
   async fn resolve(
     self,
     ExecuteArgs { user, .. }: &ExecuteArgs,
-  ) -> mogh_error::Result<BatchExecutionResponse> {
+  ) -> serror::Result<BatchExecutionResponse> {
     Ok(
-      super::batch_execute::<BatchRunProcedure>(
-        &self.pattern,
-        self.tags,
-        user,
-      )
-      .await?,
+      super::batch_execute::<BatchRunProcedure>(&self.pattern, user)
+        .await?,
     )
   }
 }
 
 impl Resolve<ExecuteArgs> for RunProcedure {
-  #[instrument(
-    "RunProcedure",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      procedure = self.procedure,
-    )
-  )]
+  #[instrument(name = "RunProcedure", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     Ok(
       resolve_inner(self.procedure, user.clone(), update.clone())
         .await?,
@@ -129,17 +105,9 @@ fn resolve_inner(
 
     update_update(update.clone()).await?;
 
-    let cancel = CancellationToken::new();
-
-    procedure_cancel_cache()
-      .insert(procedure.id.clone(), cancel.clone())
-      .await;
-
     let update = Mutex::new(update);
 
-    let res = execute_procedure(&procedure, &update, cancel).await;
-
-    procedure_cancel_cache().remove(&procedure.id).await;
+    let res = execute_procedure(&procedure, &update).await;
 
     let mut update = update.into_inner();
 
@@ -155,7 +123,7 @@ fn resolve_inner(
         );
       }
       Err(e) => update
-        .push_error_log("Execution error", format_serror(&e.into())),
+        .push_error_log("execution error", format_serror(&e.into())),
     }
 
     update.finalize();
@@ -178,6 +146,7 @@ fn resolve_inner(
     update_update(update.clone()).await?;
 
     if !update.success && procedure.config.failure_alert {
+      warn!("procedure unsuccessful, alerting...");
       let target = update.target.clone();
       tokio::spawn(async move {
         let alert = Alert {
@@ -199,47 +168,3 @@ fn resolve_inner(
     Ok(update)
   })
 }
-
-impl Resolve<ExecuteArgs> for CancelProcedure {
-  #[instrument(
-    "CancelProcedure",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      procedure = self.procedure,
-    )
-  )]
-  async fn resolve(
-    self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    let procedure = get_check_permissions::<Procedure>(
-      &self.procedure,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    procedure_cancel_cache()
-      .get(&procedure.id)
-      .await
-      .context("Procedure run cancel token not found")?
-      .cancel();
-
-    let mut update = update.clone();
-    update.push_simple_log(
-      "Cancel Triggered",
-      "Procedure cancel has been triggered. The procedure will exit after the currently running stage is complete.",
-    );
-    update.finalize();
-    update_update(update.clone()).await?;
-
-    Ok(update)
-  }
-}

bin/core/src/api/execute/repo.rs

@@ -22,15 +22,15 @@ use komodo_client::{
     update::{Log, Update},
   },
 };
-use mogh_resolver::Resolve;
 use periphery_client::api;
+use resolver_api::Resolve;
 use tokio_util::sync::CancellationToken;
 
 use crate::{
   alert::send_alerts,
   api::write::WriteArgs,
   helpers::{
-    builder::{cleanup_builder_instance, connect_builder_periphery},
+    builder::{cleanup_builder_instance, get_builder_periphery},
     channel::repo_cancel_channel,
     git_token, periphery_client,
     query::{VariablesAndSecrets, get_variables_and_secrets},
@@ -51,50 +51,24 @@ impl super::BatchExecute for BatchCloneRepo {
 }
 
 impl Resolve<ExecuteArgs> for BatchCloneRepo {
-  #[instrument(
-    "BatchCloneRepo",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      pattern = self.pattern,
-      tags = self.tags.join(","),
-    )
-  )]
+  #[instrument(name = "BatchCloneRepo", skip( user), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs { user, task_id, .. }: &ExecuteArgs,
-  ) -> mogh_error::Result<BatchExecutionResponse> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<BatchExecutionResponse> {
     Ok(
-      super::batch_execute::<BatchCloneRepo>(
-        &self.pattern,
-        self.tags,
-        user,
-      )
-      .await?,
+      super::batch_execute::<BatchCloneRepo>(&self.pattern, user)
+        .await?,
     )
   }
 }
 
 impl Resolve<ExecuteArgs> for CloneRepo {
-  #[instrument(
-    "CloneRepo",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      repo = self.repo,
-    )
-  )]
+  #[instrument(name = "CloneRepo", skip( user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     let mut repo = get_check_permissions::<Repo>(
       &self.repo,
       user,
@@ -191,50 +165,24 @@ impl super::BatchExecute for BatchPullRepo {
 }
 
 impl Resolve<ExecuteArgs> for BatchPullRepo {
-  #[instrument(
-    "BatchPullRepo",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      pattern = self.pattern,
-      tags = self.tags.join(","),
-    )
-  )]
+  #[instrument(name = "BatchPullRepo", skip(user), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs { user, task_id, .. }: &ExecuteArgs,
-  ) -> mogh_error::Result<BatchExecutionResponse> {
+    ExecuteArgs { user, .. }: &ExecuteArgs,
+  ) -> serror::Result<BatchExecutionResponse> {
     Ok(
-      super::batch_execute::<BatchPullRepo>(
-        &self.pattern,
-        self.tags,
-        user,
-      )
-      .await?,
+      super::batch_execute::<BatchPullRepo>(&self.pattern, user)
+        .await?,
     )
   }
 }
 
 impl Resolve<ExecuteArgs> for PullRepo {
-  #[instrument(
-    "PullRepo",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      repo = self.repo,
-    )
-  )]
+  #[instrument(name = "PullRepo", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     let mut repo = get_check_permissions::<Repo>(
       &self.repo,
       user,
@@ -327,14 +275,10 @@ impl Resolve<ExecuteArgs> for PullRepo {
   }
 }
 
-#[instrument(
-  "HandleRepoEarlyReturn",
-  skip_all,
-  fields(update_id = update.id)
-)]
+#[instrument(skip_all, fields(update_id = update.id))]
 async fn handle_repo_update_return(
   update: Update,
-) -> mogh_error::Result<Update> {
+) -> serror::Result<Update> {
   // Need to manually update the update before cache refresh,
   // and before broadcast with add_update.
   // The Err case of to_document should be unreachable,
@@ -353,7 +297,7 @@ async fn handle_repo_update_return(
   Ok(update)
 }
 
-#[instrument("UpdateLastPulledTime")]
+#[instrument]
 async fn update_last_pulled_time(repo_name: &str) {
   let res = db_client()
     .repos
@@ -377,50 +321,24 @@ impl super::BatchExecute for BatchBuildRepo {
 }
 
 impl Resolve<ExecuteArgs> for BatchBuildRepo {
-  #[instrument(
-    "BatchBuildRepo",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      pattern = self.pattern,
-      tags = self.tags.join(","),
-    )
-  )]
+  #[instrument(name = "BatchBuildRepo", skip(user), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs { user, task_id, .. }: &ExecuteArgs,
-  ) -> mogh_error::Result<BatchExecutionResponse> {
+    ExecuteArgs { user, .. }: &ExecuteArgs,
+  ) -> serror::Result<BatchExecutionResponse> {
     Ok(
-      super::batch_execute::<BatchBuildRepo>(
-        &self.pattern,
-        self.tags,
-        user,
-      )
-      .await?,
+      super::batch_execute::<BatchBuildRepo>(&self.pattern, user)
+        .await?,
     )
   }
 }
 
 impl Resolve<ExecuteArgs> for BuildRepo {
-  #[instrument(
-    "BuildRepo",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      repo = self.repo,
-    )
-  )]
+  #[instrument(name = "BuildRepo", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     let mut repo = get_check_permissions::<Repo>(
       &self.repo,
       user,
@@ -501,11 +419,11 @@ impl Resolve<ExecuteArgs> for BuildRepo {
 
     // GET BUILDER PERIPHERY
 
-    let (periphery, cleanup_data) = match connect_builder_periphery(
+    let (periphery, cleanup_data) = match get_builder_periphery(
       repo.name.clone(),
       None,
       builder,
-      Some(&mut update),
+      &mut update,
     )
     .await
     {
@@ -613,6 +531,7 @@ impl Resolve<ExecuteArgs> for BuildRepo {
     update_update(update.clone()).await?;
 
     if !update.success {
+      warn!("repo build unsuccessful, alerting...");
       let target = update.target.clone();
       tokio::spawn(async move {
         let alert = Alert {
@@ -635,13 +554,13 @@ impl Resolve<ExecuteArgs> for BuildRepo {
   }
 }
 
-#[instrument("HandleRepoBuildEarlyReturn", skip(update))]
+#[instrument(skip(update))]
 async fn handle_builder_early_return(
   mut update: Update,
   repo_id: String,
   repo_name: String,
   is_cancel: bool,
-) -> mogh_error::Result<Update> {
+) -> serror::Result<Update> {
   update.finalize();
   // Need to manually update the update before cache refresh,
   // and before broadcast with add_update.
@@ -659,6 +578,7 @@ async fn handle_builder_early_return(
   }
   update_update(update.clone()).await?;
   if !update.success && !is_cancel {
+    warn!("repo build unsuccessful, alerting...");
     let target = update.target.clone();
     tokio::spawn(async move {
       let alert = Alert {
@@ -679,6 +599,7 @@ async fn handle_builder_early_return(
   Ok(update)
 }
 
+#[instrument(skip_all)]
 pub async fn validate_cancel_repo_build(
   request: &ExecuteRequest,
 ) -> anyhow::Result<()> {
@@ -713,12 +634,13 @@ pub async fn validate_cancel_repo_build(
     )?;
 
     match (latest_build, latest_cancel) {
-      (Some(build), Some(cancel))
-        if cancel.start_ts > build.start_ts =>
-      {
-        return Err(anyhow!("Repo build has already been cancelled"));
+      (Some(build), Some(cancel)) => {
+        if cancel.start_ts > build.start_ts {
+          return Err(anyhow!(
+            "Repo build has already been cancelled"
+          ));
+        }
       }
-
       (None, _) => return Err(anyhow!("No repo build in progress")),
       _ => {}
     };
@@ -727,24 +649,11 @@ pub async fn validate_cancel_repo_build(
 }
 
 impl Resolve<ExecuteArgs> for CancelRepoBuild {
-  #[instrument(
-    "CancelRepoBuild",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      repo = self.repo,
-    )
-  )]
+  #[instrument(name = "CancelRepoBuild", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     let repo = get_check_permissions::<Repo>(
       &self.repo,
       user,
@@ -800,13 +709,6 @@ impl Resolve<ExecuteArgs> for CancelRepoBuild {
   }
 }
 
-#[instrument(
-  "Interpolate",
-  skip_all,
-  fields(
-    skip_secret_interp = repo.config.skip_secret_interp
-  )
-)]
 async fn interpolate(
   repo: &mut Repo,
   update: &mut Update,

bin/core/src/api/execute/stack.rs

@@ -1,6 +1,6 @@
 use std::{collections::HashSet, str::FromStr};
 
-use anyhow::{Context, anyhow};
+use anyhow::Context;
 use database::mungos::mongodb::bson::{
   doc, oid::ObjectId, to_bson, to_document,
 };
@@ -9,7 +9,7 @@ use interpolate::Interpolator;
 use komodo_client::{
   api::{execute::*, write::RefreshStackCache},
   entities::{
-    FileContents, SwarmOrServer,
+    FileContents,
     permission::PermissionLevel,
     repo::Repo,
     server::Server,
@@ -20,13 +20,8 @@ use komodo_client::{
     user::User,
   },
 };
-use mogh_error::AddStatusCodeError as _;
-use mogh_resolver::Resolve;
-use periphery_client::api::{
-  DeployStackResponse, compose::*, swarm::DeploySwarmStack,
-};
-use reqwest::StatusCode;
-use uuid::Uuid;
+use periphery_client::api::compose::*;
+use resolver_api::Resolve;
 
 use crate::{
   api::write::WriteArgs,
@@ -34,20 +29,14 @@ use crate::{
     periphery_client,
     query::{VariablesAndSecrets, get_variables_and_secrets},
     stack_git_token,
-    swarm::swarm_request,
     update::{
       add_update_without_send, init_execution_update, update_update,
     },
   },
-  monitor::{refresh_server_cache, refresh_swarm_cache},
+  monitor::update_cache_for_server,
   permission::get_check_permissions,
   resource,
-  stack::{
-    execute::{
-      execute_compose, execute_compose_with_stack_and_server,
-    },
-    setup_stack_execution,
-  },
+  stack::{execute::execute_compose, get_stack_and_server},
   state::{action_states, db_client},
 };
 
@@ -65,61 +54,32 @@ impl super::BatchExecute for BatchDeployStack {
 }
 
 impl Resolve<ExecuteArgs> for BatchDeployStack {
-  #[instrument(
-    "BatchDeployStack",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      pattern = self.pattern,
-      tags = self.tags.join(","),
-    )
-  )]
+  #[instrument(name = "BatchDeployStack", skip(user), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs { user, task_id, .. }: &ExecuteArgs,
-  ) -> mogh_error::Result<BatchExecutionResponse> {
+    ExecuteArgs { user, .. }: &ExecuteArgs,
+  ) -> serror::Result<BatchExecutionResponse> {
     Ok(
-      super::batch_execute::<BatchDeployStack>(
-        &self.pattern,
-        self.tags,
-        user,
-      )
-      .await?,
+      super::batch_execute::<BatchDeployStack>(&self.pattern, user)
+        .await?,
     )
   }
 }
 
 impl Resolve<ExecuteArgs> for DeployStack {
-  #[instrument(
-    "DeployStack",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      stack = self.stack,
-      services = format!("{:?}", self.services),
-      stop_time = self.stop_time,
-    )
-  )]
+  #[instrument(name = "DeployStack", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
-    let (mut stack, swarm_or_server) = setup_stack_execution(
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
+    let (mut stack, server) = get_stack_and_server(
       &self.stack,
       user,
       PermissionLevel::Execute.into(),
+      true,
     )
     .await?;
 
-    swarm_or_server.verify_has_target()?;
-
     let mut repo = if !stack.config.files_on_host
       && !stack.config.linked_repo.is_empty()
     {
@@ -185,45 +145,27 @@ impl Resolve<ExecuteArgs> for DeployStack {
       Default::default()
     };
 
-    let DeployStackResponse {
+    let ComposeUpResponse {
       logs,
       deployed,
       services,
       file_contents,
       missing_files,
       remote_errors,
-      merged_config,
+      compose_config,
       commit_hash,
       commit_message,
-    } = match &swarm_or_server {
-      SwarmOrServer::None => unreachable!(),
-      SwarmOrServer::Swarm(swarm) => {
-        swarm_request(
-          &swarm.config.server_ids,
-          DeploySwarmStack {
-            stack: stack.clone(),
-            repo,
-            git_token,
-            registry_token,
-            replacers: secret_replacers.into_iter().collect(),
-          },
-        )
-        .await?
-      }
-      SwarmOrServer::Server(server) => {
-        periphery_client(server)
-          .await?
-          .request(ComposeUp {
-            stack: stack.clone(),
-            services: self.services,
-            repo,
-            git_token,
-            registry_token,
-            replacers: secret_replacers.into_iter().collect(),
-          })
-          .await?
-      }
-    };
+    } = periphery_client(&server)
+      .await?
+      .request(ComposeUp {
+        stack: stack.clone(),
+        services: self.services,
+        repo,
+        git_token,
+        registry_token,
+        replacers: secret_replacers.into_iter().collect(),
+      })
+      .await?;
 
     update.logs.extend(logs);
 
@@ -257,7 +199,7 @@ impl Resolve<ExecuteArgs> for DeployStack {
               })
               .collect(),
           ),
-          merged_config,
+          compose_config,
           commit_hash.clone(),
           commit_message.clone(),
         )
@@ -295,7 +237,7 @@ impl Resolve<ExecuteArgs> for DeployStack {
       };
 
       let info = to_document(&info)
-        .context("Failed to serialize stack info to bson")?;
+        .context("failed to serialize stack info to bson")?;
 
       db_client()
         .stacks
@@ -304,30 +246,22 @@ impl Resolve<ExecuteArgs> for DeployStack {
           doc! { "$set": { "info": info } },
         )
         .await
-        .context("Failed to update stack info on db")?;
+        .context("failed to update stack info on db")?;
       anyhow::Ok(())
     };
 
     // This will be weird with single service deploys. Come back to it.
     if let Err(e) = update_info.await {
       update.push_error_log(
-        "Refresh Stack Info",
+        "refresh stack info",
         format_serror(
-          &e.context("Failed to refresh stack info on db").into(),
+          &e.context("failed to refresh stack info on db").into(),
         ),
       )
     }
 
     // Ensure cached stack state up to date by updating server cache
-    match swarm_or_server {
-      SwarmOrServer::None => unreachable!(),
-      SwarmOrServer::Swarm(swarm) => {
-        refresh_swarm_cache(&swarm, true).await;
-      }
-      SwarmOrServer::Server(server) => {
-        refresh_server_cache(&server, true).await;
-      }
-    }
+    update_cache_for_server(&server, true).await;
 
     update.finalize();
     update_update(update.clone()).await?;
@@ -347,24 +281,14 @@ impl super::BatchExecute for BatchDeployStackIfChanged {
 }
 
 impl Resolve<ExecuteArgs> for BatchDeployStackIfChanged {
-  #[instrument(
-    "BatchDeployStackIfChanged",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      pattern = self.pattern,
-      tags = self.tags.join(","),
-    )
-  )]
+  #[instrument(name = "BatchDeployStackIfChanged", skip(user), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs { user, task_id, .. }: &ExecuteArgs,
-  ) -> mogh_error::Result<BatchExecutionResponse> {
+    ExecuteArgs { user, .. }: &ExecuteArgs,
+  ) -> serror::Result<BatchExecutionResponse> {
     Ok(
       super::batch_execute::<BatchDeployStackIfChanged>(
         &self.pattern,
-        self.tags,
         user,
       )
       .await?,
@@ -373,25 +297,11 @@ impl Resolve<ExecuteArgs> for BatchDeployStackIfChanged {
 }
 
 impl Resolve<ExecuteArgs> for DeployStackIfChanged {
-  #[instrument(
-    "DeployStackIfChanged",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      stack = self.stack,
-      stop_time = self.stop_time,
-    )
-  )]
+  #[instrument(name = "DeployStackIfChanged", skip(user, update), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     let stack = get_check_permissions::<Stack>(
       &self.stack,
       user,
@@ -448,7 +358,6 @@ impl Resolve<ExecuteArgs> for DeployStackIfChanged {
         .resolve(&ExecuteArgs {
           user: user.clone(),
           update,
-          task_id: *task_id,
         })
         .await
       }
@@ -558,19 +467,11 @@ impl Resolve<ExecuteArgs> for DeployStackIfChanged {
   }
 }
 
-#[instrument(
-  "DeployStackServices",
-  skip_all,
-  fields(
-    stack = stack,
-    services = format!("{services:?}")
-  )
-)]
 async fn deploy_services(
   stack: String,
   services: Vec<String>,
   user: &User,
-) -> mogh_error::Result<Update> {
+) -> serror::Result<Update> {
   // The existing update is initialized to DeployStack,
   // but also has not been created on database.
   // Setup a new update here.
@@ -587,24 +488,15 @@ async fn deploy_services(
     .resolve(&ExecuteArgs {
       user: user.clone(),
       update,
-      task_id: Uuid::new_v4(),
     })
     .await
 }
 
-#[instrument(
-  "RestartStackServices",
-  skip_all,
-  fields(
-    stack = stack,
-    services = format!("{services:?}")
-  )
-)]
 async fn restart_services(
   stack: String,
   services: Vec<String>,
   user: &User,
-) -> mogh_error::Result<Update> {
+) -> serror::Result<Update> {
   // The existing update is initialized to DeployStack,
   // but also has not been created on database.
   // Setup a new update here.
@@ -618,7 +510,6 @@ async fn restart_services(
     .resolve(&ExecuteArgs {
       user: user.clone(),
       update,
-      task_id: Uuid::new_v4(),
     })
     .await
 }
@@ -635,11 +526,6 @@ async fn restart_services(
 /// Changes to config files after restart is applied should
 /// be taken as the deployed contents, otherwise next changed check
 /// will restart service again for no reason.
-#[instrument(
-  "UpdateStackDeployedContents",
-  skip_all,
-  fields(stack = id)
-)]
 async fn update_deployed_contents_with_latest(
   id: &str,
   contents: Option<Vec<StackRemoteFileContents>>,
@@ -777,27 +663,14 @@ impl super::BatchExecute for BatchPullStack {
 }
 
 impl Resolve<ExecuteArgs> for BatchPullStack {
-  #[instrument(
-    "BatchPullStack",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      pattern = self.pattern,
-      tags = self.tags.join(","),
-    )
-  )]
+  #[instrument(name = "BatchPullStack", skip(user), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs { user, task_id, .. }: &ExecuteArgs,
-  ) -> mogh_error::Result<BatchExecutionResponse> {
+    ExecuteArgs { user, .. }: &ExecuteArgs,
+  ) -> serror::Result<BatchExecutionResponse> {
     Ok(
-      super::batch_execute::<BatchPullStack>(
-        &self.pattern,
-        self.tags,
-        user,
-      )
-      .await?,
+      super::batch_execute::<BatchPullStack>(&self.pattern, user)
+        .await?,
     )
   }
 }
@@ -827,14 +700,6 @@ async fn maybe_pull_stack(
   Ok(())
 }
 
-#[instrument(
-  "PullStackInner",
-  skip_all,
-  fields(
-    stack = stack.id,
-    services = format!("{services:?}"),
-  )
-)]
 pub async fn pull_stack_inner(
   mut stack: Stack,
   services: Vec<String>,
@@ -898,47 +763,25 @@ pub async fn pull_stack_inner(
     .await?;
 
   // Ensure cached stack state up to date by updating server cache
-  refresh_server_cache(server, true).await;
+  update_cache_for_server(server, true).await;
 
   Ok(res)
 }
 
 impl Resolve<ExecuteArgs> for PullStack {
-  #[instrument(
-    "PullStack",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      stack = self.stack,
-      services = format!("{:?}", self.services),
-    )
-  )]
+  #[instrument(name = "PullStack", skip(user, update), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
-    let (stack, swarm_or_server) = setup_stack_execution(
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
+    let (stack, server) = get_stack_and_server(
       &self.stack,
       user,
       PermissionLevel::Execute.into(),
+      true,
     )
     .await?;
 
-    let SwarmOrServer::Server(server) = swarm_or_server else {
-      return Err(
-        anyhow!(
-          "PullStack should not be called for Stack in Swarm Mode"
-        )
-        .status_code(StatusCode::BAD_REQUEST),
-      );
-    };
-
     let repo = if !stack.config.files_on_host
       && !stack.config.linked_repo.is_empty()
     {
@@ -979,25 +822,11 @@ impl Resolve<ExecuteArgs> for PullStack {
 }
 
 impl Resolve<ExecuteArgs> for StartStack {
-  #[instrument(
-    "StartStack",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      stack = self.stack,
-      services = format!("{:?}", self.services),
-    )
-  )]
+  #[instrument(name = "StartStack", skip(user, update), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     execute_compose::<StartStack>(
       &self.stack,
       self.services,
@@ -1012,25 +841,11 @@ impl Resolve<ExecuteArgs> for StartStack {
 }
 
 impl Resolve<ExecuteArgs> for RestartStack {
-  #[instrument(
-    "RestartStack",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      stack = self.stack,
-      services = format!("{:?}", self.services),
-    )
-  )]
+  #[instrument(name = "RestartStack", skip(user, update), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     execute_compose::<RestartStack>(
       &self.stack,
       self.services,
@@ -1047,25 +862,11 @@ impl Resolve<ExecuteArgs> for RestartStack {
 }
 
 impl Resolve<ExecuteArgs> for PauseStack {
-  #[instrument(
-    "PauseStack",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      stack = self.stack,
-      services = format!("{:?}", self.services),
-    )
-  )]
+  #[instrument(name = "PauseStack", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     execute_compose::<PauseStack>(
       &self.stack,
       self.services,
@@ -1080,25 +881,11 @@ impl Resolve<ExecuteArgs> for PauseStack {
 }
 
 impl Resolve<ExecuteArgs> for UnpauseStack {
-  #[instrument(
-    "UnpauseStack",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      stack = self.stack,
-      services = format!("{:?}", self.services),
-    )
-  )]
+  #[instrument(name = "UnpauseStack", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     execute_compose::<UnpauseStack>(
       &self.stack,
       self.services,
@@ -1113,25 +900,11 @@ impl Resolve<ExecuteArgs> for UnpauseStack {
 }
 
 impl Resolve<ExecuteArgs> for StopStack {
-  #[instrument(
-    "StopStack",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      stack = self.stack,
-      services = format!("{:?}", self.services),
-    )
-  )]
+  #[instrument(name = "StopStack", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     execute_compose::<StopStack>(
       &self.stack,
       self.services,
@@ -1158,166 +931,50 @@ impl super::BatchExecute for BatchDestroyStack {
 }
 
 impl Resolve<ExecuteArgs> for BatchDestroyStack {
-  #[instrument(
-    "BatchDestroyStack",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      pattern = self.pattern,
-      tags = self.tags.join(","),
-    )
-  )]
+  #[instrument(name = "BatchDestroyStack", skip(user), fields(user_id = user.id))]
   async fn resolve(
     self,
-    ExecuteArgs { user, task_id, .. }: &ExecuteArgs,
-  ) -> mogh_error::Result<BatchExecutionResponse> {
-    super::batch_execute::<BatchDestroyStack>(
-      &self.pattern,
-      self.tags,
+    ExecuteArgs { user, .. }: &ExecuteArgs,
+  ) -> serror::Result<BatchExecutionResponse> {
+    super::batch_execute::<BatchDestroyStack>(&self.pattern, user)
+      .await
+      .map_err(Into::into)
+  }
+}
+
+impl Resolve<ExecuteArgs> for DestroyStack {
+  #[instrument(name = "DestroyStack", skip(user, update), fields(user_id = user.id, update_id = update.id))]
+  async fn resolve(
+    self,
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
+    execute_compose::<DestroyStack>(
+      &self.stack,
+      self.services,
       user,
+      |state| state.destroying = true,
+      update.clone(),
+      (self.stop_time, self.remove_orphans),
     )
     .await
     .map_err(Into::into)
   }
 }
 
-impl Resolve<ExecuteArgs> for DestroyStack {
-  #[instrument(
-    "DestroyStack",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      stack = self.stack,
-      services = format!("{:?}", self.services),
-      remove_orphans = self.remove_orphans,
-      stop_time = self.stop_time,
-    )
-  )]
-  async fn resolve(
-    self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
-    let (stack, swarm_or_server) = setup_stack_execution(
-      &self.stack,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    swarm_or_server.verify_has_target()?;
-
-    match swarm_or_server {
-      SwarmOrServer::None => unreachable!(),
-      SwarmOrServer::Swarm(swarm) => {
-        if !self.services.is_empty() {
-          return Err(
-            anyhow!("Cannot destroy specific Stack services when in Swarm mode.")
-              .status_code(StatusCode::BAD_REQUEST)
-          );
-        }
-
-        // get the action state for the stack (or insert default).
-        let action_state = action_states()
-          .stack
-          .get_or_insert_default(&stack.id)
-          .await;
-
-        // Will check to ensure stack not already busy before updating, and return Err if so.
-        // The returned guard will set the action state back to default when dropped.
-        let _action_guard =
-          action_state.update(|state| state.destroying = true)?;
-
-        let mut update = update.clone();
-        // Send update here for UI to recheck action state
-        update_update(update.clone()).await?;
-
-        match swarm_request(
-          &swarm.config.server_ids,
-          periphery_client::api::swarm::RemoveSwarmStacks {
-            stacks: vec![stack.project_name(false)],
-            detach: false,
-          },
-        )
-        .await
-        {
-          Ok(log) => update.logs.push(log),
-          Err(e) => update.push_error_log(
-            "Destroy Stack",
-            format_serror(
-              &e.context("Failed to 'docker stack rm' on swarm")
-                .into(),
-            ),
-          ),
-        }
-
-        // Ensure cached stack state up to date by updating swarm cache
-        refresh_swarm_cache(&swarm, true).await;
-
-        update.finalize();
-        update_update(update.clone()).await?;
-
-        Ok(update)
-      }
-      SwarmOrServer::Server(server) => {
-        execute_compose_with_stack_and_server::<DestroyStack>(
-          stack,
-          server,
-          self.services,
-          |state| state.destroying = true,
-          update.clone(),
-          (self.stop_time, self.remove_orphans),
-        )
-        .await
-        .map_err(Into::into)
-      }
-    }
-  }
-}
-
 impl Resolve<ExecuteArgs> for RunStackService {
-  #[instrument(
-    "RunStackService",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      stack = self.stack,
-      service = self.service,
-      request = format!("{self:?}"),
-    )
-  )]
+  #[instrument(name = "RunStackService", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
-    let (mut stack, swarm_or_server) = setup_stack_execution(
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
+    let (mut stack, server) = get_stack_and_server(
       &self.stack,
       user,
       PermissionLevel::Execute.into(),
+      true,
     )
     .await?;
 
-    let SwarmOrServer::Server(server) = swarm_or_server else {
-      return Err(
-        anyhow!(
-          "RunStackService should not be called for Stack in Swarm Mode"
-        )
-        .status_code(StatusCode::BAD_REQUEST),
-      );
-    };
-
     let mut repo = if !stack.config.files_on_host
       && !stack.config.linked_repo.is_empty()
     {

bin/core/src/api/execute/swarm.rs

@@ -1,614 +0,0 @@
-use formatting::format_serror;
-use komodo_client::{
-  api::execute::*,
-  entities::{permission::PermissionLevel, swarm::Swarm},
-};
-use mogh_resolver::Resolve;
-
-use crate::{
-  api::execute::ExecuteArgs,
-  helpers::{swarm::swarm_request, update::update_update},
-  monitor::refresh_swarm_cache,
-  permission::get_check_permissions,
-};
-
-impl Resolve<ExecuteArgs> for RemoveSwarmNodes {
-  #[instrument(
-    "RemoveSwarmNodes",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      swarm = self.swarm,
-      nodes = serde_json::to_string(&self.nodes).unwrap_or_else(|e| e.to_string()),
-      force = self.force,
-    )
-  )]
-  async fn resolve(
-    self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    update_update(update.clone()).await?;
-
-    let mut update = update.clone();
-
-    match swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::RemoveSwarmNodes {
-        nodes: self.nodes,
-        force: self.force,
-      },
-    )
-    .await
-    {
-      Ok(log) => {
-        update.logs.push(log);
-        refresh_swarm_cache(&swarm, true).await;
-      }
-      Err(e) => update.push_error_log(
-        "Remove Swarm Nodes",
-        format_serror(
-          &e.context("Failed to remove swarm nodes").into(),
-        ),
-      ),
-    };
-
-    update.finalize();
-    update_update(update.clone()).await?;
-
-    Ok(update)
-  }
-}
-
-impl Resolve<ExecuteArgs> for UpdateSwarmNode {
-  #[instrument(
-    "UpdateSwarmNode",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      swarm = self.swarm,
-      node = self.node,
-      availability = format!("{:?}", self.availability),
-      label_add = format!("{:?}", self.label_add),
-      label_rm = format!("{:?}", self.label_rm),
-      role = format!("{:?}", self.role),
-    )
-  )]
-  async fn resolve(
-    self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    update_update(update.clone()).await?;
-
-    let mut update = update.clone();
-
-    match swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::UpdateSwarmNode {
-        node: self.node,
-        availability: self.availability,
-        label_add: self.label_add,
-        label_rm: self.label_rm,
-        role: self.role,
-      },
-    )
-    .await
-    {
-      Ok(log) => {
-        update.logs.push(log);
-        refresh_swarm_cache(&swarm, true).await;
-      }
-      Err(e) => update.push_error_log(
-        "Update Swarm Node",
-        format_serror(
-          &e.context("Failed to update swarm node").into(),
-        ),
-      ),
-    };
-
-    update.finalize();
-    update_update(update.clone()).await?;
-
-    Ok(update)
-  }
-}
-
-impl Resolve<ExecuteArgs> for RemoveSwarmStacks {
-  #[instrument(
-    "RemoveSwarmStacks",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      swarm = self.swarm,
-      stacks = serde_json::to_string(&self.stacks).unwrap_or_else(|e| e.to_string()),
-      detach = self.detach,
-    )
-  )]
-  async fn resolve(
-    self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    update_update(update.clone()).await?;
-
-    let mut update = update.clone();
-
-    match swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::RemoveSwarmStacks {
-        stacks: self.stacks,
-        detach: self.detach,
-      },
-    )
-    .await
-    {
-      Ok(log) => {
-        update.logs.push(log);
-        refresh_swarm_cache(&swarm, true).await;
-      }
-      Err(e) => update.push_error_log(
-        "Remove Swarm Stacks",
-        format_serror(
-          &e.context("Failed to remove swarm stacks").into(),
-        ),
-      ),
-    };
-
-    update.finalize();
-    update_update(update.clone()).await?;
-
-    Ok(update)
-  }
-}
-
-impl Resolve<ExecuteArgs> for RemoveSwarmServices {
-  #[instrument(
-    "RemoveSwarmServices",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      swarm = self.swarm,
-      services = serde_json::to_string(&self.services).unwrap_or_else(|e| e.to_string()),
-    )
-  )]
-  async fn resolve(
-    self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    update_update(update.clone()).await?;
-
-    let mut update = update.clone();
-
-    match swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::RemoveSwarmServices {
-        services: self.services,
-      },
-    )
-    .await
-    {
-      Ok(log) => {
-        update.logs.push(log);
-        refresh_swarm_cache(&swarm, true).await;
-      }
-      Err(e) => update.push_error_log(
-        "Remove Swarm Services",
-        format_serror(
-          &e.context("Failed to remove swarm services").into(),
-        ),
-      ),
-    };
-
-    update.finalize();
-    update_update(update.clone()).await?;
-
-    Ok(update)
-  }
-}
-
-impl Resolve<ExecuteArgs> for CreateSwarmConfig {
-  #[instrument(
-    "CreateSwarmConfig",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      swarm = self.swarm,
-      config = self.name,
-    )
-  )]
-  async fn resolve(
-    self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    update_update(update.clone()).await?;
-
-    let mut update = update.clone();
-
-    match swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::CreateSwarmConfig {
-        name: self.name,
-        data: self.data,
-        labels: self.labels,
-        template_driver: self.template_driver,
-      },
-    )
-    .await
-    {
-      Ok(log) => {
-        update.logs.push(log);
-        refresh_swarm_cache(&swarm, true).await;
-      }
-      Err(e) => update.push_error_log(
-        "Create Swarm Config",
-        format_serror(
-          &e.context("Failed to create swarm config").into(),
-        ),
-      ),
-    };
-
-    update.finalize();
-    update_update(update.clone()).await?;
-
-    Ok(update)
-  }
-}
-
-impl Resolve<ExecuteArgs> for RotateSwarmConfig {
-  #[instrument(
-    "RotateSwarmConfig",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      swarm = self.swarm,
-      config = self.config,
-    )
-  )]
-  async fn resolve(
-    self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    update_update(update.clone()).await?;
-
-    let mut update = update.clone();
-
-    match swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::RotateSwarmConfig {
-        config: self.config,
-        data: self.data,
-      },
-    )
-    .await
-    {
-      Ok(logs) => {
-        update.logs.extend(logs);
-        refresh_swarm_cache(&swarm, true).await;
-      }
-      Err(e) => update.push_error_log(
-        "Rotate Swarm Config",
-        format_serror(
-          &e.context("Failed to rotate swarm config").into(),
-        ),
-      ),
-    };
-
-    update.finalize();
-    update_update(update.clone()).await?;
-
-    Ok(update)
-  }
-}
-
-impl Resolve<ExecuteArgs> for RemoveSwarmConfigs {
-  #[instrument(
-    "RemoveSwarmConfigs",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      swarm = self.swarm,
-      configs = serde_json::to_string(&self.configs).unwrap_or_else(|e| e.to_string()),
-    )
-  )]
-  async fn resolve(
-    self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    update_update(update.clone()).await?;
-
-    let mut update = update.clone();
-
-    match swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::RemoveSwarmConfigs {
-        configs: self.configs,
-      },
-    )
-    .await
-    {
-      Ok(log) => {
-        update.logs.push(log);
-        refresh_swarm_cache(&swarm, true).await;
-      }
-      Err(e) => update.push_error_log(
-        "Remove Swarm Configs",
-        format_serror(
-          &e.context("Failed to remove swarm configs").into(),
-        ),
-      ),
-    };
-
-    update.finalize();
-    update_update(update.clone()).await?;
-
-    Ok(update)
-  }
-}
-
-impl Resolve<ExecuteArgs> for CreateSwarmSecret {
-  #[instrument(
-    "CreateSwarmSecret",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      swarm = self.swarm,
-      secret = self.name,
-    )
-  )]
-  async fn resolve(
-    self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    update_update(update.clone()).await?;
-
-    let mut update = update.clone();
-
-    match swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::CreateSwarmSecret {
-        name: self.name,
-        data: self.data,
-        driver: self.driver,
-        labels: self.labels,
-        template_driver: self.template_driver,
-      },
-    )
-    .await
-    {
-      Ok(log) => {
-        update.logs.push(log);
-        refresh_swarm_cache(&swarm, true).await;
-      }
-      Err(e) => update.push_error_log(
-        "Create Swarm Secret",
-        format_serror(
-          &e.context("Failed to create swarm secret").into(),
-        ),
-      ),
-    };
-
-    update.finalize();
-    update_update(update.clone()).await?;
-
-    Ok(update)
-  }
-}
-
-impl Resolve<ExecuteArgs> for RotateSwarmSecret {
-  #[instrument(
-    "RotateSwarmSecret",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      swarm = self.swarm,
-      secret = self.secret,
-    )
-  )]
-  async fn resolve(
-    self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    update_update(update.clone()).await?;
-
-    let mut update = update.clone();
-
-    match swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::RotateSwarmSecret {
-        secret: self.secret,
-        data: self.data,
-      },
-    )
-    .await
-    {
-      Ok(logs) => {
-        update.logs.extend(logs);
-        refresh_swarm_cache(&swarm, true).await;
-      }
-      Err(e) => update.push_error_log(
-        "Rotate Swarm Secret",
-        format_serror(
-          &e.context("Failed to rotate swarm secret").into(),
-        ),
-      ),
-    };
-
-    update.finalize();
-    update_update(update.clone()).await?;
-
-    Ok(update)
-  }
-}
-
-impl Resolve<ExecuteArgs> for RemoveSwarmSecrets {
-  #[instrument(
-    "RemoveSwarmSecrets",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      swarm = self.swarm,
-      secrets = serde_json::to_string(&self.secrets).unwrap_or_else(|e| e.to_string()),
-    )
-  )]
-  async fn resolve(
-    self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    update_update(update.clone()).await?;
-
-    let mut update = update.clone();
-
-    match swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::RemoveSwarmSecrets {
-        secrets: self.secrets,
-      },
-    )
-    .await
-    {
-      Ok(log) => {
-        update.logs.push(log);
-        refresh_swarm_cache(&swarm, true).await;
-      }
-      Err(e) => update.push_error_log(
-        "Remove Swarm Secrets",
-        format_serror(
-          &e.context("Failed to remove swarm secrets").into(),
-        ),
-      ),
-    };
-
-    update.finalize();
-    update_update(update.clone()).await?;
-
-    Ok(update)
-  }
-}

bin/core/src/api/execute/sync.rs

@@ -21,13 +21,12 @@ use komodo_client::{
     repo::Repo,
     server::Server,
     stack::Stack,
-    swarm::Swarm,
     sync::ResourceSync,
     update::{Log, Update},
     user::sync_user,
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{
   api::write::WriteArgs,
@@ -50,26 +49,11 @@ use crate::{
 use super::ExecuteArgs;
 
 impl Resolve<ExecuteArgs> for RunSync {
-  #[instrument(
-    "RunSync",
-    skip_all,
-    fields(
-      task_id = task_id.to_string(),
-      operator = user.id,
-      update_id = update.id,
-      sync = self.sync,
-      resource_type = format!("{:?}", self.resource_type),
-      resources = format!("{:?}", self.resources),
-    )
-  )]
+  #[instrument(name = "RunSync", skip(user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     self,
-    ExecuteArgs {
-      user,
-      update,
-      task_id,
-    }: &ExecuteArgs,
-  ) -> mogh_error::Result<Update> {
+    ExecuteArgs { user, update }: &ExecuteArgs,
+  ) -> serror::Result<Update> {
     let RunSync {
       sync,
       resource_type: match_resource_type,
@@ -139,36 +123,52 @@ impl Resolve<ExecuteArgs> for RunSync {
           let Some(resource_type) = match_resource_type else {
             return Some(name_or_id);
           };
-          macro_rules! resolve_id_to_name {
-            ($(($Variant:ident, $field:ident)),* $(,)?) => {
-              match ObjectId::from_str(&name_or_id) {
-                Ok(_) => match resource_type {
-                  $(
-                    ResourceTargetVariant::$Variant => all_resources
-                      .$field
-                      .get(&name_or_id)
-                      .map(|r| r.name.clone()),
-                  )*
-                  ResourceTargetVariant::System => None,
-                },
-                Err(_) => Some(name_or_id),
-              }
-            };
+          match ObjectId::from_str(&name_or_id) {
+            Ok(_) => match resource_type {
+              ResourceTargetVariant::Alerter => all_resources
+                .alerters
+                .get(&name_or_id)
+                .map(|a| a.name.clone()),
+              ResourceTargetVariant::Build => all_resources
+                .builds
+                .get(&name_or_id)
+                .map(|b| b.name.clone()),
+              ResourceTargetVariant::Builder => all_resources
+                .builders
+                .get(&name_or_id)
+                .map(|b| b.name.clone()),
+              ResourceTargetVariant::Deployment => all_resources
+                .deployments
+                .get(&name_or_id)
+                .map(|d| d.name.clone()),
+              ResourceTargetVariant::Procedure => all_resources
+                .procedures
+                .get(&name_or_id)
+                .map(|p| p.name.clone()),
+              ResourceTargetVariant::Action => all_resources
+                .actions
+                .get(&name_or_id)
+                .map(|p| p.name.clone()),
+              ResourceTargetVariant::Repo => all_resources
+                .repos
+                .get(&name_or_id)
+                .map(|r| r.name.clone()),
+              ResourceTargetVariant::Server => all_resources
+                .servers
+                .get(&name_or_id)
+                .map(|s| s.name.clone()),
+              ResourceTargetVariant::Stack => all_resources
+                .stacks
+                .get(&name_or_id)
+                .map(|s| s.name.clone()),
+              ResourceTargetVariant::ResourceSync => all_resources
+                .syncs
+                .get(&name_or_id)
+                .map(|s| s.name.clone()),
+              ResourceTargetVariant::System => None,
+            },
+            Err(_) => Some(name_or_id),
           }
-          // New resource types need to be added here manually.
-          resolve_id_to_name!(
-            (Server, servers),
-            (Swarm, swarms),
-            (Stack, stacks),
-            (Deployment, deployments),
-            (Build, builds),
-            (Repo, repos),
-            (Procedure, procedures),
-            (Action, actions),
-            (ResourceSync, syncs),
-            (Builder, builders),
-            (Alerter, alerters),
-          )
         })
         .collect::<Vec<_>>()
     });
@@ -216,39 +216,136 @@ impl Resolve<ExecuteArgs> for RunSync {
 
     let delete = sync.config.managed || sync.config.delete;
 
-    macro_rules! get_deltas {
-      ($(($var:ident, $Type:ident, $field:ident)),* $(,)?) => {
-        $(
-          let $var = if sync.config.include_resources {
-            get_updates_for_execution::<$Type>(
-              resources.$field,
-              delete,
-              match_resource_type,
-              match_resources.as_deref(),
-              &id_to_tags,
-              &sync.config.match_tags,
-            )
-            .await?
-          } else {
-            Default::default()
-          };
-        )*
-      };
-    }
-    // New resource types need to be added here manually.
-    get_deltas!(
-      (server_deltas, Server, servers),
-      (swarm_deltas, Swarm, swarms),
-      (stack_deltas, Stack, stacks),
-      (deployment_deltas, Deployment, deployments),
-      (build_deltas, Build, builds),
-      (repo_deltas, Repo, repos),
-      (procedure_deltas, Procedure, procedures),
-      (action_deltas, Action, actions),
-      (builder_deltas, Builder, builders),
-      (alerter_deltas, Alerter, alerters),
-      (resource_sync_deltas, ResourceSync, resource_syncs),
-    );
+    let server_deltas = if sync.config.include_resources {
+      get_updates_for_execution::<Server>(
+        resources.servers,
+        delete,
+        match_resource_type,
+        match_resources.as_deref(),
+        &id_to_tags,
+        &sync.config.match_tags,
+      )
+      .await?
+    } else {
+      Default::default()
+    };
+    let stack_deltas = if sync.config.include_resources {
+      get_updates_for_execution::<Stack>(
+        resources.stacks,
+        delete,
+        match_resource_type,
+        match_resources.as_deref(),
+        &id_to_tags,
+        &sync.config.match_tags,
+      )
+      .await?
+    } else {
+      Default::default()
+    };
+    let deployment_deltas = if sync.config.include_resources {
+      get_updates_for_execution::<Deployment>(
+        resources.deployments,
+        delete,
+        match_resource_type,
+        match_resources.as_deref(),
+        &id_to_tags,
+        &sync.config.match_tags,
+      )
+      .await?
+    } else {
+      Default::default()
+    };
+    let build_deltas = if sync.config.include_resources {
+      get_updates_for_execution::<Build>(
+        resources.builds,
+        delete,
+        match_resource_type,
+        match_resources.as_deref(),
+        &id_to_tags,
+        &sync.config.match_tags,
+      )
+      .await?
+    } else {
+      Default::default()
+    };
+    let repo_deltas = if sync.config.include_resources {
+      get_updates_for_execution::<Repo>(
+        resources.repos,
+        delete,
+        match_resource_type,
+        match_resources.as_deref(),
+        &id_to_tags,
+        &sync.config.match_tags,
+      )
+      .await?
+    } else {
+      Default::default()
+    };
+    let procedure_deltas = if sync.config.include_resources {
+      get_updates_for_execution::<Procedure>(
+        resources.procedures,
+        delete,
+        match_resource_type,
+        match_resources.as_deref(),
+        &id_to_tags,
+        &sync.config.match_tags,
+      )
+      .await?
+    } else {
+      Default::default()
+    };
+    let action_deltas = if sync.config.include_resources {
+      get_updates_for_execution::<Action>(
+        resources.actions,
+        delete,
+        match_resource_type,
+        match_resources.as_deref(),
+        &id_to_tags,
+        &sync.config.match_tags,
+      )
+      .await?
+    } else {
+      Default::default()
+    };
+    let builder_deltas = if sync.config.include_resources {
+      get_updates_for_execution::<Builder>(
+        resources.builders,
+        delete,
+        match_resource_type,
+        match_resources.as_deref(),
+        &id_to_tags,
+        &sync.config.match_tags,
+      )
+      .await?
+    } else {
+      Default::default()
+    };
+    let alerter_deltas = if sync.config.include_resources {
+      get_updates_for_execution::<Alerter>(
+        resources.alerters,
+        delete,
+        match_resource_type,
+        match_resources.as_deref(),
+        &id_to_tags,
+        &sync.config.match_tags,
+      )
+      .await?
+    } else {
+      Default::default()
+    };
+    let resource_sync_deltas = if sync.config.include_resources {
+      get_updates_for_execution::<entities::sync::ResourceSync>(
+        resources.resource_syncs,
+        delete,
+        match_resource_type,
+        match_resources.as_deref(),
+        &id_to_tags,
+        &sync.config.match_tags,
+      )
+      .await?
+    } else {
+      Default::default()
+    };
 
     let (
       variables_to_create,
@@ -283,11 +380,9 @@ impl Resolve<ExecuteArgs> for RunSync {
       Default::default()
     };
 
-    // New resource types need to be added here manually.
     if deploy_cache.is_empty()
       && resource_sync_deltas.no_changes()
       && server_deltas.no_changes()
-      && swarm_deltas.no_changes()
       && deployment_deltas.no_changes()
       && stack_deltas.no_changes()
       && build_deltas.no_changes()
@@ -315,11 +410,7 @@ impl Resolve<ExecuteArgs> for RunSync {
       return Ok(update);
     }
 
-    // =====================================================
-    // The ordering these are executed does matter, since
-    // latter resources may depend on prior synced resources
-    // already being updated with the declared state.
-    // =====================================================
+    // =================
 
     // No deps
     maybe_extend(
@@ -340,7 +431,10 @@ impl Resolve<ExecuteArgs> for RunSync {
       )
       .await,
     );
-
+    maybe_extend(
+      &mut update.logs,
+      ResourceSync::execute_sync_updates(resource_sync_deltas).await,
+    );
     maybe_extend(
       &mut update.logs,
       Server::execute_sync_updates(server_deltas).await,
@@ -354,43 +448,34 @@ impl Resolve<ExecuteArgs> for RunSync {
       Action::execute_sync_updates(action_deltas).await,
     );
 
-    // Depends on server
-    maybe_extend(
-      &mut update.logs,
-      Swarm::execute_sync_updates(swarm_deltas).await,
-    );
-    // Depends on server
+    // Dependent on server
     maybe_extend(
       &mut update.logs,
       Builder::execute_sync_updates(builder_deltas).await,
     );
-    // Depends on server / builder
     maybe_extend(
       &mut update.logs,
       Repo::execute_sync_updates(repo_deltas).await,
     );
 
-    // Depends on builder / repo
+    // Dependant on builder
     maybe_extend(
       &mut update.logs,
       Build::execute_sync_updates(build_deltas).await,
     );
-    // Depends on server / repo
-    maybe_extend(
-      &mut update.logs,
-      Stack::execute_sync_updates(stack_deltas).await,
-    );
-    // Depends on repo
-    maybe_extend(
-      &mut update.logs,
-      ResourceSync::execute_sync_updates(resource_sync_deltas).await,
-    );
-    // Depends on server / build
+
+    // Dependant on server / build
     maybe_extend(
       &mut update.logs,
       Deployment::execute_sync_updates(deployment_deltas).await,
     );
-    // Depends on everything
+    // stack only depends on server, but maybe will depend on build later.
+    maybe_extend(
+      &mut update.logs,
+      Stack::execute_sync_updates(stack_deltas).await,
+    );
+
+    // Dependant on everything
     maybe_extend(
       &mut update.logs,
       Procedure::execute_sync_updates(procedure_deltas).await,

bin/core/src/api/listener/integrations/mod.rs

@@ -1,4 +0,0 @@
-pub mod github;
-pub mod gitlab;
-
-use super::{ExtractBranch, VerifySecret};

bin/core/src/api/mod.rs

@@ -1,57 +1,11 @@
-use axum::{Extension, Router, routing::get};
-use komodo_client::entities::user::User;
-use mogh_auth_server::middleware::authenticate_request;
-use mogh_error::Json;
-use mogh_server::{
-  cors::cors_layer, session::memory_session_layer,
-  ui::serve_static_ui,
-};
-
-use crate::{auth::KomodoAuthImpl, config::core_config, ts_client};
-
+pub mod auth;
 pub mod execute;
 pub mod read;
+pub mod terminal;
+pub mod user;
 pub mod write;
 
-mod listener;
-mod openapi;
-mod terminal;
-mod ws;
-
 #[derive(serde::Deserialize)]
 struct Variant {
   variant: String,
 }
-
-pub fn app() -> Router {
-  let config = core_config();
-  Router::new()
-    .merge(openapi::serve_docs())
-    .route("/version", get(|| async { env!("CARGO_PKG_VERSION") }))
-    .nest("/auth", mogh_auth_server::api::router::<KomodoAuthImpl>())
-    .nest("/user", user_router())
-    .nest("/read", read::router())
-    .nest("/write", write::router())
-    .nest("/execute", execute::router())
-    .nest("/terminal", terminal::router())
-    .nest("/listener", listener::router())
-    .nest("/ws", ws::router())
-    .nest("/client", ts_client::router())
-    .layer(memory_session_layer(config))
-    .fallback_service(serve_static_ui(
-      &config.ui_path,
-      config.ui_index_force_no_cache,
-    ))
-    .layer(cors_layer(config))
-}
-
-fn user_router() -> Router {
-  Router::new()
-    .route(
-      "/",
-      get(|Extension(user): Extension<User>| async { Json(user) }),
-    )
-    .layer(axum::middleware::from_fn(
-      authenticate_request::<KomodoAuthImpl, false>,
-    ))
-}

bin/core/src/api/openapi/docs.html

@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-
-<head>
-  <title>Komodo API Docs</title>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-</head>
-
-<body>
-
-  <script id="api-reference" type="application/json">
-    $spec
-</script>
-  <script src="https://cdn.jsdelivr.net/npm/@scalar/api-reference"></script>
-</body>
-
-</html>

bin/core/src/api/openapi/mod.rs

@@ -1,8 +0,0 @@
-use komodo_client::openapi::KomodoApi;
-use utoipa::OpenApi as _;
-use utoipa_scalar::{Scalar, Servable as _};
-
-pub fn serve_docs() -> Scalar<utoipa::openapi::OpenApi> {
-  Scalar::with_url("/docs", KomodoApi::openapi())
-    .custom_html(include_str!("docs.html"))
-}

bin/core/src/api/read/action.rs

@@ -3,16 +3,15 @@ use komodo_client::{
   api::read::*,
   entities::{
     action::{
-      Action, ActionActionState, ActionListItem, ActionSortBy,
-      ActionState,
+      Action, ActionActionState, ActionListItem, ActionState,
     },
     permission::PermissionLevel,
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{
-  helpers::query::{get_action_state, get_all_tags},
+  helpers::query::get_all_tags,
   permission::get_check_permissions,
   resource,
   state::{action_state_cache, action_states},
@@ -24,7 +23,7 @@ impl Resolve<ReadArgs> for GetAction {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Action> {
+  ) -> serror::Result<Action> {
     Ok(
       get_check_permissions::<Action>(
         &self.action,
@@ -40,45 +39,21 @@ impl Resolve<ReadArgs> for ListActions {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Vec<ActionListItem>> {
+  ) -> serror::Result<Vec<ActionListItem>> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let states = self.query.specific.states.clone();
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
-    let sort_by: resource::ListItemSort<ActionListItem> =
-      match self.sort_by {
-        ActionSortBy::Name => resource::ListItemSort::Name,
-        ActionSortBy::State => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.state.to_string().cmp(&b.info.state.to_string())
-          }))
-        }
-        ActionSortBy::NextRun => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.next_scheduled_run.cmp(&b.info.next_scheduled_run)
-          }))
-        }
-      };
-    let actions = resource::list_items_for_user::<Action>(
-      self.query,
-      resource::ListItemsQueryOptions {
-        limit,
-        page: self.page,
-        sort_desc: self.sort_desc,
-        sort_by,
-      },
-      user,
-      PermissionLevel::Read.into(),
-      &all_tags,
-      |action| {
-        states.is_empty() || states.contains(&action.info.state)
-      },
+    Ok(
+      resource::list_for_user::<Action>(
+        self.query,
+        user,
+        PermissionLevel::Read.into(),
+        &all_tags,
+      )
+      .await?,
     )
-    .await?;
-    Ok(actions)
   }
 }
 
@@ -86,34 +61,18 @@ impl Resolve<ReadArgs> for ListFullActions {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListFullActionsResponse> {
+  ) -> serror::Result<ListFullActionsResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let states = self.query.specific.states.clone();
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
     Ok(
-      resource::list_full_for_user_filtered::<Action, _>(
+      resource::list_full_for_user::<Action>(
         self.query,
-        limit,
-        self.page,
         user,
         PermissionLevel::Read.into(),
         &all_tags,
-        |action| {
-          let states = states.clone();
-          async move {
-            if states.is_empty()
-              || states.contains(&get_action_state(&action.id).await)
-            {
-              Some(action)
-            } else {
-              None
-            }
-          }
-        },
       )
       .await?,
     )
@@ -124,7 +83,7 @@ impl Resolve<ReadArgs> for GetActionActionState {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ActionActionState> {
+  ) -> serror::Result<ActionActionState> {
     let action = get_check_permissions::<Action>(
       &self.action,
       user,
@@ -145,11 +104,9 @@ impl Resolve<ReadArgs> for GetActionsSummary {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetActionsSummaryResponse> {
+  ) -> serror::Result<GetActionsSummaryResponse> {
     let actions = resource::list_full_for_user::<Action>(
       Default::default(),
-      None,
-      None,
       user,
       PermissionLevel::Read.into(),
       &[],

bin/core/src/api/read/alert.rs

@@ -8,15 +8,15 @@ use komodo_client::{
   api::read::{
     GetAlert, GetAlertResponse, ListAlerts, ListAlertsResponse,
   },
-  entities::permission::PermissionLevel,
+  entities::{
+    deployment::Deployment, server::Server, stack::Stack,
+    sync::ResourceSync,
+  },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{
-  config::core_config,
-  permission::{
-    check_user_target_access, user_resource_target_query,
-  },
+  config::core_config, permission::get_resource_ids_for_user,
   state::db_client,
 };
 
@@ -28,11 +28,26 @@ impl Resolve<ReadArgs> for ListAlerts {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListAlertsResponse> {
-    // Alerts
-    let query = user_resource_target_query(user, self.query)
-      .await?
-      .unwrap_or_default();
+  ) -> serror::Result<ListAlertsResponse> {
+    let mut query = self.query.unwrap_or_default();
+    if !user.admin && !core_config().transparent_mode {
+      let server_ids =
+        get_resource_ids_for_user::<Server>(user).await?;
+      let stack_ids =
+        get_resource_ids_for_user::<Stack>(user).await?;
+      let deployment_ids =
+        get_resource_ids_for_user::<Deployment>(user).await?;
+      let sync_ids =
+        get_resource_ids_for_user::<ResourceSync>(user).await?;
+      query.extend(doc! {
+        "$or": [
+          { "target.type": "Server", "target.id": { "$in": &server_ids } },
+          { "target.type": "Stack", "target.id": { "$in": &stack_ids } },
+          { "target.type": "Deployment", "target.id": { "$in": &deployment_ids } },
+          { "target.type": "ResourceSync", "target.id": { "$in": &sync_ids } },
+        ]
+      });
+    }
 
     let alerts = find_collect(
       &db_client().alerts,
@@ -40,7 +55,7 @@ impl Resolve<ReadArgs> for ListAlerts {
       FindOptions::builder()
         .sort(doc! { "ts": -1 })
         .limit(NUM_ALERTS_PER_PAGE as i64)
-        .skip(self.page.saturating_mul(NUM_ALERTS_PER_PAGE))
+        .skip(self.page * NUM_ALERTS_PER_PAGE)
         .build(),
     )
     .await
@@ -61,21 +76,13 @@ impl Resolve<ReadArgs> for ListAlerts {
 impl Resolve<ReadArgs> for GetAlert {
   async fn resolve(
     self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetAlertResponse> {
-    let alert = find_one_by_id(&db_client().alerts, &self.id)
-      .await
-      .context("failed to query db for alert")?
-      .context("no alert found with given id")?;
-    if user.admin || core_config().transparent_mode {
-      return Ok(alert);
-    }
-    check_user_target_access(
-      &alert.target,
-      user,
-      PermissionLevel::Read.into(),
+    _: &ReadArgs,
+  ) -> serror::Result<GetAlertResponse> {
+    Ok(
+      find_one_by_id(&db_client().alerts, &self.id)
+        .await
+        .context("failed to query db for alert")?
+        .context("no alert found with given id")?,
     )
-    .await?;
-    Ok(alert)
   }
 }

bin/core/src/api/read/alerter.rs

@@ -4,17 +4,15 @@ use database::mungos::mongodb::bson::doc;
 use komodo_client::{
   api::read::*,
   entities::{
-    alerter::{Alerter, AlerterListItem, AlerterSortBy},
+    alerter::{Alerter, AlerterListItem},
     permission::PermissionLevel,
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{
-  helpers::query::get_all_tags,
-  permission::{get_check_permissions, list_resource_ids_for_user},
-  resource,
-  state::db_client,
+  helpers::query::get_all_tags, permission::get_check_permissions,
+  resource, state::db_client,
 };
 
 use super::ReadArgs;
@@ -23,7 +21,7 @@ impl Resolve<ReadArgs> for GetAlerter {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Alerter> {
+  ) -> serror::Result<Alerter> {
     Ok(
       get_check_permissions::<Alerter>(
         &self.alerter,
@@ -39,36 +37,18 @@ impl Resolve<ReadArgs> for ListAlerters {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Vec<AlerterListItem>> {
+  ) -> serror::Result<Vec<AlerterListItem>> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
-    let sort_by: resource::ListItemSort<AlerterListItem> =
-      match self.sort_by {
-        AlerterSortBy::Name => resource::ListItemSort::Name,
-        AlerterSortBy::Type => {
-          resource::ListItemSort::DbField("config.endpoint.type")
-        }
-        AlerterSortBy::Enabled => {
-          resource::ListItemSort::DbField("config.enabled")
-        }
-      };
     Ok(
-      resource::list_items_for_user::<Alerter>(
+      resource::list_for_user::<Alerter>(
         self.query,
-        resource::ListItemsQueryOptions {
-          limit,
-          page: self.page,
-          sort_desc: self.sort_desc,
-          sort_by,
-        },
         user,
         PermissionLevel::Read.into(),
         &all_tags,
-        |_| true,
       )
       .await?,
     )
@@ -79,18 +59,15 @@ impl Resolve<ReadArgs> for ListFullAlerters {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListFullAlertersResponse> {
+  ) -> serror::Result<ListFullAlertersResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
     Ok(
       resource::list_full_for_user::<Alerter>(
         self.query,
-        limit as i64,
-        self.page.saturating_mul(limit),
         user,
         PermissionLevel::Read.into(),
         &all_tags,
@@ -104,14 +81,10 @@ impl Resolve<ReadArgs> for GetAlertersSummary {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetAlertersSummaryResponse> {
-    let query = match list_resource_ids_for_user::<Alerter>(
-      Default::default(),
-      None,
-      None,
-      user,
-      PermissionLevel::Read.into(),
-    )
+  ) -> serror::Result<GetAlertersSummaryResponse> {
+    let query = match resource::get_resource_object_ids_for_user::<
+      Alerter,
+    >(user)
     .await?
     {
       Some(ids) => doc! {

bin/core/src/api/read/build.rs

@@ -6,25 +6,27 @@ use database::mungos::{
   find::find_collect,
   mongodb::{bson::doc, options::FindOptions},
 };
-use futures_util::TryStreamExt;
+use futures::TryStreamExt;
 use komodo_client::{
   api::read::*,
   entities::{
     Operation,
-    build::{
-      Build, BuildActionState, BuildListItem, BuildSortBy, BuildState,
-    },
+    build::{Build, BuildActionState, BuildListItem, BuildState},
+    config::core::CoreConfig,
     permission::PermissionLevel,
     update::UpdateStatus,
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{
+  config::core_config,
   helpers::query::get_all_tags,
   permission::get_check_permissions,
   resource,
-  state::{action_states, build_state_cache, db_client},
+  state::{
+    action_states, build_state_cache, db_client, github_client,
+  },
 };
 
 use super::ReadArgs;
@@ -33,7 +35,7 @@ impl Resolve<ReadArgs> for GetBuild {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Build> {
+  ) -> serror::Result<Build> {
     Ok(
       get_check_permissions::<Build>(
         &self.build,
@@ -49,43 +51,21 @@ impl Resolve<ReadArgs> for ListBuilds {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Vec<BuildListItem>> {
+  ) -> serror::Result<Vec<BuildListItem>> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let states = self.query.specific.states.clone();
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
-    let sort_by: resource::ListItemSort<BuildListItem> =
-      match self.sort_by {
-        BuildSortBy::Name => resource::ListItemSort::Name,
-        BuildSortBy::Source => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.repo.cmp(&b.info.repo)
-          }))
-        }
-        BuildSortBy::State => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.state.to_string().cmp(&b.info.state.to_string())
-          }))
-        }
-      };
-    let builds = resource::list_items_for_user::<Build>(
-      self.query,
-      resource::ListItemsQueryOptions {
-        limit,
-        page: self.page,
-        sort_desc: self.sort_desc,
-        sort_by,
-      },
-      user,
-      PermissionLevel::Read.into(),
-      &all_tags,
-      |build| states.is_empty() || states.contains(&build.info.state),
+    Ok(
+      resource::list_for_user::<Build>(
+        self.query,
+        user,
+        PermissionLevel::Read.into(),
+        &all_tags,
+      )
+      .await?,
     )
-    .await?;
-    Ok(builds)
   }
 }
 
@@ -93,35 +73,18 @@ impl Resolve<ReadArgs> for ListFullBuilds {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListFullBuildsResponse> {
+  ) -> serror::Result<ListFullBuildsResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let states = self.query.specific.states.clone();
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
     Ok(
-      resource::list_full_for_user_filtered::<Build, _>(
+      resource::list_full_for_user::<Build>(
         self.query,
-        limit,
-        self.page,
         user,
         PermissionLevel::Read.into(),
         &all_tags,
-        |build| {
-          let states = states.clone();
-          async move {
-            if states.is_empty()
-              || states
-                .contains(&resource::get_build_state(&build.id).await)
-            {
-              Some(build)
-            } else {
-              None
-            }
-          }
-        },
       )
       .await?,
     )
@@ -132,7 +95,7 @@ impl Resolve<ReadArgs> for GetBuildActionState {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<BuildActionState> {
+  ) -> serror::Result<BuildActionState> {
     let build = get_check_permissions::<Build>(
       &self.build,
       user,
@@ -153,11 +116,9 @@ impl Resolve<ReadArgs> for GetBuildsSummary {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetBuildsSummaryResponse> {
+  ) -> serror::Result<GetBuildsSummaryResponse> {
     let builds = resource::list_full_for_user::<Build>(
       Default::default(),
-      None,
-      None,
       user,
       PermissionLevel::Read.into(),
       &[],
@@ -203,12 +164,11 @@ impl Resolve<ReadArgs> for GetBuildMonthlyStats {
   async fn resolve(
     self,
     _: &ReadArgs,
-  ) -> mogh_error::Result<GetBuildMonthlyStatsResponse> {
+  ) -> serror::Result<GetBuildMonthlyStatsResponse> {
     let curr_ts = unix_timestamp_ms() as i64;
     let next_day = curr_ts - curr_ts % ONE_DAY_MS + ONE_DAY_MS;
 
-    let close_ts =
-      next_day - (self.page as i64).saturating_mul(30 * ONE_DAY_MS);
+    let close_ts = next_day - self.page as i64 * 30 * ONE_DAY_MS;
     let open_ts = close_ts - 30 * ONE_DAY_MS;
 
     let mut build_updates = db_client()
@@ -260,7 +220,7 @@ impl Resolve<ReadArgs> for ListBuildVersions {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Vec<BuildVersionResponseItem>> {
+  ) -> serror::Result<Vec<BuildVersionResponseItem>> {
     let ListBuildVersions {
       build,
       major,
@@ -317,7 +277,7 @@ impl Resolve<ReadArgs> for ListCommonBuildExtraArgs {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListCommonBuildExtraArgsResponse> {
+  ) -> serror::Result<ListCommonBuildExtraArgsResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
@@ -325,8 +285,6 @@ impl Resolve<ReadArgs> for ListCommonBuildExtraArgs {
     };
     let builds = resource::list_full_for_user::<Build>(
       self.query,
-      None,
-      None,
       user,
       PermissionLevel::Read.into(),
       &all_tags,
@@ -348,3 +306,81 @@ impl Resolve<ReadArgs> for ListCommonBuildExtraArgs {
     Ok(res)
   }
 }
+
+impl Resolve<ReadArgs> for GetBuildWebhookEnabled {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<GetBuildWebhookEnabledResponse> {
+    let Some(github) = github_client() else {
+      return Ok(GetBuildWebhookEnabledResponse {
+        managed: false,
+        enabled: false,
+      });
+    };
+
+    let build = get_check_permissions::<Build>(
+      &self.build,
+      user,
+      PermissionLevel::Read.into(),
+    )
+    .await?;
+
+    if build.config.git_provider != "github.com"
+      || build.config.repo.is_empty()
+    {
+      return Ok(GetBuildWebhookEnabledResponse {
+        managed: false,
+        enabled: false,
+      });
+    }
+
+    let mut split = build.config.repo.split('/');
+    let owner = split.next().context("Build repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Ok(GetBuildWebhookEnabledResponse {
+        managed: false,
+        enabled: false,
+      });
+    };
+
+    let repo =
+      split.next().context("Build repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      ..
+    } = core_config();
+
+    let host = if webhook_base_url.is_empty() {
+      host
+    } else {
+      webhook_base_url
+    };
+    let url = format!("{host}/listener/github/build/{}", build.id);
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == url {
+        return Ok(GetBuildWebhookEnabledResponse {
+          managed: true,
+          enabled: true,
+        });
+      }
+    }
+
+    Ok(GetBuildWebhookEnabledResponse {
+      managed: true,
+      enabled: false,
+    })
+  }
+}

bin/core/src/api/read/builder.rs

@@ -4,17 +4,15 @@ use database::mungos::mongodb::bson::doc;
 use komodo_client::{
   api::read::*,
   entities::{
-    builder::{Builder, BuilderListItem, BuilderSortBy},
+    builder::{Builder, BuilderListItem},
     permission::PermissionLevel,
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{
-  helpers::query::get_all_tags,
-  permission::{get_check_permissions, list_resource_ids_for_user},
-  resource,
-  state::db_client,
+  helpers::query::get_all_tags, permission::get_check_permissions,
+  resource, state::db_client,
 };
 
 use super::ReadArgs;
@@ -23,7 +21,7 @@ impl Resolve<ReadArgs> for GetBuilder {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Builder> {
+  ) -> serror::Result<Builder> {
     Ok(
       get_check_permissions::<Builder>(
         &self.builder,
@@ -39,38 +37,18 @@ impl Resolve<ReadArgs> for ListBuilders {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Vec<BuilderListItem>> {
+  ) -> serror::Result<Vec<BuilderListItem>> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
-    let sort_by: resource::ListItemSort<BuilderListItem> =
-      match self.sort_by {
-        BuilderSortBy::Name => resource::ListItemSort::Name,
-        BuilderSortBy::Provider => {
-          resource::ListItemSort::DbField("config.type")
-        }
-        BuilderSortBy::InstanceType => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.instance_type.cmp(&b.info.instance_type)
-          }))
-        }
-      };
     Ok(
-      resource::list_items_for_user::<Builder>(
+      resource::list_for_user::<Builder>(
         self.query,
-        resource::ListItemsQueryOptions {
-          limit,
-          page: self.page,
-          sort_desc: self.sort_desc,
-          sort_by,
-        },
         user,
         PermissionLevel::Read.into(),
         &all_tags,
-        |_| true,
       )
       .await?,
     )
@@ -81,18 +59,15 @@ impl Resolve<ReadArgs> for ListFullBuilders {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListFullBuildersResponse> {
+  ) -> serror::Result<ListFullBuildersResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
     Ok(
       resource::list_full_for_user::<Builder>(
         self.query,
-        limit as i64,
-        self.page.saturating_mul(limit),
         user,
         PermissionLevel::Read.into(),
         &all_tags,
@@ -106,14 +81,10 @@ impl Resolve<ReadArgs> for GetBuildersSummary {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetBuildersSummaryResponse> {
-    let query = match list_resource_ids_for_user::<Builder>(
-      None,
-      None,
-      None,
-      user,
-      PermissionLevel::Read.into(),
-    )
+  ) -> serror::Result<GetBuildersSummaryResponse> {
+    let query = match resource::get_resource_object_ids_for_user::<
+      Builder,
+    >(user)
     .await?
     {
       Some(ids) => doc! {

bin/core/src/api/read/deployment.rs

@@ -4,33 +4,23 @@ use anyhow::{Context, anyhow};
 use komodo_client::{
   api::read::*,
   entities::{
-    SwarmOrServer,
     deployment::{
-      Deployment, DeploymentActionState, DeploymentListItem,
-      DeploymentSortBy, DeploymentState,
-    },
-    docker::{
-      container::{Container, ContainerStats},
-      service::SwarmService,
+      Deployment, DeploymentActionState, DeploymentConfig,
+      DeploymentListItem, DeploymentState,
     },
+    docker::container::{Container, ContainerStats},
     permission::PermissionLevel,
     server::{Server, ServerState},
     update::Log,
   },
 };
-use mogh_error::AddStatusCodeError as _;
-use mogh_resolver::Resolve;
 use periphery_client::api::{self, container::InspectContainer};
-use reqwest::StatusCode;
+use resolver_api::Resolve;
 
 use crate::{
-  helpers::{
-    periphery_client,
-    query::{get_all_tags, get_deployment_state},
-    swarm::swarm_request,
-  },
+  helpers::{periphery_client, query::get_all_tags},
   permission::get_check_permissions,
-  resource::{self, setup_deployment_execution},
+  resource,
   state::{
     action_states, deployment_status_cache, server_status_cache,
   },
@@ -42,7 +32,7 @@ impl Resolve<ReadArgs> for GetDeployment {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Deployment> {
+  ) -> serror::Result<Deployment> {
     Ok(
       get_check_permissions::<Deployment>(
         &self.deployment,
@@ -58,62 +48,28 @@ impl Resolve<ReadArgs> for ListDeployments {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Vec<DeploymentListItem>> {
+  ) -> serror::Result<Vec<DeploymentListItem>> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
     let only_update_available = self.query.specific.update_available;
-    let states = self.query.specific.states.clone();
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
-    let sort_by: resource::ListItemSort<DeploymentListItem> =
-      match self.sort_by {
-        DeploymentSortBy::Name => resource::ListItemSort::Name,
-        DeploymentSortBy::Image => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.image.cmp(&b.info.image)
-          }))
-        }
-        DeploymentSortBy::Host => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            let host_a = if a.info.swarm_id.is_empty() {
-              &a.info.server_name
-            } else {
-              &a.info.swarm_name
-            };
-            let host_b = if b.info.swarm_id.is_empty() {
-              &b.info.server_name
-            } else {
-              &b.info.swarm_name
-            };
-            host_a.cmp(host_b)
-          }))
-        }
-        DeploymentSortBy::State => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.state.to_string().cmp(&b.info.state.to_string())
-          }))
-        }
-      };
-    let deployments = resource::list_items_for_user::<Deployment>(
+    let deployments = resource::list_for_user::<Deployment>(
       self.query,
-      resource::ListItemsQueryOptions {
-        limit,
-        page: self.page,
-        sort_desc: self.sort_desc,
-        sort_by,
-      },
       user,
       PermissionLevel::Read.into(),
       &all_tags,
-      |deployment| {
-        (!only_update_available || deployment.info.update_available)
-          && (states.is_empty()
-            || states.contains(&deployment.info.state))
-      },
     )
     .await?;
+    let deployments = if only_update_available {
+      deployments
+        .into_iter()
+        .filter(|deployment| deployment.info.update_available)
+        .collect()
+    } else {
+      deployments
+    };
     Ok(deployments)
   }
 }
@@ -122,38 +78,18 @@ impl Resolve<ReadArgs> for ListFullDeployments {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListFullDeploymentsResponse> {
+  ) -> serror::Result<ListFullDeploymentsResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let states = self.query.specific.states.clone();
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
     Ok(
-      resource::list_full_for_user_filtered::<Deployment, _>(
+      resource::list_full_for_user::<Deployment>(
         self.query,
-        limit,
-        self.page,
         user,
         PermissionLevel::Read.into(),
         &all_tags,
-        |deployment| {
-          let states = states.clone();
-          async move {
-            if states.is_empty()
-              || states.contains(
-                &get_deployment_state(&deployment.id)
-                  .await
-                  .unwrap_or_default(),
-              )
-            {
-              Some(deployment)
-            } else {
-              None
-            }
-          }
-        },
       )
       .await?,
     )
@@ -164,7 +100,7 @@ impl Resolve<ReadArgs> for GetDeploymentContainer {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetDeploymentContainerResponse> {
+  ) -> serror::Result<GetDeploymentContainerResponse> {
     let deployment = get_check_permissions::<Deployment>(
       &self.deployment,
       user,
@@ -189,49 +125,36 @@ impl Resolve<ReadArgs> for GetDeploymentLog {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Log> {
+  ) -> serror::Result<Log> {
     let GetDeploymentLog {
       deployment,
       tail,
       timestamps,
     } = self;
-
-    let (deployment, swarm_or_server) = setup_deployment_execution(
+    let Deployment {
+      name,
+      config: DeploymentConfig { server_id, .. },
+      ..
+    } = get_check_permissions::<Deployment>(
       &deployment,
       user,
       PermissionLevel::Read.logs(),
     )
     .await?;
-
-    swarm_or_server.verify_has_target()?;
-
-    let log = match swarm_or_server {
-      SwarmOrServer::None => unreachable!(),
-      SwarmOrServer::Swarm(swarm) => swarm_request(
-        &swarm.config.server_ids,
-        periphery_client::api::swarm::GetSwarmServiceLog {
-          service: deployment.deployed_name().to_string(),
-          tail,
-          timestamps,
-          no_task_ids: false,
-          no_resolve: false,
-          details: false,
-        },
-      )
+    if server_id.is_empty() {
+      return Ok(Log::default());
+    }
+    let server = resource::get::<Server>(&server_id).await?;
+    let res = periphery_client(&server)
+      .await?
+      .request(api::container::GetContainerLog {
+        name,
+        tail: cmp::min(tail, MAX_LOG_LENGTH),
+        timestamps,
+      })
       .await
-      .context("Failed to get service log from swarm")?,
-      SwarmOrServer::Server(server) => periphery_client(&server)
-        .await?
-        .request(api::container::GetContainerLog {
-          name: deployment.deployed_name().to_string(),
-          tail: cmp::min(tail, MAX_LOG_LENGTH),
-          timestamps,
-        })
-        .await
-        .context("failed at call to periphery")?,
-    };
-
-    Ok(log)
+      .context("failed at call to periphery")?;
+    Ok(res)
   }
 }
 
@@ -239,7 +162,7 @@ impl Resolve<ReadArgs> for SearchDeploymentLog {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Log> {
+  ) -> serror::Result<Log> {
     let SearchDeploymentLog {
       deployment,
       terms,
@@ -247,47 +170,32 @@ impl Resolve<ReadArgs> for SearchDeploymentLog {
       invert,
       timestamps,
     } = self;
-
-    let (deployment, swarm_or_server) = setup_deployment_execution(
+    let Deployment {
+      name,
+      config: DeploymentConfig { server_id, .. },
+      ..
+    } = get_check_permissions::<Deployment>(
       &deployment,
       user,
       PermissionLevel::Read.logs(),
     )
     .await?;
-
-    swarm_or_server.verify_has_target()?;
-
-    let log = match swarm_or_server {
-      SwarmOrServer::None => unreachable!(),
-      SwarmOrServer::Swarm(swarm) => swarm_request(
-        &swarm.config.server_ids,
-        periphery_client::api::swarm::GetSwarmServiceLogSearch {
-          service: deployment.deployed_name().to_string(),
-          terms,
-          combinator,
-          invert,
-          timestamps,
-          no_task_ids: false,
-          no_resolve: false,
-          details: false,
-        },
-      )
+    if server_id.is_empty() {
+      return Ok(Log::default());
+    }
+    let server = resource::get::<Server>(&server_id).await?;
+    let res = periphery_client(&server)
+      .await?
+      .request(api::container::GetContainerLogSearch {
+        name,
+        terms,
+        combinator,
+        invert,
+        timestamps,
+      })
       .await
-      .context("Failed to search service log from swarm")?,
-      SwarmOrServer::Server(server) => periphery_client(&server)
-        .await?
-        .request(api::container::GetContainerLogSearch {
-          name: deployment.deployed_name().to_string(),
-          terms,
-          combinator,
-          invert,
-          timestamps,
-        })
-        .await
-        .context("Failed to search container log from server")?,
-    };
-
-    Ok(log)
+      .context("failed at call to periphery")?;
+    Ok(res)
   }
 }
 
@@ -295,80 +203,44 @@ impl Resolve<ReadArgs> for InspectDeploymentContainer {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Container> {
+  ) -> serror::Result<Container> {
     let InspectDeploymentContainer { deployment } = self;
-    let (deployment, swarm_or_server) = setup_deployment_execution(
+    let Deployment {
+      name,
+      config: DeploymentConfig { server_id, .. },
+      ..
+    } = get_check_permissions::<Deployment>(
       &deployment,
       user,
       PermissionLevel::Read.inspect(),
     )
     .await?;
-
-    let SwarmOrServer::Server(server) = swarm_or_server else {
+    if server_id.is_empty() {
       return Err(
         anyhow!(
-          "InspectDeploymentContainer should not be called for Deployment in Swarm Mode"
+          "Cannot inspect deployment, not attached to any server"
         )
-        .status_code(StatusCode::BAD_REQUEST),
+        .into(),
       );
-    };
-
+    }
+    let server = resource::get::<Server>(&server_id).await?;
     let cache = server_status_cache()
       .get_or_insert_default(&server.id)
       .await;
-
     if cache.state != ServerState::Ok {
       return Err(
         anyhow!(
-          "Cannot inspect container: Server is {:?}",
+          "Cannot inspect container: server is {:?}",
           cache.state
         )
         .into(),
       );
     }
-
-    periphery_client(&server)
+    let res = periphery_client(&server)
       .await?
-      .request(InspectContainer {
-        name: deployment.deployed_name().to_string(),
-      })
-      .await
-      .context("Failed to inspect container on server")
-      .map_err(Into::into)
-  }
-}
-
-impl Resolve<ReadArgs> for InspectDeploymentSwarmService {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<SwarmService> {
-    let InspectDeploymentSwarmService { deployment } = self;
-    let (deployment, swarm_or_server) = setup_deployment_execution(
-      &deployment,
-      user,
-      PermissionLevel::Read.logs(),
-    )
-    .await?;
-
-    let SwarmOrServer::Swarm(swarm) = swarm_or_server else {
-      return Err(
-        anyhow!(
-          "InspectDeploymentSwarmService should only be called for Deployment in Swarm Mode"
-        )
-        .status_code(StatusCode::BAD_REQUEST),
-      );
-    };
-
-    swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::InspectSwarmService {
-        service: deployment.deployed_name().to_string(),
-      },
-    )
-    .await
-    .context("Failed to inspect service on swarm")
-    .map_err(Into::into)
+      .request(InspectContainer { name })
+      .await?;
+    Ok(res)
   }
 }
 
@@ -376,25 +248,26 @@ impl Resolve<ReadArgs> for GetDeploymentStats {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ContainerStats> {
-    let deployment = get_check_permissions::<Deployment>(
+  ) -> serror::Result<ContainerStats> {
+    let Deployment {
+      name,
+      config: DeploymentConfig { server_id, .. },
+      ..
+    } = get_check_permissions::<Deployment>(
       &self.deployment,
       user,
       PermissionLevel::Read.into(),
     )
     .await?;
-    if deployment.config.server_id.is_empty() {
+    if server_id.is_empty() {
       return Err(
-        anyhow!("Deployment has no Server attached").into(),
+        anyhow!("deployment has no server attached").into(),
       );
     }
-    let server =
-      resource::get::<Server>(&deployment.config.server_id).await?;
+    let server = resource::get::<Server>(&server_id).await?;
     let res = periphery_client(&server)
       .await?
-      .request(api::container::GetContainerStats {
-        name: deployment.deployed_name().to_string(),
-      })
+      .request(api::container::GetContainerStats { name })
       .await
       .context("failed to get stats from periphery")?;
     Ok(res)
@@ -405,7 +278,7 @@ impl Resolve<ReadArgs> for GetDeploymentActionState {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<DeploymentActionState> {
+  ) -> serror::Result<DeploymentActionState> {
     let deployment = get_check_permissions::<Deployment>(
       &self.deployment,
       user,
@@ -426,11 +299,9 @@ impl Resolve<ReadArgs> for GetDeploymentsSummary {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetDeploymentsSummaryResponse> {
+  ) -> serror::Result<GetDeploymentsSummaryResponse> {
     let deployments = resource::list_full_for_user::<Deployment>(
       Default::default(),
-      None,
-      None,
       user,
       PermissionLevel::Read.into(),
       &[],
@@ -471,7 +342,7 @@ impl Resolve<ReadArgs> for ListCommonDeploymentExtraArgs {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListCommonDeploymentExtraArgsResponse> {
+  ) -> serror::Result<ListCommonDeploymentExtraArgsResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
@@ -479,8 +350,6 @@ impl Resolve<ReadArgs> for ListCommonDeploymentExtraArgs {
     };
     let deployments = resource::list_full_for_user::<Deployment>(
       self.query,
-      None,
-      None,
       user,
       PermissionLevel::Read.into(),
       &all_tags,

bin/core/src/api/read/docker.rs

@@ -1,563 +0,0 @@
-use std::cmp;
-
-use anyhow::{Context as _, anyhow};
-use database::bson::doc;
-use komodo_client::{
-  api::read::*,
-  entities::{
-    ResourceTarget,
-    deployment::Deployment,
-    docker::{
-      container::{
-        Container, ContainerListItem, ContainerStateStatusEnum,
-      },
-      image::{Image, ImageHistoryResponseItem},
-      network::Network,
-      volume::Volume,
-    },
-    permission::PermissionLevel,
-    server::{Server, ServerQuery, ServerState},
-    stack::{Stack, StackServiceNames},
-    update::Log,
-  },
-};
-use mogh_resolver::Resolve;
-use periphery_client::api as periphery;
-
-use crate::{
-  api::read::ReadArgs,
-  helpers::{periphery_client, query::get_all_tags},
-  permission::{get_check_permissions, list_resources_for_user},
-  resource,
-  stack::compose_container_match_regex,
-  state::{db_client, server_status_cache},
-};
-
-impl Resolve<ReadArgs> for GetContainersSummary {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetContainersSummaryResponse> {
-    let servers = resource::list_full_for_user::<Server>(
-      Default::default(),
-      None,
-      None,
-      user,
-      PermissionLevel::Read.into(),
-      &[],
-    )
-    .await
-    .context("failed to get servers from db")?;
-
-    let mut res = GetContainersSummaryResponse::default();
-
-    for server in servers {
-      let cache = server_status_cache()
-        .get_or_insert_default(&server.id)
-        .await;
-
-      if let Some(docker) = &cache.docker {
-        for container in &docker.containers {
-          res.total += 1;
-          match container.state {
-            ContainerStateStatusEnum::Created
-            | ContainerStateStatusEnum::Paused
-            | ContainerStateStatusEnum::Exited => res.stopped += 1,
-            ContainerStateStatusEnum::Running => res.running += 1,
-            ContainerStateStatusEnum::Empty => res.unknown += 1,
-            _ => res.unhealthy += 1,
-          }
-        }
-      }
-    }
-
-    Ok(res)
-  }
-}
-
-impl Resolve<ReadArgs> for ListAllContainers {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListAllContainersResponse> {
-    let all_tags = if self.tags.is_empty() {
-      vec![]
-    } else {
-      get_all_tags(None).await?
-    };
-    let servers = resource::list_for_user::<Server>(
-      ServerQuery::builder()
-        .names(self.servers.clone())
-        .tags(self.tags)
-        .build(),
-      None,
-      None,
-      user,
-      PermissionLevel::Read.into(),
-      &all_tags,
-    )
-    .await?;
-
-    let mut containers = Vec::<ContainerListItem>::new();
-    let mut skipped = 0;
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
-    let limit_usize = limit as usize;
-    // Eg. page 1 skips until after 100 containers, page 2 after 200.
-    let skip = limit.saturating_mul(self.page);
-    // Match terms case insensitively.
-    let terms = self
-      .terms
-      .iter()
-      .map(|term| term.to_lowercase())
-      .collect::<Vec<_>>();
-
-    for server in servers {
-      let cache = server_status_cache()
-        .get_or_insert_default(&server.id)
-        .await;
-      let Some(docker) = &cache.docker else {
-        continue;
-      };
-      let more = docker
-        .containers
-        .iter()
-        .filter(|container| {
-          // Apply state filter if defined.
-          (self.state.is_empty() || self.state.contains(&container.state)) &&
-          // Apply terms filter if defined
-          (terms.is_empty()
-            // Match when all terms contained within a name.
-            || {
-              let name = container.name.to_lowercase();
-              terms.iter().all(|term| name.contains(term))
-            })
-        });
-      for container in more {
-        if skipped < skip {
-          skipped += 1;
-        } else {
-          // push and maybe early return
-          containers.push(container.clone());
-          if limit > 0 && containers.len() >= limit_usize {
-            return Ok(containers);
-          }
-        }
-      }
-    }
-
-    Ok(containers)
-  }
-}
-
-impl Resolve<ReadArgs> for ListContainers {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListContainersResponse> {
-    let server = get_check_permissions::<Server>(
-      &self.server,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache = server_status_cache()
-      .get_or_insert_default(&server.id)
-      .await;
-    if let Some(docker) = &cache.docker {
-      Ok(docker.containers.clone())
-    } else {
-      Ok(Vec::new())
-    }
-  }
-}
-
-impl Resolve<ReadArgs> for InspectContainer {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Container> {
-    let server = get_check_permissions::<Server>(
-      &self.server,
-      user,
-      PermissionLevel::Read.inspect(),
-    )
-    .await?;
-    let cache = server_status_cache()
-      .get_or_insert_default(&server.id)
-      .await;
-    if cache.state != ServerState::Ok {
-      return Err(
-        anyhow!(
-          "Cannot inspect container: server is {:?}",
-          cache.state
-        )
-        .into(),
-      );
-    }
-    let res = periphery_client(&server)
-      .await?
-      .request(periphery::container::InspectContainer {
-        name: self.container,
-      })
-      .await?;
-    Ok(res)
-  }
-}
-
-impl Resolve<ReadArgs> for GetResourceMatchingContainer {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetResourceMatchingContainerResponse> {
-    let server = get_check_permissions::<Server>(
-      &self.server,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-
-    // First check deployments with a matching deployed / custom container name.
-    // The empty check is required to avoid matching
-    // deployments with no custom name configured.
-    if !self.container.is_empty()
-      && let Ok(Some(deployment)) = db_client()
-        .deployments
-        .find_one(doc! {
-          "$or": [
-            { "info.deployed_name": &self.container },
-            { "config.custom_name": &self.container },
-          ]
-        })
-        .await
-    {
-      return Ok(GetResourceMatchingContainerResponse {
-        resource: ResourceTarget::Deployment(deployment.id).into(),
-      });
-    }
-
-    // Then check deployments matching by name
-    if let Ok(deployment) =
-      resource::get::<Deployment>(&self.container).await
-      && deployment.custom_name() == self.container
-    {
-      return Ok(GetResourceMatchingContainerResponse {
-        resource: ResourceTarget::Deployment(deployment.id).into(),
-      });
-    }
-
-    // then check stacks
-    let stacks = list_resources_for_user::<Stack>(
-      doc! { "config.server_id": &server.id },
-      None,
-      None,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-
-    // check matching stack
-    for stack in stacks {
-      for StackServiceNames {
-        service_name,
-        container_name,
-        ..
-      } in stack
-        .info
-        .deployed_services
-        .unwrap_or(stack.info.latest_services)
-      {
-        let is_match = match compose_container_match_regex(&container_name)
-          .with_context(|| format!("failed to construct container name matching regex for service {service_name}")) 
-        {
-          Ok(regex) => regex,
-          Err(e) => {
-            warn!("{e:#}");
-            continue;
-          }
-        }.is_match(&self.container);
-
-        if is_match {
-          return Ok(GetResourceMatchingContainerResponse {
-            resource: ResourceTarget::Stack(stack.id).into(),
-          });
-        }
-      }
-    }
-
-    Ok(GetResourceMatchingContainerResponse { resource: None })
-  }
-}
-
-const MAX_LOG_LENGTH: u64 = 5000;
-
-impl Resolve<ReadArgs> for GetContainerLog {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Log> {
-    let GetContainerLog {
-      server,
-      container,
-      tail,
-      timestamps,
-    } = self;
-    let server = get_check_permissions::<Server>(
-      &server,
-      user,
-      PermissionLevel::Read.logs(),
-    )
-    .await?;
-    let res = periphery_client(&server)
-      .await?
-      .request(periphery::container::GetContainerLog {
-        name: container,
-        tail: cmp::min(tail, MAX_LOG_LENGTH),
-        timestamps,
-      })
-      .await
-      .context("failed at call to periphery")?;
-    Ok(res)
-  }
-}
-
-impl Resolve<ReadArgs> for SearchContainerLog {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Log> {
-    let SearchContainerLog {
-      server,
-      container,
-      terms,
-      combinator,
-      invert,
-      timestamps,
-    } = self;
-    let server = get_check_permissions::<Server>(
-      &server,
-      user,
-      PermissionLevel::Read.logs(),
-    )
-    .await?;
-    let res = periphery_client(&server)
-      .await?
-      .request(periphery::container::GetContainerLogSearch {
-        name: container,
-        terms,
-        combinator,
-        invert,
-        timestamps,
-      })
-      .await
-      .context("failed at call to periphery")?;
-    Ok(res)
-  }
-}
-
-impl Resolve<ReadArgs> for ListComposeProjects {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListComposeProjectsResponse> {
-    let server = get_check_permissions::<Server>(
-      &self.server,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache = server_status_cache()
-      .get_or_insert_default(&server.id)
-      .await;
-    if let Some(docker) = &cache.docker {
-      Ok(docker.projects.clone())
-    } else {
-      Ok(Vec::new())
-    }
-  }
-}
-
-impl Resolve<ReadArgs> for ListNetworks {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListNetworksResponse> {
-    let server = get_check_permissions::<Server>(
-      &self.server,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache = server_status_cache()
-      .get_or_insert_default(&server.id)
-      .await;
-    if let Some(docker) = &cache.docker {
-      Ok(docker.networks.clone())
-    } else {
-      Ok(Vec::new())
-    }
-  }
-}
-
-impl Resolve<ReadArgs> for InspectNetwork {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Network> {
-    let server = get_check_permissions::<Server>(
-      &self.server,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache = server_status_cache()
-      .get_or_insert_default(&server.id)
-      .await;
-    if cache.state != ServerState::Ok {
-      return Err(
-        anyhow!(
-          "Cannot inspect network: server is {:?}",
-          cache.state
-        )
-        .into(),
-      );
-    }
-    let res = periphery_client(&server)
-      .await?
-      .request(periphery::docker::InspectNetwork {
-        name: self.network,
-      })
-      .await?;
-    Ok(res)
-  }
-}
-
-impl Resolve<ReadArgs> for ListImages {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListImagesResponse> {
-    let server = get_check_permissions::<Server>(
-      &self.server,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache = server_status_cache()
-      .get_or_insert_default(&server.id)
-      .await;
-    if let Some(docker) = &cache.docker {
-      Ok(docker.images.clone())
-    } else {
-      Ok(Vec::new())
-    }
-  }
-}
-
-impl Resolve<ReadArgs> for InspectImage {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Image> {
-    let server = get_check_permissions::<Server>(
-      &self.server,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache = server_status_cache()
-      .get_or_insert_default(&server.id)
-      .await;
-    if cache.state != ServerState::Ok {
-      return Err(
-        anyhow!("Cannot inspect image: server is {:?}", cache.state)
-          .into(),
-      );
-    }
-    let res = periphery_client(&server)
-      .await?
-      .request(periphery::docker::InspectImage { name: self.image })
-      .await?;
-    Ok(res)
-  }
-}
-
-impl Resolve<ReadArgs> for ListImageHistory {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Vec<ImageHistoryResponseItem>> {
-    let server = get_check_permissions::<Server>(
-      &self.server,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache = server_status_cache()
-      .get_or_insert_default(&server.id)
-      .await;
-    if cache.state != ServerState::Ok {
-      return Err(
-        anyhow!(
-          "Cannot get image history: server is {:?}",
-          cache.state
-        )
-        .into(),
-      );
-    }
-    let res = periphery_client(&server)
-      .await?
-      .request(periphery::docker::ImageHistory { name: self.image })
-      .await?;
-    Ok(res)
-  }
-}
-
-impl Resolve<ReadArgs> for ListVolumes {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListVolumesResponse> {
-    let server = get_check_permissions::<Server>(
-      &self.server,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache = server_status_cache()
-      .get_or_insert_default(&server.id)
-      .await;
-    if let Some(docker) = &cache.docker {
-      Ok(docker.volumes.clone())
-    } else {
-      Ok(Vec::new())
-    }
-  }
-}
-
-impl Resolve<ReadArgs> for InspectVolume {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Volume> {
-    let server = get_check_permissions::<Server>(
-      &self.server,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache = server_status_cache()
-      .get_or_insert_default(&server.id)
-      .await;
-    if cache.state != ServerState::Ok {
-      return Err(
-        anyhow!("Cannot inspect volume: server is {:?}", cache.state)
-          .into(),
-      );
-    }
-    let res = periphery_client(&server)
-      .await?
-      .request(periphery::docker::InspectVolume { name: self.volume })
-      .await?;
-    Ok(res)
-  }
-}

bin/core/src/api/read/mod.rs

@@ -1,4 +1,4 @@
-use std::collections::HashSet;
+use std::{collections::HashSet, sync::OnceLock, time::Instant};
 
 use anyhow::{Context, anyhow};
 use axum::{
@@ -10,7 +10,7 @@ use komodo_client::{
     ResourceTarget,
     build::Build,
     builder::{Builder, BuilderConfig},
-    config::{GitProvider, ImageRegistry},
+    config::{DockerRegistry, GitProvider},
     permission::PermissionLevel,
     repo::Repo,
     server::Server,
@@ -18,20 +18,17 @@ use komodo_client::{
     user::User,
   },
 };
-use mogh_auth_server::middleware::authenticate_request;
-use mogh_error::Response;
-use mogh_error::{AddStatusCodeError, Json};
-use mogh_resolver::Resolve;
-use reqwest::StatusCode;
+use resolver_api::Resolve;
+use response::Response;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use strum::{Display, EnumDiscriminants};
+use serror::Json;
 use typeshare::typeshare;
 use uuid::Uuid;
 
 use crate::{
-  auth::KomodoAuthImpl,
-  config::{core_config, core_keys},
+  auth::auth_request,
+  config::{core_config, core_public_key},
   helpers::periphery_client,
   resource,
 };
@@ -44,7 +41,6 @@ mod alerter;
 mod build;
 mod builder;
 mod deployment;
-mod docker;
 mod onboarding_key;
 mod permission;
 mod procedure;
@@ -53,10 +49,8 @@ mod repo;
 mod schedule;
 mod server;
 mod stack;
-mod swarm;
 mod sync;
 mod tag;
-mod terminal;
 mod toml;
 mod update;
 mod user;
@@ -68,136 +62,31 @@ pub struct ReadArgs {
 }
 
 #[typeshare]
-#[derive(
-  Serialize, Deserialize, Debug, Clone, Resolve, EnumDiscriminants,
-)]
-#[strum_discriminants(name(ReadRequestMethod), derive(Display))]
+#[derive(Serialize, Deserialize, Debug, Clone, Resolve)]
 #[args(ReadArgs)]
 #[response(Response)]
-#[error(mogh_error::Error)]
+#[error(serror::Error)]
 #[serde(tag = "type", content = "params")]
 enum ReadRequest {
   GetVersion(GetVersion),
   GetCoreInfo(GetCoreInfo),
   ListSecrets(ListSecrets),
   ListGitProvidersFromConfig(ListGitProvidersFromConfig),
-  #[serde(alias = "ListDockerRegistriesFromConfig")]
-  ListImageRegistriesFromConfig(ListImageRegistriesFromConfig),
+  ListDockerRegistriesFromConfig(ListDockerRegistriesFromConfig),
 
-  // ==== SWARM ====
-  GetSwarmsSummary(GetSwarmsSummary),
-  GetSwarm(GetSwarm),
-  GetSwarmActionState(GetSwarmActionState),
-  ListSwarms(ListSwarms),
-  InspectSwarm(InspectSwarm),
-  ListFullSwarms(ListFullSwarms),
-  ListSwarmNodes(ListSwarmNodes),
-  InspectSwarmNode(InspectSwarmNode),
-  ListSwarmConfigs(ListSwarmConfigs),
-  InspectSwarmConfig(InspectSwarmConfig),
-  ListSwarmSecrets(ListSwarmSecrets),
-  InspectSwarmSecret(InspectSwarmSecret),
-  ListSwarmStacks(ListSwarmStacks),
-  InspectSwarmStack(InspectSwarmStack),
-  ListSwarmTasks(ListSwarmTasks),
-  InspectSwarmTask(InspectSwarmTask),
-  ListSwarmServices(ListSwarmServices),
-  InspectSwarmService(InspectSwarmService),
-  GetSwarmServiceLog(GetSwarmServiceLog),
-  SearchSwarmServiceLog(SearchSwarmServiceLog),
-  ListSwarmNetworks(ListSwarmNetworks),
+  // ==== USER ====
+  GetUsername(GetUsername),
+  GetPermission(GetPermission),
+  FindUser(FindUser),
+  ListUsers(ListUsers),
+  ListApiKeys(ListApiKeys),
+  ListApiKeysForServiceUser(ListApiKeysForServiceUser),
+  ListPermissions(ListPermissions),
+  ListUserTargetPermissions(ListUserTargetPermissions),
 
-  // ==== SERVER ====
-  GetServersSummary(GetServersSummary),
-  GetServer(GetServer),
-  GetServerState(GetServerState),
-  GetPeripheryInformation(GetPeripheryInformation),
-  GetServerActionState(GetServerActionState),
-  ListServers(ListServers),
-  ListFullServers(ListFullServers),
-
-  // ==== TERMINAL ====
-  ListTerminals(ListTerminals),
-
-  // ==== CONTAINER ====
-  #[serde(alias = "GetDockerContainersSummary")]
-  GetContainersSummary(GetContainersSummary),
-  #[serde(alias = "ListAllDockerContainers")]
-  ListAllContainers(ListAllContainers),
-  #[serde(alias = "ListDockerContainers")]
-  ListContainers(ListContainers),
-  #[serde(alias = "InspectDockerContainer")]
-  InspectContainer(InspectContainer),
-  GetResourceMatchingContainer(GetResourceMatchingContainer),
-  GetContainerLog(GetContainerLog),
-  SearchContainerLog(SearchContainerLog),
-  ListComposeProjects(ListComposeProjects),
-  #[serde(alias = "ListDockerNetworks")]
-  ListNetworks(ListNetworks),
-  #[serde(alias = "InspectDockerNetwork")]
-  InspectNetwork(InspectNetwork),
-  #[serde(alias = "ListDockerImages")]
-  ListImages(ListImages),
-  #[serde(alias = "InspectDockerImage")]
-  InspectImage(InspectImage),
-  #[serde(alias = "ListDockerImageHistory")]
-  ListImageHistory(ListImageHistory),
-  #[serde(alias = "ListDockerVolumes")]
-  ListVolumes(ListVolumes),
-  #[serde(alias = "InspectDockerVolume")]
-  InspectVolume(InspectVolume),
-
-  // ==== SERVER STATS ====
-  GetSystemInformation(GetSystemInformation),
-  GetSystemStats(GetSystemStats),
-  GetHistoricalServerStats(GetHistoricalServerStats),
-  ListSystemProcesses(ListSystemProcesses),
-
-  // ==== STACK ====
-  GetStacksSummary(GetStacksSummary),
-  GetStack(GetStack),
-  GetStackActionState(GetStackActionState),
-  GetStackLog(GetStackLog),
-  SearchStackLog(SearchStackLog),
-  InspectStackContainer(InspectStackContainer),
-  InspectStackSwarmService(InspectStackSwarmService),
-  ListStacks(ListStacks),
-  ListFullStacks(ListFullStacks),
-  ListStackServices(ListStackServices),
-  ListAllStackServices(ListAllStackServices),
-  ListCommonStackExtraArgs(ListCommonStackExtraArgs),
-  ListCommonStackBuildExtraArgs(ListCommonStackBuildExtraArgs),
-
-  // ==== DEPLOYMENT ====
-  GetDeploymentsSummary(GetDeploymentsSummary),
-  GetDeployment(GetDeployment),
-  GetDeploymentContainer(GetDeploymentContainer),
-  GetDeploymentActionState(GetDeploymentActionState),
-  GetDeploymentStats(GetDeploymentStats),
-  GetDeploymentLog(GetDeploymentLog),
-  SearchDeploymentLog(SearchDeploymentLog),
-  InspectDeploymentContainer(InspectDeploymentContainer),
-  InspectDeploymentSwarmService(InspectDeploymentSwarmService),
-  ListDeployments(ListDeployments),
-  ListFullDeployments(ListFullDeployments),
-  ListCommonDeploymentExtraArgs(ListCommonDeploymentExtraArgs),
-
-  // ==== BUILD ====
-  GetBuildsSummary(GetBuildsSummary),
-  GetBuild(GetBuild),
-  GetBuildActionState(GetBuildActionState),
-  GetBuildMonthlyStats(GetBuildMonthlyStats),
-  ListBuildVersions(ListBuildVersions),
-  ListBuilds(ListBuilds),
-  ListFullBuilds(ListFullBuilds),
-  ListCommonBuildExtraArgs(ListCommonBuildExtraArgs),
-
-  // ==== REPO ====
-  GetReposSummary(GetReposSummary),
-  GetRepo(GetRepo),
-  GetRepoActionState(GetRepoActionState),
-  ListRepos(ListRepos),
-  ListFullRepos(ListFullRepos),
+  // ==== USER GROUP ====
+  GetUserGroup(GetUserGroup),
+  ListUserGroups(ListUserGroups),
 
   // ==== PROCEDURE ====
   GetProceduresSummary(GetProceduresSummary),
@@ -216,10 +105,90 @@ enum ReadRequest {
   // ==== SCHEDULE ====
   ListSchedules(ListSchedules),
 
+  // ==== SERVER ====
+  GetServersSummary(GetServersSummary),
+  GetServer(GetServer),
+  GetServerState(GetServerState),
+  GetPeripheryInformation(GetPeripheryInformation),
+  GetServerActionState(GetServerActionState),
+  GetHistoricalServerStats(GetHistoricalServerStats),
+  ListServers(ListServers),
+  ListFullServers(ListFullServers),
+  ListTerminals(ListTerminals),
+
+  // ==== DOCKER ====
+  GetDockerContainersSummary(GetDockerContainersSummary),
+  ListAllDockerContainers(ListAllDockerContainers),
+  ListDockerContainers(ListDockerContainers),
+  InspectDockerContainer(InspectDockerContainer),
+  GetResourceMatchingContainer(GetResourceMatchingContainer),
+  GetContainerLog(GetContainerLog),
+  SearchContainerLog(SearchContainerLog),
+  ListComposeProjects(ListComposeProjects),
+  ListDockerNetworks(ListDockerNetworks),
+  InspectDockerNetwork(InspectDockerNetwork),
+  ListDockerImages(ListDockerImages),
+  InspectDockerImage(InspectDockerImage),
+  ListDockerImageHistory(ListDockerImageHistory),
+  ListDockerVolumes(ListDockerVolumes),
+  InspectDockerVolume(InspectDockerVolume),
+
+  // ==== SERVER STATS ====
+  GetSystemInformation(GetSystemInformation),
+  GetSystemStats(GetSystemStats),
+  ListSystemProcesses(ListSystemProcesses),
+
+  // ==== STACK ====
+  GetStacksSummary(GetStacksSummary),
+  GetStack(GetStack),
+  GetStackActionState(GetStackActionState),
+  GetStackWebhooksEnabled(GetStackWebhooksEnabled),
+  GetStackLog(GetStackLog),
+  SearchStackLog(SearchStackLog),
+  InspectStackContainer(InspectStackContainer),
+  ListStacks(ListStacks),
+  ListFullStacks(ListFullStacks),
+  ListStackServices(ListStackServices),
+  ListCommonStackExtraArgs(ListCommonStackExtraArgs),
+  ListCommonStackBuildExtraArgs(ListCommonStackBuildExtraArgs),
+
+  // ==== DEPLOYMENT ====
+  GetDeploymentsSummary(GetDeploymentsSummary),
+  GetDeployment(GetDeployment),
+  GetDeploymentContainer(GetDeploymentContainer),
+  GetDeploymentActionState(GetDeploymentActionState),
+  GetDeploymentStats(GetDeploymentStats),
+  GetDeploymentLog(GetDeploymentLog),
+  SearchDeploymentLog(SearchDeploymentLog),
+  InspectDeploymentContainer(InspectDeploymentContainer),
+  ListDeployments(ListDeployments),
+  ListFullDeployments(ListFullDeployments),
+  ListCommonDeploymentExtraArgs(ListCommonDeploymentExtraArgs),
+
+  // ==== BUILD ====
+  GetBuildsSummary(GetBuildsSummary),
+  GetBuild(GetBuild),
+  GetBuildActionState(GetBuildActionState),
+  GetBuildMonthlyStats(GetBuildMonthlyStats),
+  ListBuildVersions(ListBuildVersions),
+  GetBuildWebhookEnabled(GetBuildWebhookEnabled),
+  ListBuilds(ListBuilds),
+  ListFullBuilds(ListFullBuilds),
+  ListCommonBuildExtraArgs(ListCommonBuildExtraArgs),
+
+  // ==== REPO ====
+  GetReposSummary(GetReposSummary),
+  GetRepo(GetRepo),
+  GetRepoActionState(GetRepoActionState),
+  GetRepoWebhooksEnabled(GetRepoWebhooksEnabled),
+  ListRepos(ListRepos),
+  ListFullRepos(ListFullRepos),
+
   // ==== SYNC ====
   GetResourceSyncsSummary(GetResourceSyncsSummary),
   GetResourceSync(GetResourceSync),
   GetResourceSyncActionState(GetResourceSyncActionState),
+  GetSyncWebhooksEnabled(GetSyncWebhooksEnabled),
   ListResourceSyncs(ListResourceSyncs),
   ListFullResourceSyncs(ListFullResourceSyncs),
 
@@ -243,20 +212,6 @@ enum ReadRequest {
   GetTag(GetTag),
   ListTags(ListTags),
 
-  // ==== USER ====
-  GetUsername(GetUsername),
-  GetPermission(GetPermission),
-  FindUser(FindUser),
-  ListUsers(ListUsers),
-  ListApiKeys(ListApiKeys),
-  ListApiKeysForServiceUser(ListApiKeysForServiceUser),
-  ListPermissions(ListPermissions),
-  ListUserTargetPermissions(ListUserTargetPermissions),
-
-  // ==== USER GROUP ====
-  GetUserGroup(GetUserGroup),
-  ListUserGroups(ListUserGroups),
-
   // ==== UPDATE ====
   GetUpdate(GetUpdate),
   ListUpdates(ListUpdates),
@@ -272,10 +227,8 @@ enum ReadRequest {
   // ==== PROVIDER ====
   GetGitProviderAccount(GetGitProviderAccount),
   ListGitProviderAccounts(ListGitProviderAccounts),
-  #[serde(alias = "GetDockerRegistryAccount")]
-  GetImageRegistryAccount(GetImageRegistryAccount),
-  #[serde(alias = "ListDockerRegistryAccounts")]
-  ListImageRegistryAccounts(ListImageRegistryAccounts),
+  GetDockerRegistryAccount(GetDockerRegistryAccount),
+  ListDockerRegistryAccounts(ListDockerRegistryAccounts),
 
   // ==== ONBOARDING KEY ====
   ListOnboardingKeys(ListOnboardingKeys),
@@ -285,16 +238,14 @@ pub fn router() -> Router {
   Router::new()
     .route("/", post(handler))
     .route("/{variant}", post(variant_handler))
-    .layer(middleware::from_fn(
-      authenticate_request::<KomodoAuthImpl, true>,
-    ))
+    .layer(middleware::from_fn(auth_request))
 }
 
 async fn variant_handler(
   user: Extension<User>,
   Path(Variant { variant }): Path<Variant>,
   Json(params): Json<serde_json::Value>,
-) -> mogh_error::Result<axum::response::Response> {
+) -> serror::Result<axum::response::Response> {
   let req: ReadRequest = serde_json::from_value(json!({
     "type": variant,
     "params": params,
@@ -302,37 +253,20 @@ async fn variant_handler(
   handler(user, Json(req)).await
 }
 
+#[instrument(name = "ReadHandler", level = "debug", skip(user), fields(user_id = user.id))]
 async fn handler(
   Extension(user): Extension<User>,
   Json(request): Json<ReadRequest>,
-) -> mogh_error::Result<axum::response::Response> {
+) -> serror::Result<axum::response::Response> {
+  let timer = Instant::now();
   let req_id = Uuid::new_v4();
-  let method: ReadRequestMethod = (&request).into();
-
-  let user_id = user.id.clone();
-  let username = user.username.clone();
-
-  trace!(
-    req_id = req_id.to_string(),
-    method = method.to_string(),
-    user_id,
-    username,
-    "READ REQUEST",
-  );
-
+  debug!("/read request | user: {}", user.username);
   let res = request.resolve(&ReadArgs { user }).await;
-
   if let Err(e) = &res {
-    trace!(
-      req_id = req_id.to_string(),
-      method = method.to_string(),
-      user_id,
-      username,
-      "READ REQUEST | ERROR: {:#}",
-      e.error
-    );
+    debug!("/read request {req_id} error: {:#}", e.error);
   }
-
+  let elapsed = timer.elapsed();
+  debug!("/read request {req_id} | resolve time: {elapsed:?}");
   res.map(|res| res.0)
 }
 
@@ -340,22 +274,18 @@ impl Resolve<ReadArgs> for GetVersion {
   async fn resolve(
     self,
     _: &ReadArgs,
-  ) -> mogh_error::Result<GetVersionResponse> {
+  ) -> serror::Result<GetVersionResponse> {
     Ok(GetVersionResponse {
       version: env!("CARGO_PKG_VERSION").to_string(),
     })
   }
 }
 
-//
-
-impl Resolve<ReadArgs> for GetCoreInfo {
-  async fn resolve(
-    self,
-    _: &ReadArgs,
-  ) -> mogh_error::Result<GetCoreInfoResponse> {
+fn core_info() -> &'static GetCoreInfoResponse {
+  static CORE_INFO: OnceLock<GetCoreInfoResponse> = OnceLock::new();
+  CORE_INFO.get_or_init(|| {
     let config = core_config();
-    let info = GetCoreInfoResponse {
+    GetCoreInfoResponse {
       title: config.title.clone(),
       monitoring_interval: config.monitoring_interval,
       webhook_base_url: if config.webhook_base_url.is_empty() {
@@ -369,20 +299,32 @@ impl Resolve<ReadArgs> for GetCoreInfo {
       disable_non_admin_create: config.disable_non_admin_create,
       disable_websocket_reconnect: config.disable_websocket_reconnect,
       enable_fancy_toml: config.enable_fancy_toml,
+      github_webhook_owners: config
+        .github_webhook_app
+        .installations
+        .iter()
+        .map(|i| i.namespace.to_string())
+        .collect(),
       timezone: config.timezone.clone(),
-      public_key: core_keys().load().public.to_string(),
-    };
-    Ok(info)
-  }
+      public_key: core_public_key().to_string(),
+    }
+  })
 }
 
-//
+impl Resolve<ReadArgs> for GetCoreInfo {
+  async fn resolve(
+    self,
+    _: &ReadArgs,
+  ) -> serror::Result<GetCoreInfoResponse> {
+    Ok(core_info().clone())
+  }
+}
 
 impl Resolve<ReadArgs> for ListSecrets {
   async fn resolve(
     self,
     _: &ReadArgs,
-  ) -> mogh_error::Result<ListSecretsResponse> {
+  ) -> serror::Result<ListSecretsResponse> {
     let mut secrets = core_config()
       .secrets
       .keys()
@@ -395,9 +337,7 @@ impl Resolve<ReadArgs> for ListSecrets {
         ResourceTarget::Builder(id) => {
           match resource::get::<Builder>(&id).await?.config {
             BuilderConfig::Url(_) => None,
-            BuilderConfig::Server(config) => {
-              config.server_ids.first().cloned()
-            }
+            BuilderConfig::Server(config) => Some(config.server_id),
             BuilderConfig::Aws(config) => {
               secrets.extend(config.secrets);
               None
@@ -406,8 +346,7 @@ impl Resolve<ReadArgs> for ListSecrets {
         }
         _ => {
           return Err(
-            anyhow!("target must be `Server` or `Builder`")
-              .status_code(StatusCode::BAD_REQUEST),
+            anyhow!("target must be `Server` or `Builder`").into(),
           );
         }
       };
@@ -434,13 +373,11 @@ impl Resolve<ReadArgs> for ListSecrets {
   }
 }
 
-//
-
 impl Resolve<ReadArgs> for ListGitProvidersFromConfig {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListGitProvidersFromConfigResponse> {
+  ) -> serror::Result<ListGitProvidersFromConfigResponse> {
     let mut providers = core_config().git_providers.clone();
 
     if let Some(target) = self.target {
@@ -452,13 +389,11 @@ impl Resolve<ReadArgs> for ListGitProvidersFromConfig {
           match resource::get::<Builder>(&id).await?.config {
             BuilderConfig::Url(_) => {}
             BuilderConfig::Server(config) => {
-              if let Some(server_id) = config.server_ids.first() {
-                merge_git_providers_for_server(
-                  &mut providers,
-                  server_id,
-                )
-                .await?;
-              }
+              merge_git_providers_for_server(
+                &mut providers,
+                &config.server_id,
+              )
+              .await?;
             }
             BuilderConfig::Aws(config) => {
               merge_git_providers(
@@ -470,8 +405,7 @@ impl Resolve<ReadArgs> for ListGitProvidersFromConfig {
         }
         _ => {
           return Err(
-            anyhow!("target must be `Server` or `Builder`")
-              .status_code(StatusCode::BAD_REQUEST),
+            anyhow!("target must be `Server` or `Builder`").into(),
           );
         }
       }
@@ -480,24 +414,18 @@ impl Resolve<ReadArgs> for ListGitProvidersFromConfig {
     let (builds, repos, syncs) = tokio::try_join!(
       resource::list_full_for_user::<Build>(
         Default::default(),
-        None,
-        None,
         user,
         PermissionLevel::Read.into(),
         &[]
       ),
       resource::list_full_for_user::<Repo>(
         Default::default(),
-        None,
-        None,
         user,
         PermissionLevel::Read.into(),
         &[]
       ),
       resource::list_full_for_user::<ResourceSync>(
         Default::default(),
-        None,
-        None,
         user,
         PermissionLevel::Read.into(),
         &[]
@@ -547,37 +475,33 @@ impl Resolve<ReadArgs> for ListGitProvidersFromConfig {
   }
 }
 
-//
-
-impl Resolve<ReadArgs> for ListImageRegistriesFromConfig {
+impl Resolve<ReadArgs> for ListDockerRegistriesFromConfig {
   async fn resolve(
     self,
     _: &ReadArgs,
-  ) -> mogh_error::Result<ListImageRegistriesFromConfigResponse> {
-    let mut registries = core_config().image_registries.clone();
+  ) -> serror::Result<ListDockerRegistriesFromConfigResponse> {
+    let mut registries = core_config().docker_registries.clone();
 
     if let Some(target) = self.target {
       match target {
         ResourceTarget::Server(id) => {
-          merge_image_registries_for_server(&mut registries, &id)
+          merge_docker_registries_for_server(&mut registries, &id)
             .await?;
         }
         ResourceTarget::Builder(id) => {
           match resource::get::<Builder>(&id).await?.config {
             BuilderConfig::Url(_) => {}
             BuilderConfig::Server(config) => {
-              if let Some(server_id) = config.server_ids.first() {
-                merge_image_registries_for_server(
-                  &mut registries,
-                  server_id,
-                )
-                .await?;
-              }
+              merge_docker_registries_for_server(
+                &mut registries,
+                &config.server_id,
+              )
+              .await?;
             }
             BuilderConfig::Aws(config) => {
-              merge_image_registries(
+              merge_docker_registries(
                 &mut registries,
-                config.image_registries,
+                config.docker_registries,
               );
             }
           }
@@ -599,7 +523,7 @@ impl Resolve<ReadArgs> for ListImageRegistriesFromConfig {
 async fn merge_git_providers_for_server(
   providers: &mut Vec<GitProvider>,
   server_id: &str,
-) -> mogh_error::Result<()> {
+) -> serror::Result<()> {
   let server = resource::get::<Server>(server_id).await?;
   let more = periphery_client(&server)
     .await?
@@ -635,14 +559,14 @@ fn merge_git_providers(
   }
 }
 
-async fn merge_image_registries_for_server(
-  registries: &mut Vec<ImageRegistry>,
+async fn merge_docker_registries_for_server(
+  registries: &mut Vec<DockerRegistry>,
   server_id: &str,
-) -> mogh_error::Result<()> {
+) -> serror::Result<()> {
   let server = resource::get::<Server>(server_id).await?;
   let more = periphery_client(&server)
     .await?
-    .request(periphery_client::api::ListImageRegistries {})
+    .request(periphery_client::api::ListDockerRegistries {})
     .await
     .with_context(|| {
       format!(
@@ -650,13 +574,13 @@ async fn merge_image_registries_for_server(
         server.name
       )
     })?;
-  merge_image_registries(registries, more);
+  merge_docker_registries(registries, more);
   Ok(())
 }
 
-fn merge_image_registries(
-  registries: &mut Vec<ImageRegistry>,
-  more: Vec<ImageRegistry>,
+fn merge_docker_registries(
+  registries: &mut Vec<DockerRegistry>,
+  more: Vec<DockerRegistry>,
 ) {
   for incoming_registry in more {
     if let Some(registry) = registries

bin/core/src/api/read/onboarding_key.rs

@@ -1,13 +1,11 @@
-use std::cmp::Ordering;
-
 use anyhow::{Context, anyhow};
 use database::mungos::find::find_collect;
 use komodo_client::api::read::{
   ListOnboardingKeys, ListOnboardingKeysResponse,
 };
-use mogh_error::AddStatusCodeError;
-use mogh_resolver::Resolve;
 use reqwest::StatusCode;
+use resolver_api::Resolve;
+use serror::AddStatusCodeError;
 
 use crate::{api::read::ReadArgs, state::db_client};
 
@@ -17,35 +15,16 @@ impl Resolve<ReadArgs> for ListOnboardingKeys {
   async fn resolve(
     self,
     ReadArgs { user: admin }: &ReadArgs,
-  ) -> mogh_error::Result<ListOnboardingKeysResponse> {
+  ) -> serror::Result<ListOnboardingKeysResponse> {
     if !admin.admin {
       return Err(
         anyhow!("This call is admin only")
           .status_code(StatusCode::FORBIDDEN),
       );
     }
-
-    let mut keys =
-      find_collect(&db_client().onboarding_keys, None, None)
-        .await
-        .context(
-          "Failed to query database for Server onboarding keys",
-        )?;
-
-    // No expiry keys first, followed
-    keys.sort_by(|a, b| {
-      if a.expires == b.expires {
-        Ordering::Equal
-      } else if a.expires == 0 {
-        Ordering::Less
-      } else if b.expires == 0 {
-        Ordering::Greater
-      } else {
-        // Descending
-        b.expires.cmp(&a.expires)
-      }
-    });
-
-    Ok(keys)
+    find_collect(&db_client().onboarding_keys, None, None)
+      .await
+      .context("Failed to query database for Server onboarding keys")
+      .map_err(Into::into)
   }
 }

bin/core/src/api/read/permission.rs

@@ -8,7 +8,7 @@ use komodo_client::{
   },
   entities::permission::PermissionLevel,
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{
   helpers::query::get_user_permission_on_target, state::db_client,
@@ -20,7 +20,7 @@ impl Resolve<ReadArgs> for ListPermissions {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListPermissionsResponse> {
+  ) -> serror::Result<ListPermissionsResponse> {
     let res = find_collect(
       &db_client().permissions,
       doc! {
@@ -39,7 +39,7 @@ impl Resolve<ReadArgs> for GetPermission {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetPermissionResponse> {
+  ) -> serror::Result<GetPermissionResponse> {
     if user.admin {
       return Ok(PermissionLevel::Write.all());
     }
@@ -51,7 +51,7 @@ impl Resolve<ReadArgs> for ListUserTargetPermissions {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListUserTargetPermissionsResponse> {
+  ) -> serror::Result<ListUserTargetPermissionsResponse> {
     if !user.admin {
       return Err(anyhow!("this method is admin only").into());
     }

bin/core/src/api/read/procedure.rs

@@ -3,15 +3,13 @@ use komodo_client::{
   api::read::*,
   entities::{
     permission::PermissionLevel,
-    procedure::{
-      Procedure, ProcedureListItem, ProcedureSortBy, ProcedureState,
-    },
+    procedure::{Procedure, ProcedureState},
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{
-  helpers::query::{get_all_tags, get_procedure_state},
+  helpers::query::get_all_tags,
   permission::get_check_permissions,
   resource,
   state::{action_states, procedure_state_cache},
@@ -23,7 +21,7 @@ impl Resolve<ReadArgs> for GetProcedure {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetProcedureResponse> {
+  ) -> serror::Result<GetProcedureResponse> {
     Ok(
       get_check_permissions::<Procedure>(
         &self.procedure,
@@ -39,45 +37,21 @@ impl Resolve<ReadArgs> for ListProcedures {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListProceduresResponse> {
+  ) -> serror::Result<ListProceduresResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let states = self.query.specific.states.clone();
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
-    let sort_by: resource::ListItemSort<ProcedureListItem> =
-      match self.sort_by {
-        ProcedureSortBy::Name => resource::ListItemSort::Name,
-        ProcedureSortBy::State => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.state.to_string().cmp(&b.info.state.to_string())
-          }))
-        }
-        ProcedureSortBy::NextRun => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.next_scheduled_run.cmp(&b.info.next_scheduled_run)
-          }))
-        }
-      };
-    let procedures = resource::list_items_for_user::<Procedure>(
-      self.query,
-      resource::ListItemsQueryOptions {
-        limit,
-        page: self.page,
-        sort_desc: self.sort_desc,
-        sort_by,
-      },
-      user,
-      PermissionLevel::Read.into(),
-      &all_tags,
-      |procedure| {
-        states.is_empty() || states.contains(&procedure.info.state)
-      },
+    Ok(
+      resource::list_for_user::<Procedure>(
+        self.query,
+        user,
+        PermissionLevel::Read.into(),
+        &all_tags,
+      )
+      .await?,
     )
-    .await?;
-    Ok(procedures)
   }
 }
 
@@ -85,35 +59,18 @@ impl Resolve<ReadArgs> for ListFullProcedures {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListFullProceduresResponse> {
+  ) -> serror::Result<ListFullProceduresResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let states = self.query.specific.states.clone();
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
     Ok(
-      resource::list_full_for_user_filtered::<Procedure, _>(
+      resource::list_full_for_user::<Procedure>(
         self.query,
-        limit,
-        self.page,
         user,
         PermissionLevel::Read.into(),
         &all_tags,
-        |procedure| {
-          let states = states.clone();
-          async move {
-            if states.is_empty()
-              || states
-                .contains(&get_procedure_state(&procedure.id).await)
-            {
-              Some(procedure)
-            } else {
-              None
-            }
-          }
-        },
       )
       .await?,
     )
@@ -124,11 +81,9 @@ impl Resolve<ReadArgs> for GetProceduresSummary {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetProceduresSummaryResponse> {
+  ) -> serror::Result<GetProceduresSummaryResponse> {
     let procedures = resource::list_full_for_user::<Procedure>(
       Default::default(),
-      None,
-      None,
       user,
       PermissionLevel::Read.into(),
       &[],
@@ -172,7 +127,7 @@ impl Resolve<ReadArgs> for GetProcedureActionState {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetProcedureActionStateResponse> {
+  ) -> serror::Result<GetProcedureActionStateResponse> {
     let procedure = get_check_permissions::<Procedure>(
       &self.procedure,
       user,

bin/core/src/api/read/provider.rs

@@ -5,7 +5,7 @@ use database::mungos::{
   mongodb::options::FindOptions,
 };
 use komodo_client::api::read::*;
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::state::db_client;
 
@@ -15,7 +15,7 @@ impl Resolve<ReadArgs> for GetGitProviderAccount {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetGitProviderAccountResponse> {
+  ) -> serror::Result<GetGitProviderAccountResponse> {
     if !user.admin {
       return Err(
         anyhow!("Only admins can read git provider accounts").into(),
@@ -35,7 +35,7 @@ impl Resolve<ReadArgs> for ListGitProviderAccounts {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListGitProviderAccountsResponse> {
+  ) -> serror::Result<ListGitProviderAccountsResponse> {
     if !user.admin {
       return Err(
         anyhow!("Only admins can read git provider accounts").into(),
@@ -61,11 +61,11 @@ impl Resolve<ReadArgs> for ListGitProviderAccounts {
   }
 }
 
-impl Resolve<ReadArgs> for GetImageRegistryAccount {
+impl Resolve<ReadArgs> for GetDockerRegistryAccount {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetImageRegistryAccountResponse> {
+  ) -> serror::Result<GetDockerRegistryAccountResponse> {
     if !user.admin {
       return Err(
         anyhow!("Only admins can read docker registry accounts")
@@ -83,11 +83,11 @@ impl Resolve<ReadArgs> for GetImageRegistryAccount {
   }
 }
 
-impl Resolve<ReadArgs> for ListImageRegistryAccounts {
+impl Resolve<ReadArgs> for ListDockerRegistryAccounts {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListImageRegistryAccountsResponse> {
+  ) -> serror::Result<ListDockerRegistryAccountsResponse> {
     if !user.admin {
       return Err(
         anyhow!("Only admins can read docker registry accounts")

bin/core/src/api/read/repo.rs

@@ -2,19 +2,19 @@ use anyhow::Context;
 use komodo_client::{
   api::read::*,
   entities::{
+    config::core::CoreConfig,
     permission::PermissionLevel,
-    repo::{
-      Repo, RepoActionState, RepoListItem, RepoSortBy, RepoState,
-    },
+    repo::{Repo, RepoActionState, RepoListItem, RepoState},
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{
+  config::core_config,
   helpers::query::get_all_tags,
   permission::get_check_permissions,
   resource,
-  state::{action_states, repo_state_cache},
+  state::{action_states, github_client, repo_state_cache},
 };
 
 use super::ReadArgs;
@@ -23,7 +23,7 @@ impl Resolve<ReadArgs> for GetRepo {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Repo> {
+  ) -> serror::Result<Repo> {
     Ok(
       get_check_permissions::<Repo>(
         &self.repo,
@@ -39,44 +39,21 @@ impl Resolve<ReadArgs> for ListRepos {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Vec<RepoListItem>> {
+  ) -> serror::Result<Vec<RepoListItem>> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let states = self.query.specific.states.clone();
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
-    let sort_by: resource::ListItemSort<RepoListItem> =
-      match self.sort_by {
-        RepoSortBy::Name => resource::ListItemSort::Name,
-        RepoSortBy::Repo => {
-          resource::ListItemSort::DbField("config.repo")
-        }
-        RepoSortBy::Branch => {
-          resource::ListItemSort::DbField("config.branch")
-        }
-        RepoSortBy::State => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.state.to_string().cmp(&b.info.state.to_string())
-          }))
-        }
-      };
-    let repos = resource::list_items_for_user::<Repo>(
-      self.query,
-      resource::ListItemsQueryOptions {
-        limit,
-        page: self.page,
-        sort_desc: self.sort_desc,
-        sort_by,
-      },
-      user,
-      PermissionLevel::Read.into(),
-      &all_tags,
-      |repo| states.is_empty() || states.contains(&repo.info.state),
+    Ok(
+      resource::list_for_user::<Repo>(
+        self.query,
+        user,
+        PermissionLevel::Read.into(),
+        &all_tags,
+      )
+      .await?,
     )
-    .await?;
-    Ok(repos)
   }
 }
 
@@ -84,35 +61,18 @@ impl Resolve<ReadArgs> for ListFullRepos {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListFullReposResponse> {
+  ) -> serror::Result<ListFullReposResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let states = self.query.specific.states.clone();
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
     Ok(
-      resource::list_full_for_user_filtered::<Repo, _>(
+      resource::list_full_for_user::<Repo>(
         self.query,
-        limit,
-        self.page,
         user,
         PermissionLevel::Read.into(),
         &all_tags,
-        |repo| {
-          let states = states.clone();
-          async move {
-            if states.is_empty()
-              || states
-                .contains(&resource::get_repo_state(&repo.id).await)
-            {
-              Some(repo)
-            } else {
-              None
-            }
-          }
-        },
       )
       .await?,
     )
@@ -123,7 +83,7 @@ impl Resolve<ReadArgs> for GetRepoActionState {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<RepoActionState> {
+  ) -> serror::Result<RepoActionState> {
     let repo = get_check_permissions::<Repo>(
       &self.repo,
       user,
@@ -144,11 +104,9 @@ impl Resolve<ReadArgs> for GetReposSummary {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetReposSummaryResponse> {
+  ) -> serror::Result<GetReposSummaryResponse> {
     let repos = resource::list_full_for_user::<Repo>(
       Default::default(),
-      None,
-      None,
       user,
       PermissionLevel::Read.into(),
       &[],
@@ -201,3 +159,104 @@ impl Resolve<ReadArgs> for GetReposSummary {
     Ok(res)
   }
 }
+
+impl Resolve<ReadArgs> for GetRepoWebhooksEnabled {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<GetRepoWebhooksEnabledResponse> {
+    let Some(github) = github_client() else {
+      return Ok(GetRepoWebhooksEnabledResponse {
+        managed: false,
+        clone_enabled: false,
+        pull_enabled: false,
+        build_enabled: false,
+      });
+    };
+
+    let repo = get_check_permissions::<Repo>(
+      &self.repo,
+      user,
+      PermissionLevel::Read.into(),
+    )
+    .await?;
+
+    if repo.config.git_provider != "github.com"
+      || repo.config.repo.is_empty()
+    {
+      return Ok(GetRepoWebhooksEnabledResponse {
+        managed: false,
+        clone_enabled: false,
+        pull_enabled: false,
+        build_enabled: false,
+      });
+    }
+
+    let mut split = repo.config.repo.split('/');
+    let owner = split.next().context("Repo repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Ok(GetRepoWebhooksEnabledResponse {
+        managed: false,
+        clone_enabled: false,
+        pull_enabled: false,
+        build_enabled: false,
+      });
+    };
+
+    let repo_name =
+      split.next().context("Repo repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo_name)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      ..
+    } = core_config();
+
+    let host = if webhook_base_url.is_empty() {
+      host
+    } else {
+      webhook_base_url
+    };
+    let clone_url =
+      format!("{host}/listener/github/repo/{}/clone", repo.id);
+    let pull_url =
+      format!("{host}/listener/github/repo/{}/pull", repo.id);
+    let build_url =
+      format!("{host}/listener/github/repo/{}/build", repo.id);
+
+    let mut clone_enabled = false;
+    let mut pull_enabled = false;
+    let mut build_enabled = false;
+
+    for webhook in webhooks {
+      if !webhook.active {
+        continue;
+      }
+      if webhook.config.url == clone_url {
+        clone_enabled = true
+      }
+      if webhook.config.url == pull_url {
+        pull_enabled = true
+      }
+      if webhook.config.url == build_url {
+        build_enabled = true
+      }
+    }
+
+    Ok(GetRepoWebhooksEnabledResponse {
+      managed: true,
+      clone_enabled,
+      pull_enabled,
+      build_enabled,
+    })
+  }
+}

bin/core/src/api/read/schedule.rs

@@ -1,4 +1,4 @@
-use futures_util::future::join_all;
+use futures::future::join_all;
 use komodo_client::{
   api::read::*,
   entities::{
@@ -10,7 +10,7 @@ use komodo_client::{
     schedule::Schedule,
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{
   helpers::query::{get_all_tags, get_last_run_at},
@@ -24,31 +24,29 @@ impl Resolve<ReadArgs> for ListSchedules {
   async fn resolve(
     self,
     args: &ReadArgs,
-  ) -> mogh_error::Result<Vec<Schedule>> {
+  ) -> serror::Result<Vec<Schedule>> {
     let all_tags = get_all_tags(None).await?;
     let (actions, procedures) = tokio::try_join!(
       list_full_for_user::<Action>(
         ResourceQuery {
+          names: Default::default(),
           templates: TemplatesQueryBehavior::Include,
           tag_behavior: self.tag_behavior,
           tags: self.tags.clone(),
-          ..Default::default()
+          specific: Default::default(),
         },
-        None,
-        None,
         &args.user,
         PermissionLevel::Read.into(),
         &all_tags,
       ),
       list_full_for_user::<Procedure>(
         ResourceQuery {
+          names: Default::default(),
           templates: TemplatesQueryBehavior::Include,
           tag_behavior: self.tag_behavior,
           tags: self.tags.clone(),
-          ..Default::default()
+          specific: Default::default(),
         },
-        None,
-        None,
         &args.user,
         PermissionLevel::Read.into(),
         &all_tags,

bin/core/src/api/read/server.rs

@@ -1,4 +1,5 @@
 use std::{
+  cmp,
   collections::HashMap,
   sync::{Arc, OnceLock},
 };
@@ -14,27 +15,44 @@ use database::mungos::{
 use komodo_client::{
   api::read::*,
   entities::{
+    ResourceTarget,
+    deployment::Deployment,
+    docker::{
+      container::{
+        Container, ContainerListItem, ContainerStateStatusEnum,
+      },
+      image::{Image, ImageHistoryResponseItem},
+      network::Network,
+      volume::Volume,
+    },
+    komodo_timestamp,
     permission::PermissionLevel,
     server::{
-      Server, ServerActionState, ServerListItem, ServerSortBy,
-      ServerState,
+      Server, ServerActionState, ServerListItem, ServerState,
+      TerminalInfo,
     },
+    stack::{Stack, StackServiceNames},
     stats::{SystemInformation, SystemProcess},
+    update::Log,
+  },
+};
+use periphery_client::api::{
+  self as periphery,
+  container::InspectContainer,
+  docker::{
+    ImageHistory, InspectImage, InspectNetwork, InspectVolume,
   },
 };
-use mogh_error::AddStatusCode;
-use mogh_resolver::Resolve;
-use periphery_client::api as periphery;
 use reqwest::StatusCode;
+use resolver_api::Resolve;
+use serror::AddStatusCode;
 use tokio::sync::Mutex;
 
 use crate::{
-  helpers::{
-    periphery_client,
-    query::{get_all_tags, get_cached_server_state},
-  },
+  helpers::{periphery_client, query::get_all_tags},
   permission::get_check_permissions,
   resource,
+  stack::compose_container_match_regex,
   state::{action_states, db_client, server_status_cache},
 };
 
@@ -44,11 +62,9 @@ impl Resolve<ReadArgs> for GetServersSummary {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetServersSummaryResponse> {
+  ) -> serror::Result<GetServersSummaryResponse> {
     let servers = resource::list_for_user::<Server>(
       Default::default(),
-      None,
-      None,
       user,
       PermissionLevel::Read.into(),
       &[],
@@ -88,7 +104,7 @@ impl Resolve<ReadArgs> for GetServer {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Server> {
+  ) -> serror::Result<Server> {
     Ok(
       get_check_permissions::<Server>(
         &self.server,
@@ -104,48 +120,21 @@ impl Resolve<ReadArgs> for ListServers {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Vec<ServerListItem>> {
+  ) -> serror::Result<Vec<ServerListItem>> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let states = self.query.specific.states.clone();
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
-    let sort_by: resource::ListItemSort<ServerListItem> =
-      match self.sort_by {
-        ServerSortBy::Name => resource::ListItemSort::Name,
-        ServerSortBy::Region => {
-          resource::ListItemSort::DbField("config.region")
-        }
-        ServerSortBy::Version => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.version.cmp(&b.info.version)
-          }))
-        }
-        ServerSortBy::State => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.state.to_string().cmp(&b.info.state.to_string())
-          }))
-        }
-      };
-    let servers = resource::list_items_for_user::<Server>(
-      self.query,
-      resource::ListItemsQueryOptions {
-        limit,
-        page: self.page,
-        sort_desc: self.sort_desc,
-        sort_by,
-      },
-      user,
-      PermissionLevel::Read.into(),
-      &all_tags,
-      |server| {
-        states.is_empty() || states.contains(&server.info.state)
-      },
+    Ok(
+      resource::list_for_user::<Server>(
+        self.query,
+        user,
+        PermissionLevel::Read.into(),
+        &all_tags,
+      )
+      .await?,
     )
-    .await?;
-    Ok(servers)
   }
 }
 
@@ -153,35 +142,18 @@ impl Resolve<ReadArgs> for ListFullServers {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListFullServersResponse> {
+  ) -> serror::Result<ListFullServersResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let states = self.query.specific.states.clone();
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
     Ok(
-      resource::list_full_for_user_filtered::<Server, _>(
+      resource::list_full_for_user::<Server>(
         self.query,
-        limit,
-        self.page,
         user,
         PermissionLevel::Read.into(),
         &all_tags,
-        |server| {
-          let states = states.clone();
-          async move {
-            if states.is_empty()
-              || states
-                .contains(&get_cached_server_state(&server.id).await)
-            {
-              Some(server)
-            } else {
-              None
-            }
-          }
-        },
       )
       .await?,
     )
@@ -192,7 +164,7 @@ impl Resolve<ReadArgs> for GetServerState {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetServerStateResponse> {
+  ) -> serror::Result<GetServerStateResponse> {
     let server = get_check_permissions::<Server>(
       &self.server,
       user,
@@ -214,7 +186,7 @@ impl Resolve<ReadArgs> for GetServerActionState {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ServerActionState> {
+  ) -> serror::Result<ServerActionState> {
     let server = get_check_permissions::<Server>(
       &self.server,
       user,
@@ -235,7 +207,7 @@ impl Resolve<ReadArgs> for GetPeripheryInformation {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetPeripheryInformationResponse> {
+  ) -> serror::Result<GetPeripheryInformationResponse> {
     let server = get_check_permissions::<Server>(
       &self.server,
       user,
@@ -258,7 +230,7 @@ impl Resolve<ReadArgs> for GetSystemInformation {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<SystemInformation> {
+  ) -> serror::Result<SystemInformation> {
     let server = get_check_permissions::<Server>(
       &self.server,
       user,
@@ -282,7 +254,7 @@ impl Resolve<ReadArgs> for GetSystemStats {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetSystemStatsResponse> {
+  ) -> serror::Result<GetSystemStatsResponse> {
     let server = get_check_permissions::<Server>(
       &self.server,
       user,
@@ -314,7 +286,7 @@ impl Resolve<ReadArgs> for ListSystemProcesses {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListSystemProcessesResponse> {
+  ) -> serror::Result<ListSystemProcessesResponse> {
     let server = get_check_permissions::<Server>(
       &self.server,
       user,
@@ -349,7 +321,7 @@ impl Resolve<ReadArgs> for GetHistoricalServerStats {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetHistoricalServerStatsResponse> {
+  ) -> serror::Result<GetHistoricalServerStatsResponse> {
     let GetHistoricalServerStats {
       server,
       granularity,
@@ -382,7 +354,7 @@ impl Resolve<ReadArgs> for GetHistoricalServerStats {
       },
       FindOptions::builder()
         .sort(doc! { "ts": -1 })
-        .skip((page as u64).saturating_mul(STATS_PER_PAGE as u64))
+        .skip(page as u64 * STATS_PER_PAGE as u64)
         .limit(STATS_PER_PAGE)
         .build(),
     )
@@ -397,3 +369,529 @@ impl Resolve<ReadArgs> for GetHistoricalServerStats {
     Ok(res)
   }
 }
+
+impl Resolve<ReadArgs> for ListDockerContainers {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<ListDockerContainersResponse> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Read.into(),
+    )
+    .await?;
+    let cache = server_status_cache()
+      .get_or_insert_default(&server.id)
+      .await;
+    if let Some(containers) = &cache.containers {
+      Ok(containers.clone())
+    } else {
+      Ok(Vec::new())
+    }
+  }
+}
+
+impl Resolve<ReadArgs> for ListAllDockerContainers {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<ListAllDockerContainersResponse> {
+    let servers = resource::list_for_user::<Server>(
+      Default::default(),
+      user,
+      PermissionLevel::Read.into(),
+      &[],
+    )
+    .await?
+    .into_iter()
+    .filter(|server| {
+      self.servers.is_empty()
+        || self.servers.contains(&server.id)
+        || self.servers.contains(&server.name)
+    });
+
+    let mut containers = Vec::<ContainerListItem>::new();
+
+    for server in servers {
+      let cache = server_status_cache()
+        .get_or_insert_default(&server.id)
+        .await;
+      if let Some(more_containers) = &cache.containers {
+        containers.extend(more_containers.clone());
+      }
+    }
+
+    Ok(containers)
+  }
+}
+
+impl Resolve<ReadArgs> for GetDockerContainersSummary {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<GetDockerContainersSummaryResponse> {
+    let servers = resource::list_full_for_user::<Server>(
+      Default::default(),
+      user,
+      PermissionLevel::Read.into(),
+      &[],
+    )
+    .await
+    .context("failed to get servers from db")?;
+
+    let mut res = GetDockerContainersSummaryResponse::default();
+
+    for server in servers {
+      let cache = server_status_cache()
+        .get_or_insert_default(&server.id)
+        .await;
+
+      if let Some(containers) = &cache.containers {
+        for container in containers {
+          res.total += 1;
+          match container.state {
+            ContainerStateStatusEnum::Created
+            | ContainerStateStatusEnum::Paused
+            | ContainerStateStatusEnum::Exited => res.stopped += 1,
+            ContainerStateStatusEnum::Running => res.running += 1,
+            ContainerStateStatusEnum::Empty => res.unknown += 1,
+            _ => res.unhealthy += 1,
+          }
+        }
+      }
+    }
+
+    Ok(res)
+  }
+}
+
+impl Resolve<ReadArgs> for InspectDockerContainer {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<Container> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Read.inspect(),
+    )
+    .await?;
+    let cache = server_status_cache()
+      .get_or_insert_default(&server.id)
+      .await;
+    if cache.state != ServerState::Ok {
+      return Err(
+        anyhow!(
+          "Cannot inspect container: server is {:?}",
+          cache.state
+        )
+        .into(),
+      );
+    }
+    let res = periphery_client(&server)
+      .await?
+      .request(InspectContainer {
+        name: self.container,
+      })
+      .await?;
+    Ok(res)
+  }
+}
+
+const MAX_LOG_LENGTH: u64 = 5000;
+
+impl Resolve<ReadArgs> for GetContainerLog {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<Log> {
+    let GetContainerLog {
+      server,
+      container,
+      tail,
+      timestamps,
+    } = self;
+    let server = get_check_permissions::<Server>(
+      &server,
+      user,
+      PermissionLevel::Read.logs(),
+    )
+    .await?;
+    let res = periphery_client(&server)
+      .await?
+      .request(periphery::container::GetContainerLog {
+        name: container,
+        tail: cmp::min(tail, MAX_LOG_LENGTH),
+        timestamps,
+      })
+      .await
+      .context("failed at call to periphery")?;
+    Ok(res)
+  }
+}
+
+impl Resolve<ReadArgs> for SearchContainerLog {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<Log> {
+    let SearchContainerLog {
+      server,
+      container,
+      terms,
+      combinator,
+      invert,
+      timestamps,
+    } = self;
+    let server = get_check_permissions::<Server>(
+      &server,
+      user,
+      PermissionLevel::Read.logs(),
+    )
+    .await?;
+    let res = periphery_client(&server)
+      .await?
+      .request(periphery::container::GetContainerLogSearch {
+        name: container,
+        terms,
+        combinator,
+        invert,
+        timestamps,
+      })
+      .await
+      .context("failed at call to periphery")?;
+    Ok(res)
+  }
+}
+
+impl Resolve<ReadArgs> for GetResourceMatchingContainer {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<GetResourceMatchingContainerResponse> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Read.into(),
+    )
+    .await?;
+    // first check deployments
+    if let Ok(deployment) =
+      resource::get::<Deployment>(&self.container).await
+    {
+      return Ok(GetResourceMatchingContainerResponse {
+        resource: ResourceTarget::Deployment(deployment.id).into(),
+      });
+    }
+
+    // then check stacks
+    let stacks =
+      resource::list_full_for_user_using_document::<Stack>(
+        doc! { "config.server_id": &server.id },
+        user,
+      )
+      .await?;
+
+    // check matching stack
+    for stack in stacks {
+      for StackServiceNames {
+        service_name,
+        container_name,
+        ..
+      } in stack
+        .info
+        .deployed_services
+        .unwrap_or(stack.info.latest_services)
+      {
+        let is_match = match compose_container_match_regex(&container_name)
+          .with_context(|| format!("failed to construct container name matching regex for service {service_name}")) 
+        {
+          Ok(regex) => regex,
+          Err(e) => {
+            warn!("{e:#}");
+            continue;
+          }
+        }.is_match(&self.container);
+
+        if is_match {
+          return Ok(GetResourceMatchingContainerResponse {
+            resource: ResourceTarget::Stack(stack.id).into(),
+          });
+        }
+      }
+    }
+
+    Ok(GetResourceMatchingContainerResponse { resource: None })
+  }
+}
+
+impl Resolve<ReadArgs> for ListDockerNetworks {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<ListDockerNetworksResponse> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Read.into(),
+    )
+    .await?;
+    let cache = server_status_cache()
+      .get_or_insert_default(&server.id)
+      .await;
+    if let Some(networks) = &cache.networks {
+      Ok(networks.clone())
+    } else {
+      Ok(Vec::new())
+    }
+  }
+}
+
+impl Resolve<ReadArgs> for InspectDockerNetwork {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<Network> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Read.into(),
+    )
+    .await?;
+    let cache = server_status_cache()
+      .get_or_insert_default(&server.id)
+      .await;
+    if cache.state != ServerState::Ok {
+      return Err(
+        anyhow!(
+          "Cannot inspect network: server is {:?}",
+          cache.state
+        )
+        .into(),
+      );
+    }
+    let res = periphery_client(&server)
+      .await?
+      .request(InspectNetwork { name: self.network })
+      .await?;
+    Ok(res)
+  }
+}
+
+impl Resolve<ReadArgs> for ListDockerImages {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<ListDockerImagesResponse> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Read.into(),
+    )
+    .await?;
+    let cache = server_status_cache()
+      .get_or_insert_default(&server.id)
+      .await;
+    if let Some(images) = &cache.images {
+      Ok(images.clone())
+    } else {
+      Ok(Vec::new())
+    }
+  }
+}
+
+impl Resolve<ReadArgs> for InspectDockerImage {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<Image> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Read.into(),
+    )
+    .await?;
+    let cache = server_status_cache()
+      .get_or_insert_default(&server.id)
+      .await;
+    if cache.state != ServerState::Ok {
+      return Err(
+        anyhow!("Cannot inspect image: server is {:?}", cache.state)
+          .into(),
+      );
+    }
+    let res = periphery_client(&server)
+      .await?
+      .request(InspectImage { name: self.image })
+      .await?;
+    Ok(res)
+  }
+}
+
+impl Resolve<ReadArgs> for ListDockerImageHistory {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<Vec<ImageHistoryResponseItem>> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Read.into(),
+    )
+    .await?;
+    let cache = server_status_cache()
+      .get_or_insert_default(&server.id)
+      .await;
+    if cache.state != ServerState::Ok {
+      return Err(
+        anyhow!(
+          "Cannot get image history: server is {:?}",
+          cache.state
+        )
+        .into(),
+      );
+    }
+    let res = periphery_client(&server)
+      .await?
+      .request(ImageHistory { name: self.image })
+      .await?;
+    Ok(res)
+  }
+}
+
+impl Resolve<ReadArgs> for ListDockerVolumes {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<ListDockerVolumesResponse> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Read.into(),
+    )
+    .await?;
+    let cache = server_status_cache()
+      .get_or_insert_default(&server.id)
+      .await;
+    if let Some(volumes) = &cache.volumes {
+      Ok(volumes.clone())
+    } else {
+      Ok(Vec::new())
+    }
+  }
+}
+
+impl Resolve<ReadArgs> for InspectDockerVolume {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<Volume> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Read.into(),
+    )
+    .await?;
+    let cache = server_status_cache()
+      .get_or_insert_default(&server.id)
+      .await;
+    if cache.state != ServerState::Ok {
+      return Err(
+        anyhow!("Cannot inspect volume: server is {:?}", cache.state)
+          .into(),
+      );
+    }
+    let res = periphery_client(&server)
+      .await?
+      .request(InspectVolume { name: self.volume })
+      .await?;
+    Ok(res)
+  }
+}
+
+impl Resolve<ReadArgs> for ListComposeProjects {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<ListComposeProjectsResponse> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Read.into(),
+    )
+    .await?;
+    let cache = server_status_cache()
+      .get_or_insert_default(&server.id)
+      .await;
+    if let Some(projects) = &cache.projects {
+      Ok(projects.clone())
+    } else {
+      Ok(Vec::new())
+    }
+  }
+}
+
+#[derive(Default)]
+struct TerminalCacheItem {
+  list: Vec<TerminalInfo>,
+  ttl: i64,
+}
+
+const TERMINAL_CACHE_TIMEOUT: i64 = 30_000;
+
+#[derive(Default)]
+struct TerminalCache(
+  std::sync::Mutex<
+    HashMap<String, Arc<tokio::sync::Mutex<TerminalCacheItem>>>,
+  >,
+);
+
+impl TerminalCache {
+  fn get_or_insert(
+    &self,
+    server_id: String,
+  ) -> Arc<tokio::sync::Mutex<TerminalCacheItem>> {
+    if let Some(cached) =
+      self.0.lock().unwrap().get(&server_id).cloned()
+    {
+      return cached;
+    }
+    let to_cache =
+      Arc::new(tokio::sync::Mutex::new(TerminalCacheItem::default()));
+    self.0.lock().unwrap().insert(server_id, to_cache.clone());
+    to_cache
+  }
+}
+
+fn terminals_cache() -> &'static TerminalCache {
+  static TERMINALS: OnceLock<TerminalCache> = OnceLock::new();
+  TERMINALS.get_or_init(Default::default)
+}
+
+impl Resolve<ReadArgs> for ListTerminals {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<ListTerminalsResponse> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Read.terminal(),
+    )
+    .await?;
+    let cache = terminals_cache().get_or_insert(server.id.clone());
+    let mut cache = cache.lock().await;
+    if self.fresh || komodo_timestamp() > cache.ttl {
+      cache.list = periphery_client(&server)
+        .await?
+        .request(periphery_client::api::terminal::ListTerminals {})
+        .await
+        .context("Failed to get fresh terminal list")?;
+      cache.ttl = komodo_timestamp() + TERMINAL_CACHE_TIMEOUT;
+      Ok(cache.list.clone())
+    } else {
+      Ok(cache.list.clone())
+    }
+  }
+}

bin/core/src/api/read/stack.rs

@@ -4,35 +4,29 @@ use anyhow::{Context, anyhow};
 use komodo_client::{
   api::read::*,
   entities::{
-    SwarmOrServer,
-    docker::{
-      container::Container, service::SwarmService, stack::SwarmStack,
-    },
+    config::core::CoreConfig,
+    docker::container::Container,
     permission::PermissionLevel,
-    stack::{
-      Stack, StackActionState, StackListItem, StackQuery,
-      StackService, StackSortBy, StackState,
-    },
+    server::{Server, ServerState},
+    stack::{Stack, StackActionState, StackListItem, StackState},
   },
 };
-use mogh_error::AddStatusCodeError as _;
-use mogh_resolver::Resolve;
 use periphery_client::api::{
   compose::{GetComposeLog, GetComposeLogSearch},
   container::InspectContainer,
 };
-use reqwest::StatusCode;
+use resolver_api::Resolve;
 
 use crate::{
-  helpers::{
-    periphery_client,
-    query::{get_all_tags, get_cached_stack_state},
-    swarm::swarm_request,
-  },
+  config::core_config,
+  helpers::{periphery_client, query::get_all_tags},
   permission::get_check_permissions,
   resource,
-  stack::setup_stack_execution,
-  state::{action_states, stack_status_cache},
+  stack::get_stack_and_server,
+  state::{
+    action_states, github_client, server_status_cache,
+    stack_status_cache,
+  },
 };
 
 use super::ReadArgs;
@@ -41,7 +35,7 @@ impl Resolve<ReadArgs> for GetStack {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Stack> {
+  ) -> serror::Result<Stack> {
     Ok(
       get_check_permissions::<Stack>(
         &self.stack,
@@ -57,7 +51,7 @@ impl Resolve<ReadArgs> for ListStackServices {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListStackServicesResponse> {
+  ) -> serror::Result<ListStackServicesResponse> {
     let stack = get_check_permissions::<Stack>(
       &self.stack,
       user,
@@ -77,132 +71,35 @@ impl Resolve<ReadArgs> for ListStackServices {
   }
 }
 
-impl Resolve<ReadArgs> for ListAllStackServices {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListStackServicesResponse> {
-    let all_tags = if self.tags.is_empty() {
-      vec![]
-    } else {
-      get_all_tags(None).await?
-    };
-    let stacks = resource::list_for_user::<Stack>(
-      StackQuery::builder()
-        .names(self.stacks.clone())
-        .tags(self.tags)
-        .build(),
-      None,
-      None,
-      user,
-      PermissionLevel::Read.into(),
-      &all_tags,
-    )
-    .await?;
-
-    let mut services = Vec::<StackService>::new();
-    let mut skipped = 0;
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
-    let limit_usize = limit as usize;
-    // Eg. page 1 skips until after 100 services, page 2 after 200.
-    let skip = limit.saturating_mul(self.page);
-    // Match terms case insensitively.
-    let terms = self
-      .terms
-      .iter()
-      .map(|term| term.to_lowercase())
-      .collect::<Vec<_>>();
-
-    for stack in stacks {
-      let cache =
-        stack_status_cache().get_or_insert_default(&stack.id).await;
-      let more = cache.curr.services
-        .iter()
-        .filter(|service| {
-          // Apply state filter if defined.
-          (self.state.is_empty() || self.state.contains(&service.state)) &&
-          // Apply terms filter if defined
-          (terms.is_empty()
-            // Match when all terms contained within a name.
-            || {
-              let name = service.service.to_lowercase();
-              terms.iter().all(|term| name.contains(term))
-            })
-        });
-      for service in more {
-        if skipped < skip {
-          skipped += 1;
-        } else {
-          // push and maybe early return
-          services.push(service.clone());
-          if limit > 0 && services.len() >= limit_usize {
-            return Ok(services);
-          }
-        }
-      }
-    }
-
-    Ok(services)
-  }
-}
-
 impl Resolve<ReadArgs> for GetStackLog {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetStackLogResponse> {
+  ) -> serror::Result<GetStackLogResponse> {
     let GetStackLog {
       stack,
-      mut services,
+      services,
       tail,
       timestamps,
     } = self;
-    let (stack, swarm_or_server) = setup_stack_execution(
+    let (stack, server) = get_stack_and_server(
       &stack,
       user,
       PermissionLevel::Read.logs(),
+      true,
     )
     .await?;
-
-    swarm_or_server.verify_has_target()?;
-
-    let log = match swarm_or_server {
-      SwarmOrServer::None => unreachable!(),
-      SwarmOrServer::Swarm(swarm) => {
-        let service = services.pop().context(
-          "Must pass single service for Swarm mode Stack logs",
-        )?;
-        swarm_request(
-          &swarm.config.server_ids,
-          periphery_client::api::swarm::GetSwarmServiceLog {
-            // The actual service name on swarm will be stackname_servicename
-            service: format!(
-              "{}_{service}",
-              stack.project_name(false)
-            ),
-            tail,
-            timestamps,
-            no_task_ids: false,
-            no_resolve: false,
-            details: false,
-          },
-        )
-        .await
-        .context("Failed to get stack service log from swarm")?
-      }
-      SwarmOrServer::Server(server) => periphery_client(&server)
-        .await?
-        .request(GetComposeLog {
-          project: stack.project_name(false),
-          services,
-          tail,
-          timestamps,
-        })
-        .await
-        .context("Failed to get stack log from periphery")?,
-    };
-
-    Ok(log)
+    let res = periphery_client(&server)
+      .await?
+      .request(GetComposeLog {
+        project: stack.project_name(false),
+        services,
+        tail,
+        timestamps,
+      })
+      .await
+      .context("Failed to get stack log from periphery")?;
+    Ok(res)
   }
 }
 
@@ -210,61 +107,35 @@ impl Resolve<ReadArgs> for SearchStackLog {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<SearchStackLogResponse> {
+  ) -> serror::Result<SearchStackLogResponse> {
     let SearchStackLog {
       stack,
-      mut services,
+      services,
       terms,
       combinator,
       invert,
       timestamps,
     } = self;
-    let (stack, swarm_or_server) = setup_stack_execution(
+    let (stack, server) = get_stack_and_server(
       &stack,
       user,
       PermissionLevel::Read.logs(),
+      true,
     )
     .await?;
-
-    swarm_or_server.verify_has_target()?;
-
-    let log = match swarm_or_server {
-      SwarmOrServer::None => unreachable!(),
-      SwarmOrServer::Swarm(swarm) => {
-        let service = services.pop().context(
-          "Must pass single service for Swarm mode Stack logs",
-        )?;
-        swarm_request(
-          &swarm.config.server_ids,
-          periphery_client::api::swarm::GetSwarmServiceLogSearch {
-            service,
-            terms,
-            combinator,
-            invert,
-            timestamps,
-            no_task_ids: false,
-            no_resolve: false,
-            details: false,
-          },
-        )
-        .await
-        .context("Failed to get stack service log from swarm")?
-      }
-      SwarmOrServer::Server(server) => periphery_client(&server)
-        .await?
-        .request(GetComposeLogSearch {
-          project: stack.project_name(false),
-          services,
-          terms,
-          combinator,
-          invert,
-          timestamps,
-        })
-        .await
-        .context("Failed to search stack log from periphery")?,
-    };
-
-    Ok(log)
+    let res = periphery_client(&server)
+      .await?
+      .request(GetComposeLogSearch {
+        project: stack.project_name(false),
+        services,
+        terms,
+        combinator,
+        invert,
+        timestamps,
+      })
+      .await
+      .context("Failed to search stack log from periphery")?;
+    Ok(res)
   }
 }
 
@@ -272,31 +143,40 @@ impl Resolve<ReadArgs> for InspectStackContainer {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Container> {
+  ) -> serror::Result<Container> {
     let InspectStackContainer { stack, service } = self;
-    let (stack, swarm_or_server) = setup_stack_execution(
+    let stack = get_check_permissions::<Stack>(
       &stack,
       user,
       PermissionLevel::Read.inspect(),
     )
     .await?;
-
-    let SwarmOrServer::Server(server) = swarm_or_server else {
+    if stack.config.server_id.is_empty() {
+      return Err(
+        anyhow!("Cannot inspect stack, not attached to any server")
+          .into(),
+      );
+    }
+    let server =
+      resource::get::<Server>(&stack.config.server_id).await?;
+    let cache = server_status_cache()
+      .get_or_insert_default(&server.id)
+      .await;
+    if cache.state != ServerState::Ok {
       return Err(
         anyhow!(
-          "InspectStackContainer should not be called for Stack in Swarm Mode"
+          "Cannot inspect container: server is {:?}",
+          cache.state
         )
-        .status_code(StatusCode::BAD_REQUEST),
+        .into(),
       );
-    };
-
+    }
     let services = &stack_status_cache()
       .get(&stack.id)
       .await
       .unwrap_or_default()
       .curr
       .services;
-
     let Some(name) = services
       .iter()
       .find(|s| s.service == service)
@@ -306,106 +186,19 @@ impl Resolve<ReadArgs> for InspectStackContainer {
         "No service found matching '{service}'. Was the stack last deployed manually?"
       ).into());
     };
-
     let res = periphery_client(&server)
       .await?
       .request(InspectContainer { name })
-      .await
-      .context("Failed to inspect container on server")?;
-
+      .await?;
     Ok(res)
   }
 }
 
-impl Resolve<ReadArgs> for InspectStackSwarmService {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<SwarmService> {
-    let InspectStackSwarmService { stack, service } = self;
-    let (stack, swarm_or_server) = setup_stack_execution(
-      &stack,
-      user,
-      PermissionLevel::Read.inspect(),
-    )
-    .await?;
-
-    let SwarmOrServer::Swarm(swarm) = swarm_or_server else {
-      return Err(
-        anyhow!(
-          "InspectStackSwarmService should only be called for Stack in Swarm Mode"
-        )
-        .status_code(StatusCode::BAD_REQUEST),
-      );
-    };
-
-    let services = &stack_status_cache()
-      .get(&stack.id)
-      .await
-      .unwrap_or_default()
-      .curr
-      .services;
-
-    let Some(service) = services
-      .iter()
-      .find(|s| s.service == service)
-      .and_then(|s| {
-        s.swarm_service.as_ref().and_then(|c| c.name.clone())
-      })
-    else {
-      return Err(anyhow!(
-        "No service found matching '{service}'. Was the stack last deployed manually?"
-      ).into());
-    };
-
-    swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::InspectSwarmService { service },
-    )
-    .await
-    .context("Failed to inspect service on swarm")
-    .map_err(Into::into)
-  }
-}
-
-impl Resolve<ReadArgs> for InspectStackSwarmInfo {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<SwarmStack> {
-    let (stack, swarm_or_server) = setup_stack_execution(
-      &self.stack,
-      user,
-      PermissionLevel::Read.inspect(),
-    )
-    .await?;
-
-    let SwarmOrServer::Swarm(swarm) = swarm_or_server else {
-      return Err(
-        anyhow!(
-          "InspectStackSwarmInfo should only be called for Stack in Swarm Mode"
-        )
-        .status_code(StatusCode::BAD_REQUEST),
-      );
-    };
-
-    swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::InspectSwarmStack {
-        stack: stack.project_name(false),
-      },
-    )
-    .await
-    .context("Failed to inspect stack info on swarm")
-    .map_err(Into::into)
-  }
-}
-
 impl Resolve<ReadArgs> for ListCommonStackExtraArgs {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListCommonStackExtraArgsResponse> {
+  ) -> serror::Result<ListCommonStackExtraArgsResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
@@ -413,14 +206,12 @@ impl Resolve<ReadArgs> for ListCommonStackExtraArgs {
     };
     let stacks = resource::list_full_for_user::<Stack>(
       self.query,
-      None,
-      None,
       user,
       PermissionLevel::Read.into(),
       &all_tags,
     )
     .await
-    .context("Failed to get resources matching query")?;
+    .context("failed to get resources matching query")?;
 
     // first collect with guaranteed uniqueness
     let mut res = HashSet::<String>::new();
@@ -441,7 +232,7 @@ impl Resolve<ReadArgs> for ListCommonStackBuildExtraArgs {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListCommonStackBuildExtraArgsResponse> {
+  ) -> serror::Result<ListCommonStackBuildExtraArgsResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
@@ -449,14 +240,12 @@ impl Resolve<ReadArgs> for ListCommonStackBuildExtraArgs {
     };
     let stacks = resource::list_full_for_user::<Stack>(
       self.query,
-      None,
-      None,
       user,
       PermissionLevel::Read.into(),
       &all_tags,
     )
     .await
-    .context("Failed to get resources matching query")?;
+    .context("failed to get resources matching query")?;
 
     // first collect with guaranteed uniqueness
     let mut res = HashSet::<String>::new();
@@ -477,66 +266,34 @@ impl Resolve<ReadArgs> for ListStacks {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Vec<StackListItem>> {
+  ) -> serror::Result<Vec<StackListItem>> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
     let only_update_available = self.query.specific.update_available;
-    let states = self.query.specific.states.clone();
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
-    let sort_by: resource::ListItemSort<StackListItem> =
-      match self.sort_by {
-        StackSortBy::Name => resource::ListItemSort::Name,
-        StackSortBy::Source => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.repo.cmp(&b.info.repo)
-          }))
-        }
-        StackSortBy::Host => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            let host_a = if a.info.swarm_id.is_empty() {
-              &a.info.server_name
-            } else {
-              &a.info.swarm_name
-            };
-            let host_b = if b.info.swarm_id.is_empty() {
-              &b.info.server_name
-            } else {
-              &b.info.swarm_name
-            };
-            host_a.cmp(host_b)
-          }))
-        }
-        StackSortBy::State => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.state.to_string().cmp(&b.info.state.to_string())
-          }))
-        }
-      };
-    let stacks = resource::list_items_for_user::<Stack>(
+    let stacks = resource::list_for_user::<Stack>(
       self.query,
-      resource::ListItemsQueryOptions {
-        limit,
-        page: self.page,
-        sort_desc: self.sort_desc,
-        sort_by,
-      },
       user,
       PermissionLevel::Read.into(),
       &all_tags,
-      |stack| {
-        (!only_update_available
-          || stack
+    )
+    .await?;
+    let stacks = if only_update_available {
+      stacks
+        .into_iter()
+        .filter(|stack| {
+          stack
             .info
             .services
             .iter()
-            .any(|service| service.update_available))
-          && (states.is_empty() || states.contains(&stack.info.state))
-      },
-    )
-    .await?;
+            .any(|service| service.update_available)
+        })
+        .collect()
+    } else {
+      stacks
+    };
     Ok(stacks)
   }
 }
@@ -545,35 +302,18 @@ impl Resolve<ReadArgs> for ListFullStacks {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListFullStacksResponse> {
+  ) -> serror::Result<ListFullStacksResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let states = self.query.specific.states.clone();
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
     Ok(
-      resource::list_full_for_user_filtered::<Stack, _>(
+      resource::list_full_for_user::<Stack>(
         self.query,
-        limit,
-        self.page,
         user,
         PermissionLevel::Read.into(),
         &all_tags,
-        |stack| {
-          let states = states.clone();
-          async move {
-            if states.is_empty()
-              || states
-                .contains(&get_cached_stack_state(&stack.id).await)
-            {
-              Some(stack)
-            } else {
-              None
-            }
-          }
-        },
       )
       .await?,
     )
@@ -584,7 +324,7 @@ impl Resolve<ReadArgs> for GetStackActionState {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<StackActionState> {
+  ) -> serror::Result<StackActionState> {
     let stack = get_check_permissions::<Stack>(
       &self.stack,
       user,
@@ -605,17 +345,15 @@ impl Resolve<ReadArgs> for GetStacksSummary {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetStacksSummaryResponse> {
+  ) -> serror::Result<GetStacksSummaryResponse> {
     let stacks = resource::list_full_for_user::<Stack>(
       Default::default(),
-      None,
-      None,
       user,
       PermissionLevel::Read.into(),
       &[],
     )
     .await
-    .context("Failed to get stacks from database")?;
+    .context("failed to get stacks from db")?;
 
     let mut res = GetStacksSummaryResponse::default();
 
@@ -640,3 +378,91 @@ impl Resolve<ReadArgs> for GetStacksSummary {
     Ok(res)
   }
 }
+
+impl Resolve<ReadArgs> for GetStackWebhooksEnabled {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<GetStackWebhooksEnabledResponse> {
+    let Some(github) = github_client() else {
+      return Ok(GetStackWebhooksEnabledResponse {
+        managed: false,
+        refresh_enabled: false,
+        deploy_enabled: false,
+      });
+    };
+
+    let stack = get_check_permissions::<Stack>(
+      &self.stack,
+      user,
+      PermissionLevel::Read.into(),
+    )
+    .await?;
+
+    if stack.config.git_provider != "github.com"
+      || stack.config.repo.is_empty()
+    {
+      return Ok(GetStackWebhooksEnabledResponse {
+        managed: false,
+        refresh_enabled: false,
+        deploy_enabled: false,
+      });
+    }
+
+    let mut split = stack.config.repo.split('/');
+    let owner = split.next().context("Sync repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Ok(GetStackWebhooksEnabledResponse {
+        managed: false,
+        refresh_enabled: false,
+        deploy_enabled: false,
+      });
+    };
+
+    let repo_name =
+      split.next().context("Repo repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo_name)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      ..
+    } = core_config();
+
+    let host = if webhook_base_url.is_empty() {
+      host
+    } else {
+      webhook_base_url
+    };
+    let refresh_url =
+      format!("{host}/listener/github/stack/{}/refresh", stack.id);
+    let deploy_url =
+      format!("{host}/listener/github/stack/{}/deploy", stack.id);
+
+    let mut refresh_enabled = false;
+    let mut deploy_enabled = false;
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == refresh_url {
+        refresh_enabled = true
+      }
+      if webhook.active && webhook.config.url == deploy_url {
+        deploy_enabled = true
+      }
+    }
+
+    Ok(GetStackWebhooksEnabledResponse {
+      managed: true,
+      refresh_enabled,
+      deploy_enabled,
+    })
+  }
+}

bin/core/src/api/read/swarm.rs

@@ -1,546 +0,0 @@
-use anyhow::{Context, anyhow};
-use komodo_client::{
-  api::read::*,
-  entities::{
-    permission::PermissionLevel,
-    swarm::{
-      Swarm, SwarmActionState, SwarmListItem, SwarmSortBy, SwarmState,
-    },
-  },
-};
-use mogh_resolver::Resolve;
-
-use crate::{
-  helpers::{query::get_all_tags, swarm::swarm_request},
-  permission::get_check_permissions,
-  resource,
-  state::{action_states, server_status_cache, swarm_status_cache},
-};
-
-use super::ReadArgs;
-
-impl Resolve<ReadArgs> for GetSwarm {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Swarm> {
-    Ok(
-      get_check_permissions::<Swarm>(
-        &self.swarm,
-        user,
-        PermissionLevel::Read.into(),
-      )
-      .await?,
-    )
-  }
-}
-
-impl Resolve<ReadArgs> for ListSwarms {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Vec<SwarmListItem>> {
-    let all_tags = if self.query.tags.is_empty() {
-      vec![]
-    } else {
-      get_all_tags(None).await?
-    };
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
-    let sort_by: resource::ListItemSort<SwarmListItem> =
-      match self.sort_by {
-        SwarmSortBy::Name => resource::ListItemSort::Name,
-        SwarmSortBy::State => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.state.to_string().cmp(&b.info.state.to_string())
-          }))
-        }
-      };
-    Ok(
-      resource::list_items_for_user::<Swarm>(
-        self.query,
-        resource::ListItemsQueryOptions {
-          limit,
-          page: self.page,
-          sort_desc: self.sort_desc,
-          sort_by,
-        },
-        user,
-        PermissionLevel::Read.into(),
-        &all_tags,
-        |_| true,
-      )
-      .await?,
-    )
-  }
-}
-
-impl Resolve<ReadArgs> for ListFullSwarms {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListFullSwarmsResponse> {
-    let all_tags = if self.query.tags.is_empty() {
-      vec![]
-    } else {
-      get_all_tags(None).await?
-    };
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
-    Ok(
-      resource::list_full_for_user::<Swarm>(
-        self.query,
-        limit as i64,
-        self.page.saturating_mul(limit),
-        user,
-        PermissionLevel::Read.into(),
-        &all_tags,
-      )
-      .await?,
-    )
-  }
-}
-
-impl Resolve<ReadArgs> for GetSwarmActionState {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<SwarmActionState> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let action_state = action_states()
-      .swarm
-      .get(&swarm.id)
-      .await
-      .unwrap_or_default()
-      .get()?;
-    Ok(action_state)
-  }
-}
-
-impl Resolve<ReadArgs> for GetSwarmsSummary {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetSwarmsSummaryResponse> {
-    let swarms = resource::list_full_for_user::<Swarm>(
-      Default::default(),
-      None,
-      None,
-      user,
-      PermissionLevel::Read.into(),
-      &[],
-    )
-    .await
-    .context("failed to get swarms from db")?;
-
-    let mut res = GetSwarmsSummaryResponse::default();
-
-    let cache = swarm_status_cache();
-
-    for swarm in swarms {
-      res.total += 1;
-
-      match cache
-        .get(&swarm.id)
-        .await
-        .map(|status| status.state)
-        .unwrap_or_default()
-      {
-        SwarmState::Unknown => {
-          res.unknown += 1;
-        }
-        SwarmState::Healthy => {
-          res.healthy += 1;
-        }
-        SwarmState::Unhealthy => {
-          res.unhealthy += 1;
-        }
-        SwarmState::Down => {
-          res.down += 1;
-        }
-      }
-    }
-
-    Ok(res)
-  }
-}
-
-impl Resolve<ReadArgs> for InspectSwarm {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<InspectSwarmResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.inspect(),
-    )
-    .await?;
-    let cache =
-      swarm_status_cache().get_or_insert_default(&swarm.id).await;
-    let inspect = cache
-      .inspect
-      .as_ref()
-      .cloned()
-      .context("SwarmInspectInfo not available")?;
-    Ok(inspect)
-  }
-}
-
-impl Resolve<ReadArgs> for ListSwarmNodes {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListSwarmNodesResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache =
-      swarm_status_cache().get_or_insert_default(&swarm.id).await;
-    if let Some(lists) = &cache.lists {
-      Ok(lists.nodes.clone())
-    } else {
-      Ok(Vec::new())
-    }
-  }
-}
-
-impl Resolve<ReadArgs> for InspectSwarmNode {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<InspectSwarmNodeResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.inspect(),
-    )
-    .await?;
-    swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::InspectSwarmNode {
-        node: self.node,
-      },
-    )
-    .await
-    .map_err(Into::into)
-  }
-}
-
-impl Resolve<ReadArgs> for ListSwarmServices {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListSwarmServicesResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache =
-      swarm_status_cache().get_or_insert_default(&swarm.id).await;
-    if let Some(lists) = &cache.lists {
-      Ok(lists.services.clone())
-    } else {
-      Ok(Vec::new())
-    }
-  }
-}
-
-impl Resolve<ReadArgs> for InspectSwarmService {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<InspectSwarmServiceResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.inspect(),
-    )
-    .await?;
-    swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::InspectSwarmService {
-        service: self.service,
-      },
-    )
-    .await
-    .map_err(Into::into)
-  }
-}
-
-impl Resolve<ReadArgs> for GetSwarmServiceLog {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetSwarmServiceLogResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.logs(),
-    )
-    .await?;
-    swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::GetSwarmServiceLog {
-        service: self.service,
-        tail: self.tail,
-        timestamps: self.timestamps,
-        no_task_ids: self.no_task_ids,
-        no_resolve: self.no_resolve,
-        details: self.details,
-      },
-    )
-    .await
-    .map_err(Into::into)
-  }
-}
-
-impl Resolve<ReadArgs> for SearchSwarmServiceLog {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<SearchSwarmServiceLogResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.logs(),
-    )
-    .await?;
-    swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::GetSwarmServiceLogSearch {
-        service: self.service,
-        terms: self.terms,
-        combinator: self.combinator,
-        invert: self.invert,
-        timestamps: self.timestamps,
-        no_task_ids: self.no_task_ids,
-        no_resolve: self.no_resolve,
-        details: self.details,
-      },
-    )
-    .await
-    .map_err(Into::into)
-  }
-}
-
-impl Resolve<ReadArgs> for ListSwarmTasks {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListSwarmTasksResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache =
-      swarm_status_cache().get_or_insert_default(&swarm.id).await;
-    if let Some(lists) = &cache.lists {
-      Ok(lists.tasks.clone())
-    } else {
-      Ok(Vec::new())
-    }
-  }
-}
-
-impl Resolve<ReadArgs> for InspectSwarmTask {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<InspectSwarmTaskResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.inspect(),
-    )
-    .await?;
-    swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::InspectSwarmTask {
-        task: self.task,
-      },
-    )
-    .await
-    .map_err(Into::into)
-  }
-}
-
-impl Resolve<ReadArgs> for ListSwarmSecrets {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListSwarmSecretsResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache =
-      swarm_status_cache().get_or_insert_default(&swarm.id).await;
-    if let Some(lists) = &cache.lists {
-      Ok(lists.secrets.clone())
-    } else {
-      Ok(Vec::new())
-    }
-  }
-}
-
-impl Resolve<ReadArgs> for InspectSwarmSecret {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<InspectSwarmSecretResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.inspect(),
-    )
-    .await?;
-    swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::InspectSwarmSecret {
-        secret: self.secret,
-      },
-    )
-    .await
-    .map_err(Into::into)
-  }
-}
-
-impl Resolve<ReadArgs> for ListSwarmConfigs {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListSwarmConfigsResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache =
-      swarm_status_cache().get_or_insert_default(&swarm.id).await;
-    if let Some(lists) = &cache.lists {
-      Ok(lists.configs.clone())
-    } else {
-      Ok(Vec::new())
-    }
-  }
-}
-
-impl Resolve<ReadArgs> for InspectSwarmConfig {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<InspectSwarmConfigResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.inspect(),
-    )
-    .await?;
-    swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::InspectSwarmConfig {
-        config: self.config,
-      },
-    )
-    .await
-    .map_err(Into::into)
-  }
-}
-
-impl Resolve<ReadArgs> for ListSwarmStacks {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListSwarmStacksResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    let cache =
-      swarm_status_cache().get_or_insert_default(&swarm.id).await;
-    if let Some(lists) = &cache.lists {
-      Ok(lists.stacks.clone())
-    } else {
-      Ok(Vec::new())
-    }
-  }
-}
-
-impl Resolve<ReadArgs> for InspectSwarmStack {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<InspectSwarmStackResponse> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.inspect(),
-    )
-    .await?;
-    swarm_request(
-      &swarm.config.server_ids,
-      periphery_client::api::swarm::InspectSwarmStack {
-        stack: self.stack,
-      },
-    )
-    .await
-    .map_err(Into::into)
-  }
-}
-
-impl Resolve<ReadArgs> for ListSwarmNetworks {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    let swarm = get_check_permissions::<Swarm>(
-      &self.swarm,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-
-    let cache = server_status_cache();
-
-    for server_id in swarm.config.server_ids {
-      let Some(status) = cache.get(&server_id).await else {
-        continue;
-      };
-      let Some(docker) = &status.docker else {
-        continue;
-      };
-      let networks = docker
-        .networks
-        .iter()
-        .filter(|network| {
-          network.driver.as_deref() == Some("overlay")
-        })
-        .cloned()
-        .collect::<Vec<_>>();
-      return Ok(networks);
-    }
-
-    Err(
-      anyhow!(
-        "Failed to retrieve swarm networks from any manager node."
-      )
-      .into(),
-    )
-  }
-}

bin/core/src/api/read/sync.rs

@@ -2,18 +2,21 @@ use anyhow::Context;
 use komodo_client::{
   api::read::*,
   entities::{
+    config::core::CoreConfig,
     permission::PermissionLevel,
     sync::{
       ResourceSync, ResourceSyncActionState, ResourceSyncListItem,
-      ResourceSyncSortBy,
     },
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{
-  helpers::query::get_all_tags, permission::get_check_permissions,
-  resource, state::action_states,
+  config::core_config,
+  helpers::query::get_all_tags,
+  permission::get_check_permissions,
+  resource,
+  state::{action_states, github_client},
 };
 
 use super::ReadArgs;
@@ -22,7 +25,7 @@ impl Resolve<ReadArgs> for GetResourceSync {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ResourceSync> {
+  ) -> serror::Result<ResourceSync> {
     Ok(
       get_check_permissions::<ResourceSync>(
         &self.sync,
@@ -38,45 +41,18 @@ impl Resolve<ReadArgs> for ListResourceSyncs {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Vec<ResourceSyncListItem>> {
+  ) -> serror::Result<Vec<ResourceSyncListItem>> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
-    let sort_by: resource::ListItemSort<ResourceSyncListItem> =
-      match self.sort_by {
-        ResourceSyncSortBy::Name => resource::ListItemSort::Name,
-        ResourceSyncSortBy::Source => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.repo.cmp(&b.info.repo)
-          }))
-        }
-        ResourceSyncSortBy::Branch => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.branch.cmp(&b.info.branch)
-          }))
-        }
-        ResourceSyncSortBy::State => {
-          resource::ListItemSort::InMemory(Box::new(|a, b| {
-            a.info.state.to_string().cmp(&b.info.state.to_string())
-          }))
-        }
-      };
     Ok(
-      resource::list_items_for_user::<ResourceSync>(
+      resource::list_for_user::<ResourceSync>(
         self.query,
-        resource::ListItemsQueryOptions {
-          limit,
-          page: self.page,
-          sort_desc: self.sort_desc,
-          sort_by,
-        },
         user,
         PermissionLevel::Read.into(),
         &all_tags,
-        |_| true,
       )
       .await?,
     )
@@ -87,18 +63,15 @@ impl Resolve<ReadArgs> for ListFullResourceSyncs {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListFullResourceSyncsResponse> {
+  ) -> serror::Result<ListFullResourceSyncsResponse> {
     let all_tags = if self.query.tags.is_empty() {
       vec![]
     } else {
       get_all_tags(None).await?
     };
-    let limit = self.limit.unwrap_or(DEFAULT_LIST_LIMIT);
     Ok(
       resource::list_full_for_user::<ResourceSync>(
         self.query,
-        limit as i64,
-        self.page.saturating_mul(limit),
         user,
         PermissionLevel::Read.into(),
         &all_tags,
@@ -112,7 +85,7 @@ impl Resolve<ReadArgs> for GetResourceSyncActionState {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ResourceSyncActionState> {
+  ) -> serror::Result<ResourceSyncActionState> {
     let sync = get_check_permissions::<ResourceSync>(
       &self.sync,
       user,
@@ -133,12 +106,10 @@ impl Resolve<ReadArgs> for GetResourceSyncsSummary {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetResourceSyncsSummaryResponse> {
+  ) -> serror::Result<GetResourceSyncsSummaryResponse> {
     let resource_syncs =
       resource::list_full_for_user::<ResourceSync>(
         Default::default(),
-        None,
-        None,
         user,
         PermissionLevel::Read.into(),
         &[],
@@ -153,7 +124,7 @@ impl Resolve<ReadArgs> for GetResourceSyncsSummary {
     for resource_sync in resource_syncs {
       res.total += 1;
 
-      if !(resource_sync.info.pending_deploys.is_empty()
+      if !(resource_sync.info.pending_deploy.to_deploy == 0
         && resource_sync.info.resource_updates.is_empty()
         && resource_sync.info.variable_updates.is_empty()
         && resource_sync.info.user_group_updates.is_empty())
@@ -183,3 +154,91 @@ impl Resolve<ReadArgs> for GetResourceSyncsSummary {
     Ok(res)
   }
 }
+
+impl Resolve<ReadArgs> for GetSyncWebhooksEnabled {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<GetSyncWebhooksEnabledResponse> {
+    let Some(github) = github_client() else {
+      return Ok(GetSyncWebhooksEnabledResponse {
+        managed: false,
+        refresh_enabled: false,
+        sync_enabled: false,
+      });
+    };
+
+    let sync = get_check_permissions::<ResourceSync>(
+      &self.sync,
+      user,
+      PermissionLevel::Read.into(),
+    )
+    .await?;
+
+    if sync.config.git_provider != "github.com"
+      || sync.config.repo.is_empty()
+    {
+      return Ok(GetSyncWebhooksEnabledResponse {
+        managed: false,
+        refresh_enabled: false,
+        sync_enabled: false,
+      });
+    }
+
+    let mut split = sync.config.repo.split('/');
+    let owner = split.next().context("Sync repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Ok(GetSyncWebhooksEnabledResponse {
+        managed: false,
+        refresh_enabled: false,
+        sync_enabled: false,
+      });
+    };
+
+    let repo_name =
+      split.next().context("Repo repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo_name)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      ..
+    } = core_config();
+
+    let host = if webhook_base_url.is_empty() {
+      host
+    } else {
+      webhook_base_url
+    };
+    let refresh_url =
+      format!("{host}/listener/github/sync/{}/refresh", sync.id);
+    let sync_url =
+      format!("{host}/listener/github/sync/{}/sync", sync.id);
+
+    let mut refresh_enabled = false;
+    let mut sync_enabled = false;
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == refresh_url {
+        refresh_enabled = true
+      }
+      if webhook.active && webhook.config.url == sync_url {
+        sync_enabled = true
+      }
+    }
+
+    Ok(GetSyncWebhooksEnabledResponse {
+      managed: true,
+      refresh_enabled,
+      sync_enabled,
+    })
+  }
+}

bin/core/src/api/read/tag.rs

@@ -7,23 +7,20 @@ use komodo_client::{
   api::read::{GetTag, ListTags},
   entities::tag::Tag,
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{helpers::query::get_tag, state::db_client};
 
 use super::ReadArgs;
 
 impl Resolve<ReadArgs> for GetTag {
-  async fn resolve(self, _: &ReadArgs) -> mogh_error::Result<Tag> {
+  async fn resolve(self, _: &ReadArgs) -> serror::Result<Tag> {
     Ok(get_tag(&self.tag).await?)
   }
 }
 
 impl Resolve<ReadArgs> for ListTags {
-  async fn resolve(
-    self,
-    _: &ReadArgs,
-  ) -> mogh_error::Result<Vec<Tag>> {
+  async fn resolve(self, _: &ReadArgs) -> serror::Result<Vec<Tag>> {
     let res = find_collect(
       &db_client().tags,
       self.query,

bin/core/src/api/read/terminal.rs

@@ -1,257 +0,0 @@
-use anyhow::Context as _;
-use futures_util::{
-  FutureExt, StreamExt as _, stream::FuturesUnordered,
-};
-use komodo_client::{
-  api::read::{ListTerminals, ListTerminalsResponse},
-  entities::{
-    deployment::Deployment,
-    permission::PermissionLevel,
-    server::Server,
-    stack::Stack,
-    terminal::{Terminal, TerminalTarget},
-    user::User,
-  },
-};
-use mogh_error::AddStatusCode;
-use mogh_resolver::Resolve;
-use reqwest::StatusCode;
-
-use crate::{
-  helpers::periphery_client, permission::get_check_permissions,
-  resource,
-};
-
-use super::ReadArgs;
-
-//
-
-impl Resolve<ReadArgs> for ListTerminals {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListTerminalsResponse> {
-    let Some(target) = self.target else {
-      return list_all_terminals_for_user(user, self.use_names).await;
-    };
-    match &target {
-      TerminalTarget::Server { server } => {
-        let server = server
-          .as_ref()
-          .context("Must provide 'target.params.server'")
-          .status_code(StatusCode::BAD_REQUEST)?;
-        let server = get_check_permissions::<Server>(
-          server,
-          user,
-          PermissionLevel::Read.terminal(),
-        )
-        .await?;
-        list_terminals_on_server(&server, Some(target)).await
-      }
-      TerminalTarget::Container { server, .. } => {
-        let server = get_check_permissions::<Server>(
-          server,
-          user,
-          PermissionLevel::Read.terminal(),
-        )
-        .await?;
-        list_terminals_on_server(&server, Some(target)).await
-      }
-      TerminalTarget::Stack { stack, .. } => {
-        let server = get_check_permissions::<Stack>(
-          stack,
-          user,
-          PermissionLevel::Read.terminal(),
-        )
-        .await?
-        .config
-        .server_id;
-        let server = resource::get::<Server>(&server).await?;
-        list_terminals_on_server(&server, Some(target)).await
-      }
-      TerminalTarget::Deployment { deployment } => {
-        let server = get_check_permissions::<Deployment>(
-          deployment,
-          user,
-          PermissionLevel::Read.terminal(),
-        )
-        .await?
-        .config
-        .server_id;
-        let server = resource::get::<Server>(&server).await?;
-        list_terminals_on_server(&server, Some(target)).await
-      }
-    }
-  }
-}
-
-async fn list_all_terminals_for_user(
-  user: &User,
-  use_names: bool,
-) -> mogh_error::Result<Vec<Terminal>> {
-  let (mut servers, stacks, deployments) = tokio::try_join!(
-    resource::list_full_for_user::<Server>(
-      Default::default(),
-      None,
-      None,
-      user,
-      PermissionLevel::Read.terminal(),
-      &[]
-    )
-    .map(|res| res.map(|servers| servers
-      .into_iter()
-      // true denotes user actually has permission on this Server.
-      .map(|server| (server, true))
-      .collect::<Vec<_>>())),
-    resource::list_full_for_user::<Stack>(
-      Default::default(),
-      None,
-      None,
-      user,
-      PermissionLevel::Read.terminal(),
-      &[]
-    ),
-    resource::list_full_for_user::<Deployment>(
-      Default::default(),
-      None,
-      None,
-      user,
-      PermissionLevel::Read.terminal(),
-      &[]
-    ),
-  )?;
-
-  // Ensure any missing servers are present to query
-  for stack in &stacks {
-    if !stack.config.server_id.is_empty()
-      && !servers
-        .iter()
-        .any(|(server, _)| server.id == stack.config.server_id)
-    {
-      let server =
-        resource::get::<Server>(&stack.config.server_id).await?;
-      servers.push((server, false));
-    }
-  }
-  for deployment in &deployments {
-    if !deployment.config.server_id.is_empty()
-      && !servers
-        .iter()
-        .any(|(server, _)| server.id == deployment.config.server_id)
-    {
-      let server =
-        resource::get::<Server>(&deployment.config.server_id).await?;
-      servers.push((server, false));
-    }
-  }
-
-  let mut terminals = servers
-    .into_iter()
-    .map(|(server, server_permission)| async move {
-      (
-        list_terminals_on_server(&server, None).await,
-        (server.id, server.name, server_permission),
-      )
-    })
-    .collect::<FuturesUnordered<_>>()
-    .collect::<Vec<_>>()
-    .await
-    .into_iter()
-    .flat_map(
-      |(terminals, (server_id, server_name, server_permission))| {
-        let terminals = terminals
-          .ok()?
-          .into_iter()
-          .filter_map(|mut terminal| {
-            // Only keep terminals with appropriate perms.
-            match terminal.target.clone() {
-              TerminalTarget::Server { .. } => server_permission
-                .then(|| {
-                  terminal.target = TerminalTarget::Server {
-                    server: Some(if use_names {
-                      server_name.clone()
-                    } else {
-                      server_id.clone()
-                    }),
-                  };
-                  terminal.target_name = Some(server_name.clone());
-                  terminal
-                }),
-              TerminalTarget::Container { container, .. } => {
-                server_permission.then(|| {
-                  terminal.target = TerminalTarget::Container {
-                    server: if use_names {
-                      server_name.clone()
-                    } else {
-                      server_id.clone()
-                    },
-                    container,
-                  };
-                  terminal.target_name = Some(server_name.clone());
-                  terminal
-                })
-              }
-              TerminalTarget::Stack { stack, service } => {
-                stacks.iter().find(|s| s.id == stack).map(|s| {
-                  terminal.target = TerminalTarget::Stack {
-                    stack: if use_names {
-                      s.name.clone()
-                    } else {
-                      s.id.clone()
-                    },
-                    service,
-                  };
-                  terminal.target_name = Some(s.name.clone());
-                  terminal
-                })
-              }
-              TerminalTarget::Deployment { deployment } => {
-                deployments.iter().find(|d| d.id == deployment).map(
-                  |d| {
-                    terminal.target = TerminalTarget::Deployment {
-                      deployment: if use_names {
-                        d.name.clone()
-                      } else {
-                        d.id.clone()
-                      },
-                    };
-                    terminal.target_name = Some(d.name.clone());
-                    terminal
-                  },
-                )
-              }
-            }
-          })
-          .collect::<Vec<_>>();
-
-        Some(terminals)
-      },
-    )
-    .flatten()
-    .collect::<Vec<_>>();
-
-  terminals.sort_by(|a, b| {
-    a.target.cmp(&b.target).then(a.name.cmp(&b.name))
-  });
-
-  Ok(terminals)
-}
-
-async fn list_terminals_on_server(
-  server: &Server,
-  target: Option<TerminalTarget>,
-) -> mogh_error::Result<Vec<Terminal>> {
-  periphery_client(server)
-    .await?
-    .request(periphery_client::api::terminal::ListTerminals {
-      target,
-    })
-    .await
-    .with_context(|| {
-      format!(
-        "Failed to get Terminal list from Server {} ({})",
-        server.name, server.id
-      )
-    })
-    .map_err(Into::into)
-}

bin/core/src/api/read/toml.rs

@@ -1,8 +1,5 @@
 use anyhow::Context;
-use database::{
-  bson::doc,
-  mungos::{find::find_collect, mongodb::options::FindOptions},
-};
+use database::mungos::find::find_collect;
 use komodo_client::{
   api::read::{
     ExportAllResourcesToToml, ExportAllResourcesToTomlResponse,
@@ -14,11 +11,10 @@ use komodo_client::{
     builder::Builder, deployment::Deployment,
     permission::PermissionLevel, procedure::Procedure, repo::Repo,
     resource::ResourceQuery, server::Server, stack::Stack,
-    swarm::Swarm, sync::ResourceSync, toml::ResourcesToml,
-    user::User,
+    sync::ResourceSync, toml::ResourcesToml, user::User,
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{
   helpers::query::{
@@ -28,7 +24,6 @@ use crate::{
   resource,
   state::db_client,
   sync::{
-    replace_ids::ReplaceIds,
     toml::{ToToml, convert_resource},
     user_groups::{convert_user_groups, user_group_to_toml},
     variables::variable_to_toml,
@@ -42,47 +37,122 @@ async fn get_all_targets(
   user: &User,
 ) -> anyhow::Result<Vec<ResourceTarget>> {
   let mut targets = Vec::<ResourceTarget>::new();
-
   let all_tags = if tags.is_empty() {
     vec![]
   } else {
     get_all_tags(None).await?
   };
-
-  macro_rules! extend_targets {
-    ($($Type:ident),* $(,)?) => {
-      $(
-        targets.extend(
-          resource::list_full_for_user::<$Type>(
-            ResourceQuery::builder().tags(tags).build(),
-            None,
-            None,
-            user,
-            PermissionLevel::Read.into(),
-            &all_tags,
-          )
-          .await?
-          .into_iter()
-          .map(|resource| ResourceTarget::$Type(resource.id)),
-        );
-      )*
-    };
-  }
-
-  extend_targets!(
-    Alerter,
-    Builder,
-    Server,
-    Swarm,
-    Stack,
-    Deployment,
-    Build,
-    Repo,
-    Procedure,
-    Action,
-    ResourceSync,
+  targets.extend(
+    resource::list_full_for_user::<Alerter>(
+      ResourceQuery::builder().tags(tags).build(),
+      user,
+      PermissionLevel::Read.into(),
+      &all_tags,
+    )
+    .await?
+    .into_iter()
+    .map(|resource| ResourceTarget::Alerter(resource.id)),
+  );
+  targets.extend(
+    resource::list_full_for_user::<Builder>(
+      ResourceQuery::builder().tags(tags).build(),
+      user,
+      PermissionLevel::Read.into(),
+      &all_tags,
+    )
+    .await?
+    .into_iter()
+    .map(|resource| ResourceTarget::Builder(resource.id)),
+  );
+  targets.extend(
+    resource::list_full_for_user::<Server>(
+      ResourceQuery::builder().tags(tags).build(),
+      user,
+      PermissionLevel::Read.into(),
+      &all_tags,
+    )
+    .await?
+    .into_iter()
+    .map(|resource| ResourceTarget::Server(resource.id)),
+  );
+  targets.extend(
+    resource::list_full_for_user::<Stack>(
+      ResourceQuery::builder().tags(tags).build(),
+      user,
+      PermissionLevel::Read.into(),
+      &all_tags,
+    )
+    .await?
+    .into_iter()
+    .map(|resource| ResourceTarget::Stack(resource.id)),
+  );
+  targets.extend(
+    resource::list_full_for_user::<Deployment>(
+      ResourceQuery::builder().tags(tags).build(),
+      user,
+      PermissionLevel::Read.into(),
+      &all_tags,
+    )
+    .await?
+    .into_iter()
+    .map(|resource| ResourceTarget::Deployment(resource.id)),
+  );
+  targets.extend(
+    resource::list_full_for_user::<Build>(
+      ResourceQuery::builder().tags(tags).build(),
+      user,
+      PermissionLevel::Read.into(),
+      &all_tags,
+    )
+    .await?
+    .into_iter()
+    .map(|resource| ResourceTarget::Build(resource.id)),
+  );
+  targets.extend(
+    resource::list_full_for_user::<Repo>(
+      ResourceQuery::builder().tags(tags).build(),
+      user,
+      PermissionLevel::Read.into(),
+      &all_tags,
+    )
+    .await?
+    .into_iter()
+    .map(|resource| ResourceTarget::Repo(resource.id)),
+  );
+  targets.extend(
+    resource::list_full_for_user::<Procedure>(
+      ResourceQuery::builder().tags(tags).build(),
+      user,
+      PermissionLevel::Read.into(),
+      &all_tags,
+    )
+    .await?
+    .into_iter()
+    .map(|resource| ResourceTarget::Procedure(resource.id)),
+  );
+  targets.extend(
+    resource::list_full_for_user::<Action>(
+      ResourceQuery::builder().tags(tags).build(),
+      user,
+      PermissionLevel::Read.into(),
+      &all_tags,
+    )
+    .await?
+    .into_iter()
+    .map(|resource| ResourceTarget::Action(resource.id)),
+  );
+  targets.extend(
+    resource::list_full_for_user::<ResourceSync>(
+      ResourceQuery::builder().tags(tags).build(),
+      user,
+      PermissionLevel::Read.into(),
+      &all_tags,
+    )
+    .await?
+    .into_iter()
+    // These will already be filtered by [ExportResourcesToToml]
+    .map(|resource| ResourceTarget::ResourceSync(resource.id)),
   );
-
   Ok(targets)
 }
 
@@ -90,7 +160,7 @@ impl Resolve<ReadArgs> for ExportAllResourcesToToml {
   async fn resolve(
     self,
     args: &ReadArgs,
-  ) -> mogh_error::Result<ExportAllResourcesToTomlResponse> {
+  ) -> serror::Result<ExportAllResourcesToTomlResponse> {
     let targets = if self.include_resources {
       get_all_targets(&self.tags, &args.user).await?
     } else {
@@ -116,7 +186,6 @@ impl Resolve<ReadArgs> for ExportAllResourcesToToml {
       targets,
       user_groups,
       include_variables: self.include_variables,
-      existing: self.existing,
     }
     .resolve(args)
     .await
@@ -127,69 +196,31 @@ impl Resolve<ReadArgs> for ExportResourcesToToml {
   async fn resolve(
     self,
     args: &ReadArgs,
-  ) -> mogh_error::Result<ExportResourcesToTomlResponse> {
+  ) -> serror::Result<ExportResourcesToTomlResponse> {
     let ExportResourcesToToml {
       targets,
       user_groups,
       include_variables,
-      existing,
     } = self;
     let mut res = ResourcesToml::default();
     let id_to_tags = get_id_to_tags(None).await?;
     let ReadArgs { user } = args;
-    macro_rules! convert_target {
-      ($id:expr, $Type:ident, $field:ident) => {{
-        let mut resource = get_check_permissions::<$Type>(
-          &$id,
-          user,
-          PermissionLevel::Read.into(),
-        )
-        .await?;
-        $Type::replace_ids(&mut resource.config);
-        let (deploy, after) = existing
-          .as_ref()
-          .and_then(|e| {
-            e.$field.iter().find(|r| r.name == resource.name)
-          })
-          .map(|r| (r.deploy, r.after.clone()))
-          .unwrap_or_default();
-        res.$field.push(convert_resource::<$Type>(
-          resource,
-          deploy,
-          after,
-          &id_to_tags,
-        ));
-      }};
-    }
     for target in targets {
       match target {
-        ResourceTarget::Server(id) => {
-          convert_target!(id, Server, servers)
-        }
-        ResourceTarget::Swarm(id) => {
-          convert_target!(id, Swarm, swarms)
-        }
-        ResourceTarget::Stack(id) => {
-          convert_target!(id, Stack, stacks)
-        }
-        ResourceTarget::Deployment(id) => {
-          convert_target!(id, Deployment, deployments)
-        }
-        ResourceTarget::Build(id) => {
-          convert_target!(id, Build, builds)
-        }
-        ResourceTarget::Repo(id) => convert_target!(id, Repo, repos),
-        ResourceTarget::Procedure(id) => {
-          convert_target!(id, Procedure, procedures)
-        }
-        ResourceTarget::Action(id) => {
-          convert_target!(id, Action, actions)
-        }
-        ResourceTarget::Builder(id) => {
-          convert_target!(id, Builder, builders)
-        }
         ResourceTarget::Alerter(id) => {
-          convert_target!(id, Alerter, alerters)
+          let mut alerter = get_check_permissions::<Alerter>(
+            &id,
+            user,
+            PermissionLevel::Read.into(),
+          )
+          .await?;
+          Alerter::replace_ids(&mut alerter);
+          res.alerters.push(convert_resource::<Alerter>(
+            alerter,
+            false,
+            vec![],
+            &id_to_tags,
+          ))
         }
         ResourceTarget::ResourceSync(id) => {
           let mut sync = get_check_permissions::<ResourceSync>(
@@ -203,7 +234,7 @@ impl Resolve<ReadArgs> for ExportResourcesToToml {
               || !sync.config.repo.is_empty()
               || !sync.config.linked_repo.is_empty())
           {
-            ResourceSync::replace_ids(&mut sync.config);
+            ResourceSync::replace_ids(&mut sync);
             res.resource_syncs.push(convert_resource::<ResourceSync>(
               sync,
               false,
@@ -212,6 +243,126 @@ impl Resolve<ReadArgs> for ExportResourcesToToml {
             ))
           }
         }
+        ResourceTarget::Server(id) => {
+          let mut server = get_check_permissions::<Server>(
+            &id,
+            user,
+            PermissionLevel::Read.into(),
+          )
+          .await?;
+          Server::replace_ids(&mut server);
+          res.servers.push(convert_resource::<Server>(
+            server,
+            false,
+            vec![],
+            &id_to_tags,
+          ))
+        }
+        ResourceTarget::Builder(id) => {
+          let mut builder = get_check_permissions::<Builder>(
+            &id,
+            user,
+            PermissionLevel::Read.into(),
+          )
+          .await?;
+          Builder::replace_ids(&mut builder);
+          res.builders.push(convert_resource::<Builder>(
+            builder,
+            false,
+            vec![],
+            &id_to_tags,
+          ))
+        }
+        ResourceTarget::Build(id) => {
+          let mut build = get_check_permissions::<Build>(
+            &id,
+            user,
+            PermissionLevel::Read.into(),
+          )
+          .await?;
+          Build::replace_ids(&mut build);
+          res.builds.push(convert_resource::<Build>(
+            build,
+            false,
+            vec![],
+            &id_to_tags,
+          ))
+        }
+        ResourceTarget::Deployment(id) => {
+          let mut deployment = get_check_permissions::<Deployment>(
+            &id,
+            user,
+            PermissionLevel::Read.into(),
+          )
+          .await?;
+          Deployment::replace_ids(&mut deployment);
+          res.deployments.push(convert_resource::<Deployment>(
+            deployment,
+            false,
+            vec![],
+            &id_to_tags,
+          ))
+        }
+        ResourceTarget::Repo(id) => {
+          let mut repo = get_check_permissions::<Repo>(
+            &id,
+            user,
+            PermissionLevel::Read.into(),
+          )
+          .await?;
+          Repo::replace_ids(&mut repo);
+          res.repos.push(convert_resource::<Repo>(
+            repo,
+            false,
+            vec![],
+            &id_to_tags,
+          ))
+        }
+        ResourceTarget::Stack(id) => {
+          let mut stack = get_check_permissions::<Stack>(
+            &id,
+            user,
+            PermissionLevel::Read.into(),
+          )
+          .await?;
+          Stack::replace_ids(&mut stack);
+          res.stacks.push(convert_resource::<Stack>(
+            stack,
+            false,
+            vec![],
+            &id_to_tags,
+          ))
+        }
+        ResourceTarget::Procedure(id) => {
+          let mut procedure = get_check_permissions::<Procedure>(
+            &id,
+            user,
+            PermissionLevel::Read.into(),
+          )
+          .await?;
+          Procedure::replace_ids(&mut procedure);
+          res.procedures.push(convert_resource::<Procedure>(
+            procedure,
+            false,
+            vec![],
+            &id_to_tags,
+          ));
+        }
+        ResourceTarget::Action(id) => {
+          let mut action = get_check_permissions::<Action>(
+            &id,
+            user,
+            PermissionLevel::Read.into(),
+          )
+          .await?;
+          Action::replace_ids(&mut action);
+          res.actions.push(convert_resource::<Action>(
+            action,
+            false,
+            vec![],
+            &id_to_tags,
+          ));
+        }
         ResourceTarget::System(_) => continue,
       };
     }
@@ -221,21 +372,18 @@ impl Resolve<ReadArgs> for ExportResourcesToToml {
       .context("failed to add user groups")?;
 
     if include_variables {
-      res.variables = find_collect(
-        &db_client().variables,
-        None,
-        FindOptions::builder().sort(doc! { "name": 1 }).build(),
-      )
-      .await
-      .context("failed to get variables from db")?
-      .into_iter()
-      .map(|mut variable| {
-        if !user.admin && variable.is_secret {
-          variable.value = "#".repeat(variable.value.len())
-        }
-        variable
-      })
-      .collect();
+      res.variables =
+        find_collect(&db_client().variables, None, None)
+          .await
+          .context("failed to get variables from db")?
+          .into_iter()
+          .map(|mut variable| {
+            if !user.admin && variable.is_secret {
+              variable.value = "#".repeat(variable.value.len())
+            }
+            variable
+          })
+          .collect();
     }
 
     let toml = serialize_resources_toml(res)
@@ -270,32 +418,85 @@ fn serialize_resources_toml(
 ) -> anyhow::Result<String> {
   let mut toml = String::new();
 
-  macro_rules! serialize_resources {
-    ($(($Type:ident, $field:ident, $header:literal)),* $(,)?) => {
-      $(
-        for resource in resources.$field {
-          if !toml.is_empty() {
-            toml.push_str("\n\n##\n\n");
-          }
-          toml.push_str(concat!("[[",$header,"]]\n"));
-          $Type::push_to_toml_string(resource, &mut toml)?;
-        }
-      )*
-    };
+  for server in resources.servers {
+    if !toml.is_empty() {
+      toml.push_str("\n\n##\n\n");
+    }
+    toml.push_str("[[server]]\n");
+    Server::push_to_toml_string(server, &mut toml)?;
+  }
+
+  for stack in resources.stacks {
+    if !toml.is_empty() {
+      toml.push_str("\n\n##\n\n");
+    }
+    toml.push_str("[[stack]]\n");
+    Stack::push_to_toml_string(stack, &mut toml)?;
+  }
+
+  for deployment in resources.deployments {
+    if !toml.is_empty() {
+      toml.push_str("\n\n##\n\n");
+    }
+    toml.push_str("[[deployment]]\n");
+    Deployment::push_to_toml_string(deployment, &mut toml)?;
+  }
+
+  for build in resources.builds {
+    if !toml.is_empty() {
+      toml.push_str("\n\n##\n\n");
+    }
+    toml.push_str("[[build]]\n");
+    Build::push_to_toml_string(build, &mut toml)?;
+  }
+
+  for repo in resources.repos {
+    if !toml.is_empty() {
+      toml.push_str("\n\n##\n\n");
+    }
+    toml.push_str("[[repo]]\n");
+    Repo::push_to_toml_string(repo, &mut toml)?;
+  }
+
+  for procedure in resources.procedures {
+    if !toml.is_empty() {
+      toml.push_str("\n\n##\n\n");
+    }
+    toml.push_str("[[procedure]]\n");
+    Procedure::push_to_toml_string(procedure, &mut toml)?;
+  }
+
+  for action in resources.actions {
+    if !toml.is_empty() {
+      toml.push_str("\n\n##\n\n");
+    }
+    toml.push_str("[[action]]\n");
+    Action::push_to_toml_string(action, &mut toml)?;
+  }
+
+  for alerter in resources.alerters {
+    if !toml.is_empty() {
+      toml.push_str("\n\n##\n\n");
+    }
+    toml.push_str("[[alerter]]\n");
+    Alerter::push_to_toml_string(alerter, &mut toml)?;
+  }
+
+  for builder in resources.builders {
+    if !toml.is_empty() {
+      toml.push_str("\n\n##\n\n");
+    }
+    toml.push_str("[[builder]]\n");
+    Builder::push_to_toml_string(builder, &mut toml)?;
+  }
+
+  for resource_sync in resources.resource_syncs {
+    if !toml.is_empty() {
+      toml.push_str("\n\n##\n\n");
+    }
+    toml.push_str("[[resource_sync]]\n");
+    ResourceSync::push_to_toml_string(resource_sync, &mut toml)?;
   }
-  serialize_resources!(
-    (Server, servers, "server"),
-    (Swarm, swarms, "swarm"),
-    (Stack, stacks, "stack"),
-    (Deployment, deployments, "deployment"),
-    (Build, builds, "build"),
-    (Repo, repos, "repo"),
-    (Procedure, procedures, "procedure"),
-    (Action, actions, "action"),
-    (Alerter, alerters, "alerter"),
-    (Builder, builders, "builder"),
-    (ResourceSync, resource_syncs, "resource_sync"),
-  );
 
   for variable in &resources.variables {
     if !toml.is_empty() {

bin/core/src/api/read/update.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use anyhow::Context;
+use anyhow::{Context, anyhow};
 use database::mungos::{
   by_id::find_one_by_id,
   find::find_collect,
@@ -9,18 +9,27 @@ use database::mungos::{
 use komodo_client::{
   api::read::{GetUpdate, ListUpdates, ListUpdatesResponse},
   entities::{
+    ResourceTarget,
+    action::Action,
+    alerter::Alerter,
+    build::Build,
+    builder::Builder,
+    deployment::Deployment,
     permission::PermissionLevel,
+    procedure::Procedure,
+    repo::Repo,
+    server::Server,
+    stack::Stack,
+    sync::ResourceSync,
     update::{Update, UpdateListItem},
     user::User,
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{
   config::core_config,
-  permission::{
-    check_user_target_access, user_resource_target_query,
-  },
+  permission::{get_check_permissions, get_resource_ids_for_user},
   state::db_client,
 };
 
@@ -32,8 +41,121 @@ impl Resolve<ReadArgs> for ListUpdates {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListUpdatesResponse> {
-    let query = user_resource_target_query(user, self.query).await?;
+  ) -> serror::Result<ListUpdatesResponse> {
+    let query = if user.admin || core_config().transparent_mode {
+      self.query
+    } else {
+      let server_query = get_resource_ids_for_user::<Server>(user)
+        .await?
+        .map(|ids| {
+          doc! {
+            "target.type": "Server", "target.id": { "$in": ids }
+          }
+        })
+        .unwrap_or_else(|| doc! { "target.type": "Server" });
+
+      let deployment_query =
+        get_resource_ids_for_user::<Deployment>(user)
+          .await?
+          .map(|ids| {
+            doc! {
+              "target.type": "Deployment", "target.id": { "$in": ids }
+            }
+          })
+          .unwrap_or_else(|| doc! { "target.type": "Deployment" });
+
+      let stack_query = get_resource_ids_for_user::<Stack>(user)
+        .await?
+        .map(|ids| {
+          doc! {
+            "target.type": "Stack", "target.id": { "$in": ids }
+          }
+        })
+        .unwrap_or_else(|| doc! { "target.type": "Stack" });
+
+      let build_query = get_resource_ids_for_user::<Build>(user)
+        .await?
+        .map(|ids| {
+          doc! {
+            "target.type": "Build", "target.id": { "$in": ids }
+          }
+        })
+        .unwrap_or_else(|| doc! { "target.type": "Build" });
+
+      let repo_query = get_resource_ids_for_user::<Repo>(user)
+        .await?
+        .map(|ids| {
+          doc! {
+            "target.type": "Repo", "target.id": { "$in": ids }
+          }
+        })
+        .unwrap_or_else(|| doc! { "target.type": "Repo" });
+
+      let procedure_query =
+        get_resource_ids_for_user::<Procedure>(user)
+          .await?
+          .map(|ids| {
+            doc! {
+              "target.type": "Procedure", "target.id": { "$in": ids }
+            }
+          })
+          .unwrap_or_else(|| doc! { "target.type": "Procedure" });
+
+      let action_query = get_resource_ids_for_user::<Action>(user)
+        .await?
+        .map(|ids| {
+          doc! {
+            "target.type": "Action", "target.id": { "$in": ids }
+          }
+        })
+        .unwrap_or_else(|| doc! { "target.type": "Action" });
+
+      let builder_query = get_resource_ids_for_user::<Builder>(user)
+        .await?
+        .map(|ids| {
+          doc! {
+            "target.type": "Builder", "target.id": { "$in": ids }
+          }
+        })
+        .unwrap_or_else(|| doc! { "target.type": "Builder" });
+
+      let alerter_query = get_resource_ids_for_user::<Alerter>(user)
+        .await?
+        .map(|ids| {
+          doc! {
+            "target.type": "Alerter", "target.id": { "$in": ids }
+          }
+        })
+        .unwrap_or_else(|| doc! { "target.type": "Alerter" });
+
+      let resource_sync_query = get_resource_ids_for_user::<
+        ResourceSync,
+      >(user)
+      .await?
+      .map(|ids| {
+        doc! {
+          "target.type": "ResourceSync", "target.id": { "$in": ids }
+        }
+      })
+      .unwrap_or_else(|| doc! { "target.type": "ResourceSync" });
+
+      let mut query = self.query.unwrap_or_default();
+      query.extend(doc! {
+        "$or": [
+          server_query,
+          deployment_query,
+          stack_query,
+          build_query,
+          repo_query,
+          procedure_query,
+          action_query,
+          alerter_query,
+          builder_query,
+          resource_sync_query,
+        ]
+      });
+      query.into()
+    };
 
     let usernames = find_collect(&db_client().users, None, None)
       .await
@@ -47,9 +169,7 @@ impl Resolve<ReadArgs> for ListUpdates {
       query,
       FindOptions::builder()
         .sort(doc! { "start_ts": -1 })
-        .skip(
-          (self.page as u64).saturating_mul(UPDATES_PER_PAGE as u64),
-        )
+        .skip(self.page as u64 * UPDATES_PER_PAGE as u64)
         .limit(UPDATES_PER_PAGE)
         .build(),
     )
@@ -94,7 +214,7 @@ impl Resolve<ReadArgs> for GetUpdate {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<Update> {
+  ) -> serror::Result<Update> {
     let update = find_one_by_id(&db_client().updates, &self.id)
       .await
       .context("failed to query to db")?
@@ -102,12 +222,93 @@ impl Resolve<ReadArgs> for GetUpdate {
     if user.admin || core_config().transparent_mode {
       return Ok(update);
     }
-    check_user_target_access(
-      &update.target,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
+    match &update.target {
+      ResourceTarget::System(_) => {
+        return Err(
+          anyhow!("user must be admin to view system updates").into(),
+        );
+      }
+      ResourceTarget::Server(id) => {
+        get_check_permissions::<Server>(
+          id,
+          user,
+          PermissionLevel::Read.into(),
+        )
+        .await?;
+      }
+      ResourceTarget::Deployment(id) => {
+        get_check_permissions::<Deployment>(
+          id,
+          user,
+          PermissionLevel::Read.into(),
+        )
+        .await?;
+      }
+      ResourceTarget::Build(id) => {
+        get_check_permissions::<Build>(
+          id,
+          user,
+          PermissionLevel::Read.into(),
+        )
+        .await?;
+      }
+      ResourceTarget::Repo(id) => {
+        get_check_permissions::<Repo>(
+          id,
+          user,
+          PermissionLevel::Read.into(),
+        )
+        .await?;
+      }
+      ResourceTarget::Builder(id) => {
+        get_check_permissions::<Builder>(
+          id,
+          user,
+          PermissionLevel::Read.into(),
+        )
+        .await?;
+      }
+      ResourceTarget::Alerter(id) => {
+        get_check_permissions::<Alerter>(
+          id,
+          user,
+          PermissionLevel::Read.into(),
+        )
+        .await?;
+      }
+      ResourceTarget::Procedure(id) => {
+        get_check_permissions::<Procedure>(
+          id,
+          user,
+          PermissionLevel::Read.into(),
+        )
+        .await?;
+      }
+      ResourceTarget::Action(id) => {
+        get_check_permissions::<Action>(
+          id,
+          user,
+          PermissionLevel::Read.into(),
+        )
+        .await?;
+      }
+      ResourceTarget::ResourceSync(id) => {
+        get_check_permissions::<ResourceSync>(
+          id,
+          user,
+          PermissionLevel::Read.into(),
+        )
+        .await?;
+      }
+      ResourceTarget::Stack(id) => {
+        get_check_permissions::<Stack>(
+          id,
+          user,
+          PermissionLevel::Read.into(),
+        )
+        .await?;
+      }
+    }
     Ok(update)
   }
 }

bin/core/src/api/read/user.rs

@@ -13,7 +13,7 @@ use komodo_client::{
   },
   entities::user::{UserConfig, admin_service_user},
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{helpers::query::get_user, state::db_client};
 
@@ -23,7 +23,7 @@ impl Resolve<ReadArgs> for GetUsername {
   async fn resolve(
     self,
     _: &ReadArgs,
-  ) -> mogh_error::Result<GetUsernameResponse> {
+  ) -> serror::Result<GetUsernameResponse> {
     if let Some(user) = admin_service_user(&self.user_id) {
       return Ok(GetUsernameResponse {
         username: user.username,
@@ -53,7 +53,7 @@ impl Resolve<ReadArgs> for FindUser {
   async fn resolve(
     self,
     ReadArgs { user: admin }: &ReadArgs,
-  ) -> mogh_error::Result<FindUserResponse> {
+  ) -> serror::Result<FindUserResponse> {
     if !admin.admin {
       return Err(anyhow!("This method is admin only.").into());
     }
@@ -65,26 +65,15 @@ impl Resolve<ReadArgs> for ListUsers {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListUsersResponse> {
+  ) -> serror::Result<ListUsersResponse> {
     if !user.admin {
       return Err(
         anyhow!("this route is only accessable by admins").into(),
       );
     }
-    let filter = match self.service_users {
-      komodo_client::api::read::ServiceUserQueryBehavior::Include => {
-        None
-      }
-      komodo_client::api::read::ServiceUserQueryBehavior::Exclude => {
-        Some(doc! { "config.type": { "$ne": "Service" } })
-      }
-      komodo_client::api::read::ServiceUserQueryBehavior::Only => {
-        Some(doc! { "config.type": "Service" })
-      }
-    };
     let mut users = find_collect(
       &db_client().users,
-      filter,
+      None,
       FindOptions::builder().sort(doc! { "username": 1 }).build(),
     )
     .await
@@ -98,7 +87,7 @@ impl Resolve<ReadArgs> for ListApiKeys {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListApiKeysResponse> {
+  ) -> serror::Result<ListApiKeysResponse> {
     let api_keys = find_collect(
       &db_client().api_keys,
       doc! { "user_id": &user.id },
@@ -120,7 +109,7 @@ impl Resolve<ReadArgs> for ListApiKeysForServiceUser {
   async fn resolve(
     self,
     ReadArgs { user: admin }: &ReadArgs,
-  ) -> mogh_error::Result<ListApiKeysForServiceUserResponse> {
+  ) -> serror::Result<ListApiKeysForServiceUserResponse> {
     if !admin.admin {
       return Err(anyhow!("This method is admin only.").into());
     }

bin/core/src/api/read/user_group.rs

@@ -9,7 +9,7 @@ use database::mungos::{
   },
 };
 use komodo_client::api::read::*;
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::state::db_client;
 
@@ -19,7 +19,7 @@ impl Resolve<ReadArgs> for GetUserGroup {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetUserGroupResponse> {
+  ) -> serror::Result<GetUserGroupResponse> {
     let mut filter = match ObjectId::from_str(&self.user_group) {
       Ok(id) => doc! { "_id": id },
       Err(_) => doc! { "name": &self.user_group },
@@ -43,7 +43,7 @@ impl Resolve<ReadArgs> for ListUserGroups {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListUserGroupsResponse> {
+  ) -> serror::Result<ListUserGroupsResponse> {
     let mut filter = Document::new();
     if !user.admin {
       filter.insert("users", &user.id);

bin/core/src/api/read/variable.rs

@@ -4,7 +4,7 @@ use database::mungos::{
   find::find_collect, mongodb::options::FindOptions,
 };
 use komodo_client::api::read::*;
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{helpers::query::get_variable, state::db_client};
 
@@ -14,7 +14,7 @@ impl Resolve<ReadArgs> for GetVariable {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<GetVariableResponse> {
+  ) -> serror::Result<GetVariableResponse> {
     let mut variable = get_variable(&self.name).await?;
     if !variable.is_secret || user.admin {
       return Ok(variable);
@@ -28,7 +28,7 @@ impl Resolve<ReadArgs> for ListVariables {
   async fn resolve(
     self,
     ReadArgs { user }: &ReadArgs,
-  ) -> mogh_error::Result<ListVariablesResponse> {
+  ) -> serror::Result<ListVariablesResponse> {
     let variables = find_collect(
       &db_client().variables,
       None,

bin/core/src/api/terminal.rs

@@ -1,56 +1,236 @@
 use anyhow::Context;
 use axum::{Extension, Router, middleware, routing::post};
-use komodo_client::{api::terminal::*, entities::user::User};
-use mogh_auth_server::middleware::authenticate_request;
-use mogh_error::Json;
+use komodo_client::{
+  api::terminal::*,
+  entities::{
+    deployment::Deployment, permission::PermissionLevel,
+    server::Server, stack::Stack, user::User,
+  },
+};
+use serror::Json;
+use uuid::Uuid;
 
 use crate::{
-  auth::KomodoAuthImpl, helpers::terminal::setup_target_for_user,
+  auth::auth_request, helpers::periphery_client,
+  permission::get_check_permissions, resource::get,
+  state::stack_status_cache,
 };
 
 pub fn router() -> Router {
   Router::new()
     .route("/execute", post(execute_terminal))
-    .layer(middleware::from_fn(
-      authenticate_request::<KomodoAuthImpl, true>,
-    ))
+    .route("/execute/container", post(execute_container_exec))
+    .route("/execute/deployment", post(execute_deployment_exec))
+    .route("/execute/stack", post(execute_stack_exec))
+    .layer(middleware::from_fn(auth_request))
 }
 
 // =================
 //  ExecuteTerminal
 // =================
 
-#[instrument(
-  name = "ExecuteTerminal",
-  skip_all,
-  fields(
-    operator = user.id,
-    target,
-    terminal,
-    init = format!("{init:?}")
-  )
-)]
 async fn execute_terminal(
   Extension(user): Extension<User>,
-  Json(ExecuteTerminalBody {
-    target,
+  Json(request): Json<ExecuteTerminalBody>,
+) -> serror::Result<axum::body::Body> {
+  execute_terminal_inner(Uuid::new_v4(), request, user).await
+}
+
+#[instrument(
+  name = "ExecuteTerminal",
+  skip(user),
+  fields(
+    user_id = user.id,
+  )
+)]
+async fn execute_terminal_inner(
+  req_id: Uuid,
+  ExecuteTerminalBody {
+    server,
     terminal,
     command,
-    init,
-  }): Json<ExecuteTerminalBody>,
-) -> mogh_error::Result<axum::body::Body> {
-  info!(
-    "TERMINAL EXECUTE REQUEST | USER: {} ({})",
-    user.username, user.id
-  );
+  }: ExecuteTerminalBody,
+  user: User,
+) -> serror::Result<axum::body::Body> {
+  info!("/terminal/execute request | user: {}", user.username);
 
-  let (target, terminal, periphery) =
-    setup_target_for_user(target, terminal, init, &user).await?;
+  let server = get_check_permissions::<Server>(
+    &server,
+    &user,
+    PermissionLevel::Read.terminal(),
+  )
+  .await?;
 
-  let stream = periphery
-    .execute_terminal(target, terminal, command)
+  let stream = periphery_client(&server)
+    .await?
+    .execute_terminal(terminal, command)
     .await
-    .context("Failed to execute command on Terminal")?;
+    .context("Failed to execute command on periphery")?;
+
+  Ok(axum::body::Body::from_stream(stream))
+}
+
+// ======================
+//  ExecuteContainerExec
+// ======================
+
+async fn execute_container_exec(
+  Extension(user): Extension<User>,
+  Json(request): Json<ExecuteContainerExecBody>,
+) -> serror::Result<axum::body::Body> {
+  execute_container_exec_inner(Uuid::new_v4(), request, user).await
+}
+
+#[instrument(
+  name = "ExecuteContainerExec",
+  skip(user),
+  fields(
+    user_id = user.id,
+  )
+)]
+async fn execute_container_exec_inner(
+  req_id: Uuid,
+  ExecuteContainerExecBody {
+    server,
+    container,
+    shell,
+    command,
+  }: ExecuteContainerExecBody,
+  user: User,
+) -> serror::Result<axum::body::Body> {
+  info!("ExecuteContainerExec request | user: {}", user.username);
+
+  let server = get_check_permissions::<Server>(
+    &server,
+    &user,
+    PermissionLevel::Read.terminal(),
+  )
+  .await?;
+
+  let periphery = periphery_client(&server).await?;
+
+  let stream = periphery
+    .execute_container_exec(container, shell, command)
+    .await
+    .context(
+      "Failed to execute container exec command on periphery",
+    )?;
+
+  Ok(axum::body::Body::from_stream(stream))
+}
+
+// =======================
+//  ExecuteDeploymentExec
+// =======================
+
+async fn execute_deployment_exec(
+  Extension(user): Extension<User>,
+  Json(request): Json<ExecuteDeploymentExecBody>,
+) -> serror::Result<axum::body::Body> {
+  execute_deployment_exec_inner(Uuid::new_v4(), request, user).await
+}
+
+#[instrument(
+  name = "ExecuteDeploymentExec",
+  skip(user),
+  fields(
+    user_id = user.id,
+  )
+)]
+async fn execute_deployment_exec_inner(
+  req_id: Uuid,
+  ExecuteDeploymentExecBody {
+    deployment,
+    shell,
+    command,
+  }: ExecuteDeploymentExecBody,
+  user: User,
+) -> serror::Result<axum::body::Body> {
+  info!("ExecuteDeploymentExec request | user: {}", user.username);
+
+  let deployment = get_check_permissions::<Deployment>(
+    &deployment,
+    &user,
+    PermissionLevel::Read.terminal(),
+  )
+  .await?;
+
+  let server = get::<Server>(&deployment.config.server_id).await?;
+
+  let periphery = periphery_client(&server).await?;
+
+  let stream = periphery
+    .execute_container_exec(deployment.name, shell, command)
+    .await
+    .context(
+      "Failed to execute container exec command on periphery",
+    )?;
+
+  Ok(axum::body::Body::from_stream(stream))
+}
+
+// ==================
+//  ExecuteStackExec
+// ==================
+
+async fn execute_stack_exec(
+  Extension(user): Extension<User>,
+  Json(request): Json<ExecuteStackExecBody>,
+) -> serror::Result<axum::body::Body> {
+  execute_stack_exec_inner(Uuid::new_v4(), request, user).await
+}
+
+#[instrument(
+  name = "ExecuteStackExec",
+  skip(user),
+  fields(
+    user_id = user.id,
+  )
+)]
+async fn execute_stack_exec_inner(
+  req_id: Uuid,
+  ExecuteStackExecBody {
+    stack,
+    service,
+    shell,
+    command,
+  }: ExecuteStackExecBody,
+  user: User,
+) -> serror::Result<axum::body::Body> {
+  info!("ExecuteStackExec request | user: {}", user.username);
+
+  let stack = get_check_permissions::<Stack>(
+    &stack,
+    &user,
+    PermissionLevel::Read.terminal(),
+  )
+  .await?;
+
+  let server = get::<Server>(&stack.config.server_id).await?;
+
+  let container = stack_status_cache()
+    .get(&stack.id)
+    .await
+    .context("could not get stack status")?
+    .curr
+    .services
+    .iter()
+    .find(|s| s.service == service)
+    .context("could not find service")?
+    .container
+    .as_ref()
+    .context("could not find service container")?
+    .name
+    .clone();
+
+  let periphery = periphery_client(&server).await?;
+
+  let stream = periphery
+    .execute_container_exec(container, shell, command)
+    .await
+    .context(
+      "Failed to execute container exec command on periphery",
+    )?;
 
   Ok(axum::body::Body::from_stream(stream))
 }

bin/core/src/api/user.rs

@@ -0,0 +1,213 @@
+use std::{collections::VecDeque, time::Instant};
+
+use anyhow::{Context, anyhow};
+use axum::{
+  Extension, Json, Router, extract::Path, middleware, routing::post,
+};
+use database::mongo_indexed::doc;
+use database::mungos::{
+  by_id::update_one_by_id, mongodb::bson::to_bson,
+};
+use derive_variants::EnumVariants;
+use komodo_client::{
+  api::user::*,
+  entities::{api_key::ApiKey, komodo_timestamp, user::User},
+};
+use resolver_api::Resolve;
+use response::Response;
+use serde::{Deserialize, Serialize};
+use serde_json::json;
+use typeshare::typeshare;
+use uuid::Uuid;
+
+use crate::{
+  auth::auth_request,
+  helpers::{query::get_user, random_string},
+  state::db_client,
+};
+
+use super::Variant;
+
+pub struct UserArgs {
+  pub user: User,
+}
+
+#[typeshare]
+#[derive(
+  Serialize, Deserialize, Debug, Clone, Resolve, EnumVariants,
+)]
+#[args(UserArgs)]
+#[response(Response)]
+#[error(serror::Error)]
+#[serde(tag = "type", content = "params")]
+enum UserRequest {
+  PushRecentlyViewed(PushRecentlyViewed),
+  SetLastSeenUpdate(SetLastSeenUpdate),
+  CreateApiKey(CreateApiKey),
+  DeleteApiKey(DeleteApiKey),
+}
+
+pub fn router() -> Router {
+  Router::new()
+    .route("/", post(handler))
+    .route("/{variant}", post(variant_handler))
+    .layer(middleware::from_fn(auth_request))
+}
+
+async fn variant_handler(
+  user: Extension<User>,
+  Path(Variant { variant }): Path<Variant>,
+  Json(params): Json<serde_json::Value>,
+) -> serror::Result<axum::response::Response> {
+  let req: UserRequest = serde_json::from_value(json!({
+    "type": variant,
+    "params": params,
+  }))?;
+  handler(user, Json(req)).await
+}
+
+#[instrument(name = "UserHandler", level = "debug", skip(user))]
+async fn handler(
+  Extension(user): Extension<User>,
+  Json(request): Json<UserRequest>,
+) -> serror::Result<axum::response::Response> {
+  let timer = Instant::now();
+  let req_id = Uuid::new_v4();
+  debug!(
+    "/user request {req_id} | user: {} ({})",
+    user.username, user.id
+  );
+  let res = request.resolve(&UserArgs { user }).await;
+  if let Err(e) = &res {
+    warn!("/user request {req_id} error: {:#}", e.error);
+  }
+  let elapsed = timer.elapsed();
+  debug!("/user request {req_id} | resolve time: {elapsed:?}");
+  res.map(|res| res.0)
+}
+
+const RECENTLY_VIEWED_MAX: usize = 10;
+
+impl Resolve<UserArgs> for PushRecentlyViewed {
+  #[instrument(
+    name = "PushRecentlyViewed",
+    level = "debug",
+    skip(user)
+  )]
+  async fn resolve(
+    self,
+    UserArgs { user }: &UserArgs,
+  ) -> serror::Result<PushRecentlyViewedResponse> {
+    let user = get_user(&user.id).await?;
+
+    let (resource_type, id) = self.resource.extract_variant_id();
+    let update = match user.recents.get(&resource_type) {
+      Some(recents) => {
+        let mut recents = recents
+          .iter()
+          .filter(|_id| !id.eq(*_id))
+          .take(RECENTLY_VIEWED_MAX - 1)
+          .collect::<VecDeque<_>>();
+        recents.push_front(id);
+        doc! { format!("recents.{resource_type}"): to_bson(&recents)? }
+      }
+      None => {
+        doc! { format!("recents.{resource_type}"): [id] }
+      }
+    };
+    update_one_by_id(
+      &db_client().users,
+      &user.id,
+      database::mungos::update::Update::Set(update),
+      None,
+    )
+    .await
+    .with_context(|| {
+      format!("failed to update recents.{resource_type}")
+    })?;
+
+    Ok(PushRecentlyViewedResponse {})
+  }
+}
+
+impl Resolve<UserArgs> for SetLastSeenUpdate {
+  #[instrument(
+    name = "SetLastSeenUpdate",
+    level = "debug",
+    skip(user)
+  )]
+  async fn resolve(
+    self,
+    UserArgs { user }: &UserArgs,
+  ) -> serror::Result<SetLastSeenUpdateResponse> {
+    update_one_by_id(
+      &db_client().users,
+      &user.id,
+      database::mungos::update::Update::Set(doc! {
+        "last_update_view": komodo_timestamp()
+      }),
+      None,
+    )
+    .await
+    .context("failed to update user last_update_view")?;
+    Ok(SetLastSeenUpdateResponse {})
+  }
+}
+
+const SECRET_LENGTH: usize = 40;
+const BCRYPT_COST: u32 = 10;
+
+impl Resolve<UserArgs> for CreateApiKey {
+  #[instrument(name = "CreateApiKey", level = "debug", skip(user))]
+  async fn resolve(
+    self,
+    UserArgs { user }: &UserArgs,
+  ) -> serror::Result<CreateApiKeyResponse> {
+    let user = get_user(&user.id).await?;
+
+    let key = format!("K-{}", random_string(SECRET_LENGTH));
+    let secret = format!("S-{}", random_string(SECRET_LENGTH));
+    let secret_hash = bcrypt::hash(&secret, BCRYPT_COST)
+      .context("failed at hashing secret string")?;
+
+    let api_key = ApiKey {
+      name: self.name,
+      key: key.clone(),
+      secret: secret_hash,
+      user_id: user.id.clone(),
+      created_at: komodo_timestamp(),
+      expires: self.expires,
+    };
+    db_client()
+      .api_keys
+      .insert_one(api_key)
+      .await
+      .context("failed to create api key on db")?;
+    Ok(CreateApiKeyResponse { key, secret })
+  }
+}
+
+impl Resolve<UserArgs> for DeleteApiKey {
+  #[instrument(name = "DeleteApiKey", level = "debug", skip(user))]
+  async fn resolve(
+    self,
+    UserArgs { user }: &UserArgs,
+  ) -> serror::Result<DeleteApiKeyResponse> {
+    let client = db_client();
+    let key = client
+      .api_keys
+      .find_one(doc! { "key": &self.key })
+      .await
+      .context("failed at db query")?
+      .context("no api key with key found")?;
+    if user.id != key.user_id {
+      return Err(anyhow!("api key does not belong to user").into());
+    }
+    client
+      .api_keys
+      .delete_one(doc! { "key": key.key })
+      .await
+      .context("failed to delete api key from db")?;
+    Ok(DeleteApiKeyResponse {})
+  }
+}

bin/core/src/api/write/action.rs

@@ -4,45 +4,29 @@ use komodo_client::{
     action::Action, permission::PermissionLevel, update::Update,
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{permission::get_check_permissions, resource};
 
 use super::WriteArgs;
 
 impl Resolve<WriteArgs> for CreateAction {
-  #[instrument(
-    "CreateAction",
-    skip_all,
-    fields(
-      operator = user.id,
-      action = self.name,
-      config = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
+  #[instrument(name = "CreateAction", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Action> {
+  ) -> serror::Result<Action> {
     resource::create::<Action>(&self.name, self.config, None, user)
       .await
   }
 }
 
 impl Resolve<WriteArgs> for CopyAction {
-  #[instrument(
-    "CopyAction",
-    skip_all,
-    fields(
-      operator = user.id,
-      action = self.name,
-      copy_action = self.id,
-    )
-  )]
+  #[instrument(name = "CopyAction", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Action> {
+  ) -> serror::Result<Action> {
     let Action { config, .. } = get_check_permissions::<Action>(
       &self.id,
       user,
@@ -55,54 +39,28 @@ impl Resolve<WriteArgs> for CopyAction {
 }
 
 impl Resolve<WriteArgs> for UpdateAction {
-  #[instrument(
-    "UpdateAction",
-    skip_all,
-    fields(
-      operator = user.id,
-      action = self.id,
-      update = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
+  #[instrument(name = "UpdateAction", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Action> {
+  ) -> serror::Result<Action> {
     Ok(resource::update::<Action>(&self.id, self.config, user).await?)
   }
 }
 
 impl Resolve<WriteArgs> for RenameAction {
-  #[instrument(
-    "RenameAction",
-    skip_all,
-    fields(
-      operator = user.id,
-      action = self.id,
-      new_name = self.name,
-    )
-  )]
+  #[instrument(name = "RenameAction", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Update> {
+  ) -> serror::Result<Update> {
     Ok(resource::rename::<Action>(&self.id, &self.name, user).await?)
   }
 }
 
 impl Resolve<WriteArgs> for DeleteAction {
-  #[instrument(
-    "DeleteAction",
-    skip_all,
-    fields(
-      operator = user.id,
-      action = self.id
-    )
-  )]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Action> {
-    Ok(resource::delete::<Action>(&self.id, user).await?)
+  #[instrument(name = "DeleteAction", skip(args))]
+  async fn resolve(self, args: &WriteArgs) -> serror::Result<Action> {
+    Ok(resource::delete::<Action>(&self.id, args).await?)
   }
 }

bin/core/src/api/write/alert.rs

@@ -1,41 +0,0 @@
-use std::str::FromStr;
-
-use anyhow::{Context, anyhow};
-use database::mungos::mongodb::bson::{doc, oid::ObjectId};
-use komodo_client::{api::write::CloseAlert, entities::NoData};
-use mogh_error::AddStatusCodeError;
-use mogh_resolver::Resolve;
-use reqwest::StatusCode;
-
-use crate::{api::write::WriteArgs, state::db_client};
-
-impl Resolve<WriteArgs> for CloseAlert {
-  #[instrument(
-    "CloseAlert",
-    skip_all,
-    fields(
-      operator = admin.id,
-      alert_id = self.id,
-    )
-  )]
-  async fn resolve(
-    self,
-    WriteArgs { user: admin }: &WriteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    if !admin.admin {
-      return Err(
-        anyhow!("This call is admin only")
-          .status_code(StatusCode::FORBIDDEN),
-      );
-    }
-    db_client()
-      .alerts
-      .update_one(
-        doc! { "_id": ObjectId::from_str(&self.id)? },
-        doc! { "$set": { "resolved": true } },
-      )
-      .await
-      .context("Failed to close Alert on database")?;
-    Ok(NoData {})
-  }
-}

bin/core/src/api/write/alerter.rs

@@ -4,45 +4,29 @@ use komodo_client::{
     alerter::Alerter, permission::PermissionLevel, update::Update,
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{permission::get_check_permissions, resource};
 
 use super::WriteArgs;
 
 impl Resolve<WriteArgs> for CreateAlerter {
-  #[instrument(
-    "CreateAlerter",
-    skip_all,
-    fields(
-      operator = user.id,
-      alerter = self.name,
-      config = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
+  #[instrument(name = "CreateAlerter", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Alerter> {
+  ) -> serror::Result<Alerter> {
     resource::create::<Alerter>(&self.name, self.config, None, user)
       .await
   }
 }
 
 impl Resolve<WriteArgs> for CopyAlerter {
-  #[instrument(
-    "CopyAlerter",
-    skip_all,
-    fields(
-      operator = user.id,
-      alerter = self.name,
-      copy_alerter = self.id,
-    )
-  )]
+  #[instrument(name = "CopyAlerter", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Alerter> {
+  ) -> serror::Result<Alerter> {
     let Alerter { config, .. } = get_check_permissions::<Alerter>(
       &self.id,
       user,
@@ -55,36 +39,21 @@ impl Resolve<WriteArgs> for CopyAlerter {
 }
 
 impl Resolve<WriteArgs> for DeleteAlerter {
-  #[instrument(
-    "DeleteAlerter",
-    skip_all,
-    fields(
-      operator = user.id,
-      alerter = self.id,
-    )
-  )]
+  #[instrument(name = "DeleteAlerter", skip(args))]
   async fn resolve(
     self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Alerter> {
-    Ok(resource::delete::<Alerter>(&self.id, user).await?)
+    args: &WriteArgs,
+  ) -> serror::Result<Alerter> {
+    Ok(resource::delete::<Alerter>(&self.id, args).await?)
   }
 }
 
 impl Resolve<WriteArgs> for UpdateAlerter {
-  #[instrument(
-    "UpdateAlerter",
-    skip_all,
-    fields(
-      operator = user.id,
-      alerter = self.id,
-      update = serde_json::to_string(&self.config).unwrap()
-    )
-  )]
+  #[instrument(name = "UpdateAlerter", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Alerter> {
+  ) -> serror::Result<Alerter> {
     Ok(
       resource::update::<Alerter>(&self.id, self.config, user)
         .await?,
@@ -93,19 +62,11 @@ impl Resolve<WriteArgs> for UpdateAlerter {
 }
 
 impl Resolve<WriteArgs> for RenameAlerter {
-  #[instrument(
-    "RenameAlerter",
-    skip_all,
-    fields(
-      operator = user.id,
-      alerter = self.id,
-      new_name = self.name,
-    )
-  )]
+  #[instrument(name = "RenameAlerter", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Update> {
+  ) -> serror::Result<Update> {
     Ok(resource::rename::<Alerter>(&self.id, &self.name, user).await?)
   }
 }

bin/core/src/api/write/build.rs

@@ -1,75 +1,67 @@
-use std::path::PathBuf;
+use std::{path::PathBuf, str::FromStr, time::Duration};
 
 use anyhow::{Context, anyhow};
-use database::mongo_indexed::doc;
 use database::mungos::mongodb::bson::to_document;
+use database::{
+  mongo_indexed::doc, mungos::mongodb::bson::oid::ObjectId,
+};
 use formatting::format_serror;
 use komodo_client::{
   api::write::*,
   entities::{
     FileContents, NoData, Operation, RepoExecutionArgs,
     all_logs_success,
-    build::{Build, BuildInfo},
+    build::{Build, BuildInfo, PartialBuildConfig},
     builder::{Builder, BuilderConfig},
+    config::core::CoreConfig,
     permission::PermissionLevel,
     repo::Repo,
+    server::ServerState,
     update::Update,
   },
 };
-use mogh_resolver::Resolve;
+use octorust::types::{
+  ReposCreateWebhookRequest, ReposCreateWebhookRequestConfig,
+};
 use periphery_client::api::build::{
   GetDockerfileContentsOnHost, WriteDockerfileContentsToHost,
 };
+use resolver_api::Resolve;
 use tokio::fs;
 
-use crate::helpers::builder::connect_builder_periphery;
 use crate::{
   config::core_config,
+  connection::PeripheryConnectionArgs,
   helpers::{
-    git_token,
+    git_token, periphery_client,
+    query::get_server_with_state,
     update::{add_update, make_update},
   },
   periphery::PeripheryClient,
   permission::get_check_permissions,
   resource,
-  state::db_client,
+  state::{db_client, github_client},
 };
 
 use super::WriteArgs;
 
 impl Resolve<WriteArgs> for CreateBuild {
-  #[instrument(
-    "CreateBuild",
-    skip_all,
-    fields(
-      operator = user.id,
-      build = self.name,
-      config = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
+  #[instrument(name = "CreateBuild", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Build> {
+  ) -> serror::Result<Build> {
     resource::create::<Build>(&self.name, self.config, None, user)
       .await
   }
 }
 
 impl Resolve<WriteArgs> for CopyBuild {
-  #[instrument(
-    "CopyBuild",
-    skip_all,
-    fields(
-      operator = user.id,
-      build = self.name,
-      copy_build = self.id,
-    )
-  )]
+  #[instrument(name = "CopyBuild", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Build> {
+  ) -> serror::Result<Build> {
     let Build { mut config, .. } = get_check_permissions::<Build>(
       &self.id,
       user,
@@ -84,71 +76,35 @@ impl Resolve<WriteArgs> for CopyBuild {
 }
 
 impl Resolve<WriteArgs> for DeleteBuild {
-  #[instrument(
-    "DeleteBuild",
-    skip_all,
-    fields(
-      operator = user.id,
-      build = self.id,
-    )
-  )]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Build> {
-    Ok(resource::delete::<Build>(&self.id, user).await?)
+  #[instrument(name = "DeleteBuild", skip(args))]
+  async fn resolve(self, args: &WriteArgs) -> serror::Result<Build> {
+    Ok(resource::delete::<Build>(&self.id, args).await?)
   }
 }
 
 impl Resolve<WriteArgs> for UpdateBuild {
-  #[instrument(
-    "UpdateBuild",
-    skip_all,
-    fields(
-      operator = user.id,
-      build = self.id,
-      update = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
+  #[instrument(name = "UpdateBuild", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Build> {
+  ) -> serror::Result<Build> {
     Ok(resource::update::<Build>(&self.id, self.config, user).await?)
   }
 }
 
 impl Resolve<WriteArgs> for RenameBuild {
-  #[instrument(
-    "RenameBuild",
-    skip_all,
-    fields(
-      operator = user.id,
-      build = self.id,
-      new_name = self.name,
-    )
-  )]
+  #[instrument(name = "RenameBuild", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Update> {
+  ) -> serror::Result<Update> {
     Ok(resource::rename::<Build>(&self.id, &self.name, user).await?)
   }
 }
 
 impl Resolve<WriteArgs> for WriteBuildFileContents {
-  #[instrument(
-    "WriteBuildFileContents",
-    skip_all,
-    fields(
-      operator = args.user.id,
-      build = self.build,
-    )
-  )]
-  async fn resolve(
-    self,
-    args: &WriteArgs,
-  ) -> mogh_error::Result<Update> {
+  #[instrument(name = "WriteBuildFileContents", skip(args))]
+  async fn resolve(self, args: &WriteArgs) -> serror::Result<Update> {
     let build = get_check_permissions::<Build>(
       &self.build,
       &args.user,
@@ -219,13 +175,12 @@ impl Resolve<WriteArgs> for WriteBuildFileContents {
   }
 }
 
-#[instrument("WriteDockerfileContentsGit", skip_all)]
 async fn write_dockerfile_contents_git(
   req: WriteBuildFileContents,
   args: &WriteArgs,
   build: Build,
   mut update: Update,
-) -> mogh_error::Result<Update> {
+) -> serror::Result<Update> {
   let WriteBuildFileContents { build: _, contents } = req;
 
   let mut repo_args: RepoExecutionArgs = if !build
@@ -317,9 +272,8 @@ async fn write_dockerfile_contents_git(
     return Ok(update);
   }
 
-  if let Err(e) = mogh_secret_file::write_async(&full_path, &contents)
-    .await
-    .with_context(|| {
+  if let Err(e) =
+    fs::write(&full_path, &contents).await.with_context(|| {
       format!("Failed to write dockerfile contents to {full_path:?}")
     })
   {
@@ -366,10 +320,15 @@ async fn write_dockerfile_contents_git(
 }
 
 impl Resolve<WriteArgs> for RefreshBuildCache {
+  #[instrument(
+    name = "RefreshBuildCache",
+    level = "debug",
+    skip(user)
+  )]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<NoData> {
+  ) -> serror::Result<NoData> {
     // Even though this is a write request, this doesn't change any config. Anyone that can execute the
     // build should be able to do this.
     let build = get_check_permissions::<Build>(
@@ -389,28 +348,23 @@ impl Resolve<WriteArgs> for RefreshBuildCache {
       None
     };
 
-    let RemoteDockerfileContents {
-      path,
-      contents,
-      error,
-      hash,
-      message,
-    } = if build.config.files_on_host {
+    let (
+      remote_path,
+      remote_contents,
+      remote_error,
+      latest_hash,
+      latest_message,
+    ) = if build.config.files_on_host {
       // =============
       // FILES ON HOST
       // =============
       match get_on_host_dockerfile(&build).await {
         Ok(FileContents { path, contents }) => {
-          RemoteDockerfileContents {
-            path: Some(path),
-            contents: Some(contents),
-            ..Default::default()
-          }
+          (Some(path), Some(contents), None, None, None)
+        }
+        Err(e) => {
+          (None, None, Some(format_serror(&e.into())), None, None)
         }
-        Err(e) => RemoteDockerfileContents {
-          error: Some(format_serror(&e.into())),
-          ..Default::default()
-        },
       }
     } else if let Some(repo) = &repo {
       let Some(res) = get_git_remote(&build, repo.into()).await?
@@ -430,7 +384,7 @@ impl Resolve<WriteArgs> for RefreshBuildCache {
       // =============
       // UI BASED FILE
       // =============
-      RemoteDockerfileContents::default()
+      (None, None, None, None, None)
     };
 
     let info = BuildInfo {
@@ -438,11 +392,11 @@ impl Resolve<WriteArgs> for RefreshBuildCache {
       built_hash: build.info.built_hash,
       built_message: build.info.built_message,
       built_contents: build.info.built_contents,
-      remote_path: path,
-      remote_contents: contents,
-      remote_error: error,
-      latest_hash: hash,
-      latest_message: message,
+      remote_path,
+      remote_contents,
+      remote_error,
+      latest_hash,
+      latest_message,
     };
 
     let info = to_document(&info)
@@ -472,15 +426,49 @@ async fn get_on_host_periphery(
     .await
     .context("Failed to get builder")?;
 
-  if let BuilderConfig::Aws(_) = builder.config {
-    return Err(anyhow!(
-      "Files on host doesn't work with AWS builder"
-    ));
+  match builder.config {
+    BuilderConfig::Aws(_) => {
+      Err(anyhow!("Files on host doesn't work with AWS builder"))
+    }
+    BuilderConfig::Url(config) => {
+      // TODO: Ensure connection is actually established.
+      // Builder id no good because it may be active for multiple connections.
+      let periphery = PeripheryClient::new(
+        PeripheryConnectionArgs::from_url_builder(
+          &ObjectId::new().to_hex(),
+          &config,
+        ),
+        config.insecure_tls,
+        &config.passkey,
+      )
+      .await?;
+      // Poll for connection to be estalished
+      let mut err = None;
+      for _ in 0..10 {
+        tokio::time::sleep(Duration::from_secs(1)).await;
+        match periphery.health_check().await {
+          Ok(_) => return Ok(periphery),
+          Err(e) => err = Some(e),
+        };
+      }
+      Err(err.context("Missing error")?)
+    }
+    BuilderConfig::Server(config) => {
+      if config.server_id.is_empty() {
+        return Err(anyhow!(
+          "Builder is type server, but has no server attached"
+        ));
+      }
+      let (server, state) =
+        get_server_with_state(&config.server_id).await?;
+      if state != ServerState::Ok {
+        return Err(anyhow!(
+          "Builder server is disabled or not reachable"
+        ));
+      };
+      periphery_client(&server).await
+    }
   }
-
-  connect_builder_periphery(build.name.clone(), None, builder, None)
-    .await
-    .map(|(periphery, _)| periphery)
 }
 
 /// The successful case will be included as Some(remote_contents).
@@ -501,7 +489,15 @@ async fn get_on_host_dockerfile(
 async fn get_git_remote(
   build: &Build,
   mut clone_args: RepoExecutionArgs,
-) -> anyhow::Result<Option<RemoteDockerfileContents>> {
+) -> anyhow::Result<
+  Option<(
+    Option<String>,
+    Option<String>,
+    Option<String>,
+    Option<String>,
+    Option<String>,
+  )>,
+> {
   if clone_args.provider.is_empty() {
     // Nothing to do here
     return Ok(None);
@@ -528,19 +524,10 @@ async fn get_git_remote(
     access_token,
   )
   .await
-  .context("Failed to clone Build repo")?;
+  .context("failed to clone build repo")?;
 
-  // Ensure clone / pull successful,
-  // propogate error log -> 'errored' and return.
-  if let Some(failure) = res.logs.iter().find(|log| !log.success) {
-    return Ok(Some(RemoteDockerfileContents {
-      path: Some(format!("Failed at: {}", failure.stage)),
-      error: Some(failure.combined()),
-      ..Default::default()
-    }));
-  }
-
-  let relative_path = PathBuf::from(&build.config.build_path)
+  let relative_path = PathBuf::from_str(&build.config.build_path)
+    .context("Invalid build path")?
     .join(&build.config.dockerfile_path);
 
   let full_path = repo_path.join(&relative_path);
@@ -551,20 +538,209 @@ async fn get_git_remote(
       Ok(contents) => (Some(contents), None),
       Err(e) => (None, Some(format_serror(&e.into()))),
     };
-  Ok(Some(RemoteDockerfileContents {
-    path: Some(relative_path.display().to_string()),
+  Ok(Some((
+    Some(relative_path.display().to_string()),
     contents,
     error,
-    hash: res.commit_hash,
-    message: res.commit_message,
-  }))
+    res.commit_hash,
+    res.commit_message,
+  )))
 }
 
-#[derive(Default)]
-pub struct RemoteDockerfileContents {
-  pub path: Option<String>,
-  pub contents: Option<String>,
-  pub error: Option<String>,
-  pub hash: Option<String>,
-  pub message: Option<String>,
+impl Resolve<WriteArgs> for CreateBuildWebhook {
+  #[instrument(name = "CreateBuildWebhook", skip(args))]
+  async fn resolve(
+    self,
+    args: &WriteArgs,
+  ) -> serror::Result<CreateBuildWebhookResponse> {
+    let Some(github) = github_client() else {
+      return Err(
+        anyhow!(
+          "github_webhook_app is not configured in core config toml"
+        )
+        .into(),
+      );
+    };
+
+    let WriteArgs { user } = args;
+
+    let build = get_check_permissions::<Build>(
+      &self.build,
+      user,
+      PermissionLevel::Write.into(),
+    )
+    .await?;
+
+    if build.config.repo.is_empty() {
+      return Err(
+        anyhow!("No repo configured, can't create webhook").into(),
+      );
+    }
+
+    let mut split = build.config.repo.split('/');
+    let owner = split.next().context("Build repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Err(
+        anyhow!("Cannot manage repo webhooks under owner {owner}")
+          .into(),
+      );
+    };
+
+    let repo =
+      split.next().context("Build repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    // First make sure the webhook isn't already created (inactive ones are ignored)
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      webhook_secret,
+      ..
+    } = core_config();
+
+    let webhook_secret = if build.config.webhook_secret.is_empty() {
+      webhook_secret
+    } else {
+      &build.config.webhook_secret
+    };
+
+    let host = if webhook_base_url.is_empty() {
+      host
+    } else {
+      webhook_base_url
+    };
+    let url = format!("{host}/listener/github/build/{}", build.id);
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == url {
+        return Ok(NoData {});
+      }
+    }
+
+    // Now good to create the webhook
+    let request = ReposCreateWebhookRequest {
+      active: Some(true),
+      config: Some(ReposCreateWebhookRequestConfig {
+        url,
+        secret: webhook_secret.to_string(),
+        content_type: String::from("json"),
+        insecure_ssl: None,
+        digest: Default::default(),
+        token: Default::default(),
+      }),
+      events: vec![String::from("push")],
+      name: String::from("web"),
+    };
+    github_repos
+      .create_webhook(owner, repo, &request)
+      .await
+      .context("failed to create webhook")?;
+
+    if !build.config.webhook_enabled {
+      UpdateBuild {
+        id: build.id,
+        config: PartialBuildConfig {
+          webhook_enabled: Some(true),
+          ..Default::default()
+        },
+      }
+      .resolve(args)
+      .await
+      .map_err(|e| e.error)
+      .context("failed to update build to enable webhook")?;
+    }
+
+    Ok(NoData {})
+  }
+}
+
+impl Resolve<WriteArgs> for DeleteBuildWebhook {
+  #[instrument(name = "DeleteBuildWebhook", skip(user))]
+  async fn resolve(
+    self,
+    WriteArgs { user }: &WriteArgs,
+  ) -> serror::Result<DeleteBuildWebhookResponse> {
+    let Some(github) = github_client() else {
+      return Err(
+        anyhow!(
+          "github_webhook_app is not configured in core config toml"
+        )
+        .into(),
+      );
+    };
+
+    let build = get_check_permissions::<Build>(
+      &self.build,
+      user,
+      PermissionLevel::Write.into(),
+    )
+    .await?;
+
+    if build.config.git_provider != "github.com" {
+      return Err(
+        anyhow!("Can only manage github.com repo webhooks").into(),
+      );
+    }
+
+    if build.config.repo.is_empty() {
+      return Err(
+        anyhow!("No repo configured, can't delete webhook").into(),
+      );
+    }
+
+    let mut split = build.config.repo.split('/');
+    let owner = split.next().context("Build repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Err(
+        anyhow!("Cannot manage repo webhooks under owner {owner}")
+          .into(),
+      );
+    };
+
+    let repo =
+      split.next().context("Build repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      ..
+    } = core_config();
+
+    let host = if webhook_base_url.is_empty() {
+      host
+    } else {
+      webhook_base_url
+    };
+    let url = format!("{host}/listener/github/build/{}", build.id);
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == url {
+        github_repos
+          .delete_webhook(owner, repo, webhook.id)
+          .await
+          .context("failed to delete webhook")?;
+        return Ok(NoData {});
+      }
+    }
+
+    // No webhook to delete, all good
+    Ok(NoData {})
+  }
 }

bin/core/src/api/write/builder.rs

@@ -4,45 +4,29 @@ use komodo_client::{
     builder::Builder, permission::PermissionLevel, update::Update,
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{permission::get_check_permissions, resource};
 
 use super::WriteArgs;
 
 impl Resolve<WriteArgs> for CreateBuilder {
-  #[instrument(
-    "CreateBuilder",
-    skip_all,
-    fields(
-      operator = user.id,
-      builder = self.name,
-      config = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
+  #[instrument(name = "CreateBuilder", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Builder> {
+  ) -> serror::Result<Builder> {
     resource::create::<Builder>(&self.name, self.config, None, user)
       .await
   }
 }
 
 impl Resolve<WriteArgs> for CopyBuilder {
-  #[instrument(
-    "CopyBuilder",
-    skip_all,
-    fields(
-      operator = user.id,
-      builder = self.name,
-      copy_builder = self.id,
-    )
-  )]
+  #[instrument(name = "CopyBuilder", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Builder> {
+  ) -> serror::Result<Builder> {
     let Builder { config, .. } = get_check_permissions::<Builder>(
       &self.id,
       user,
@@ -55,36 +39,21 @@ impl Resolve<WriteArgs> for CopyBuilder {
 }
 
 impl Resolve<WriteArgs> for DeleteBuilder {
-  #[instrument(
-    "DeleteBuilder",
-    skip_all,
-    fields(
-      operator = user.id,
-      builder = self.id,
-    )
-  )]
+  #[instrument(name = "DeleteBuilder", skip(args))]
   async fn resolve(
     self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Builder> {
-    Ok(resource::delete::<Builder>(&self.id, user).await?)
+    args: &WriteArgs,
+  ) -> serror::Result<Builder> {
+    Ok(resource::delete::<Builder>(&self.id, args).await?)
   }
 }
 
 impl Resolve<WriteArgs> for UpdateBuilder {
-  #[instrument(
-    "UpdateBuilder",
-    skip_all,
-    fields(
-      operator = user.id,
-      builder = self.id,
-      update = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
+  #[instrument(name = "UpdateBuilder", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Builder> {
+  ) -> serror::Result<Builder> {
     Ok(
       resource::update::<Builder>(&self.id, self.config, user)
         .await?,
@@ -93,19 +62,11 @@ impl Resolve<WriteArgs> for UpdateBuilder {
 }
 
 impl Resolve<WriteArgs> for RenameBuilder {
-  #[instrument(
-    "RenameBuilder",
-    skip_all,
-    fields(
-      operator = user.id,
-      builder = self.id,
-      new_name = self.name
-    )
-  )]
+  #[instrument(name = "RenameBuilder", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Update> {
+  ) -> serror::Result<Update> {
     Ok(resource::rename::<Builder>(&self.id, &self.name, user).await?)
   }
 }

bin/core/src/api/write/deployment.rs

@@ -1,69 +1,43 @@
-use std::sync::OnceLock;
-
 use anyhow::{Context, anyhow};
 use database::mungos::{by_id::update_one_by_id, mongodb::bson::doc};
-use futures_util::{StreamExt as _, stream::FuturesOrdered};
 use komodo_client::{
-  api::{execute::Deploy, write::*},
+  api::write::*,
   entities::{
-    Operation, ResourceTarget, SwarmOrServer,
-    alert::{Alert, AlertData, SeverityLevel},
+    Operation,
     deployment::{
-      Deployment, DeploymentImage, DeploymentInfo, DeploymentState,
-      PartialDeploymentConfig, RestartMode, extract_registry_domain,
+      Deployment, DeploymentImage, DeploymentState,
+      PartialDeploymentConfig, RestartMode,
     },
     docker::container::RestartPolicyNameEnum,
-    komodo_timestamp, optional_string,
+    komodo_timestamp,
     permission::PermissionLevel,
-    resource::ResourceQuery,
     server::{Server, ServerState},
     to_container_compatible_name,
     update::Update,
-    user::{auto_redeploy_user, system_user},
   },
 };
-use mogh_cache::SetCache;
-use mogh_resolver::Resolve;
 use periphery_client::api::{self, container::InspectContainer};
+use resolver_api::Resolve;
 
 use crate::{
-  alert::send_alerts,
-  api::execute::{self, ExecuteRequest, ExecutionResult},
   helpers::{
     periphery_client,
-    query::{
-      get_all_tags, get_deployment_state, get_swarm_or_server,
-    },
-    registry_token,
-    update::{add_update, make_update, poll_update_until_complete},
+    query::get_deployment_state,
+    update::{add_update, make_update},
   },
   permission::get_check_permissions,
-  resource::{
-    self, list_full_for_user_using_pattern,
-    setup_deployment_execution,
-  },
-  state::{
-    action_states, db_client, deployment_status_cache,
-    image_digest_cache, server_status_cache,
-  },
+  resource,
+  state::{action_states, db_client, server_status_cache},
 };
 
 use super::WriteArgs;
 
 impl Resolve<WriteArgs> for CreateDeployment {
-  #[instrument(
-    "CreateDeployment",
-    skip_all,
-    fields(
-      operator = user.id,
-      deployment = self.name,
-      config = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
+  #[instrument(name = "CreateDeployment", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Deployment> {
+  ) -> serror::Result<Deployment> {
     resource::create::<Deployment>(
       &self.name,
       self.config,
@@ -75,19 +49,11 @@ impl Resolve<WriteArgs> for CreateDeployment {
 }
 
 impl Resolve<WriteArgs> for CopyDeployment {
-  #[instrument(
-    "CopyDeployment",
-    skip_all,
-    fields(
-      operator = user.id,
-      deployment = self.name,
-      copy_deployment = self.id,
-    )
-  )]
+  #[instrument(name = "CopyDeployment", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Deployment> {
+  ) -> serror::Result<Deployment> {
     let Deployment { config, .. } =
       get_check_permissions::<Deployment>(
         &self.id,
@@ -106,19 +72,11 @@ impl Resolve<WriteArgs> for CopyDeployment {
 }
 
 impl Resolve<WriteArgs> for CreateDeploymentFromContainer {
-  #[instrument(
-    "CreateDeploymentFromContainer",
-    skip_all,
-    fields(
-      operator = user.id,
-      server = self.server,
-      deployment = self.name,
-    )
-  )]
+  #[instrument(name = "CreateDeploymentFromContainer", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Deployment> {
+  ) -> serror::Result<Deployment> {
     let server = get_check_permissions::<Server>(
       &self.server,
       user,
@@ -208,81 +166,34 @@ impl Resolve<WriteArgs> for CreateDeploymentFromContainer {
 }
 
 impl Resolve<WriteArgs> for DeleteDeployment {
-  #[instrument(
-    "DeleteDeployment",
-    skip_all,
-    fields(
-      operator = user.id,
-      deployment = self.id
-    )
-  )]
+  #[instrument(name = "DeleteDeployment", skip(args))]
   async fn resolve(
     self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Deployment> {
-    Ok(resource::delete::<Deployment>(&self.id, user).await?)
+    args: &WriteArgs,
+  ) -> serror::Result<Deployment> {
+    Ok(resource::delete::<Deployment>(&self.id, args).await?)
   }
 }
 
 impl Resolve<WriteArgs> for UpdateDeployment {
-  #[instrument(
-    "UpdateDeployment",
-    skip_all,
-    fields(
-      operator = user.id,
-      deployment = self.id,
-      update = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
+  #[instrument(name = "UpdateDeployment", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Deployment> {
-    // If the update changes image,
-    // also update the stored latest image digest.
-    let image_update = self
-      .config
-      .image
-      .as_ref()
-      .map(|image| image.as_image().is_some())
-      .unwrap_or_default();
-
-    let deployment =
+  ) -> serror::Result<Deployment> {
+    Ok(
       resource::update::<Deployment>(&self.id, self.config, user)
-        .await?;
-
-    if image_update {
-      tokio::spawn(async move {
-        let _ = (CheckDeploymentForUpdate {
-          deployment: self.id,
-          skip_auto_update: false,
-          wait_for_auto_update: false,
-        })
-        .resolve(&WriteArgs {
-          user: system_user().to_owned(),
-        })
-        .await;
-      });
-    }
-
-    Ok(deployment)
+        .await?,
+    )
   }
 }
 
 impl Resolve<WriteArgs> for RenameDeployment {
-  #[instrument(
-    "RenameDeployment",
-    skip_all,
-    fields(
-      operator = user.id,
-      deployment = self.id,
-      new_name = self.name,
-    )
-  )]
+  #[instrument(name = "RenameDeployment", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Update> {
+  ) -> serror::Result<Update> {
     let deployment = get_check_permissions::<Deployment>(
       &self.id,
       user,
@@ -303,24 +214,10 @@ impl Resolve<WriteArgs> for RenameDeployment {
 
     let name = to_container_compatible_name(&self.name);
 
-    let state = get_deployment_state(&deployment.id).await?;
+    let container_state =
+      get_deployment_state(&deployment.id).await?;
 
-    // When no custom name is configured, the container / service
-    // follows the Deployment name, and must be kept matched:
-    //   - Server mode: rename the container to the new name.
-    //   - Swarm mode: services cannot be renamed, so the current
-    //     service name is pinned in info.deployed_name, and stays
-    //     in use until the next deploy recreates the service.
-    // A configured custom name is unaffected by Deployment rename.
-    let follows_name =
-      deployment.config.custom_name.trim().is_empty();
-    let deployed = state != DeploymentState::NotDeployed;
-
-    let rename_container = follows_name
-      && deployed
-      && !deployment.config.server_id.is_empty();
-
-    if rename_container && state == DeploymentState::Unknown {
+    if container_state == DeploymentState::Unknown {
       return Err(
         anyhow!(
           "Cannot rename Deployment when container status is unknown"
@@ -329,51 +226,27 @@ impl Resolve<WriteArgs> for RenameDeployment {
       );
     }
 
-    // Includes the Unknown state, in case a service
-    // is still running under the current name.
-    let pin_deployed_name = follows_name
-      && deployed
-      && !deployment.config.swarm_id.is_empty()
-      && deployment.info.deployed_name.is_empty();
-
     let mut update =
       make_update(&deployment, Operation::RenameDeployment, user);
 
-    let mut set =
-      doc! { "name": &name, "updated_at": komodo_timestamp() };
-    if rename_container {
-      // Container is renamed to the new name below.
-      set.insert("info.deployed_name", name.as_str());
-    } else if pin_deployed_name {
-      set.insert("info.deployed_name", deployment.deployed_name());
-    }
-
     update_one_by_id(
       &db_client().deployments,
       &deployment.id,
-      database::mungos::update::Update::Set(set),
+      database::mungos::update::Update::Set(
+        doc! { "name": &name, "updated_at": komodo_timestamp() },
+      ),
       None,
     )
     .await
     .context("Failed to update Deployment name on db")?;
 
-    if pin_deployed_name {
-      update.push_simple_log(
-        "Pin Service Name",
-        format!(
-          "Swarm services cannot be renamed, so the current service name '{}' stays in use until the next deploy recreates the service under the new name.",
-          deployment.deployed_name()
-        ),
-      );
-    }
-
-    if rename_container {
+    if container_state != DeploymentState::NotDeployed {
       let server =
         resource::get::<Server>(&deployment.config.server_id).await?;
       let log = periphery_client(&server)
         .await?
         .request(api::container::RenameContainer {
-          curr_name: deployment.deployed_name().to_string(),
+          curr_name: deployment.name.clone(),
           new_name: name.clone(),
         })
         .await
@@ -394,335 +267,3 @@ impl Resolve<WriteArgs> for RenameDeployment {
     Ok(update)
   }
 }
-
-//
-
-impl Resolve<WriteArgs> for CheckDeploymentForUpdate {
-  #[instrument(
-    "CheckDeploymentForUpdate",
-    skip_all,
-    fields(
-      operator = user.id,
-      deployment = self.deployment,
-      skip_auto_update = self.skip_auto_update,
-      wait_for_auto_update = self.wait_for_auto_update,
-    )
-  )]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Self::Response> {
-    // Even though this is a write request, this doesn't change any config. Anyone that can execute the
-    // deployment should be able to do this.
-    let (deployment, swarm_or_server) = setup_deployment_execution(
-      &self.deployment,
-      user,
-      PermissionLevel::Execute.into(),
-    )
-    .await?;
-
-    swarm_or_server.verify_has_target()?;
-
-    check_deployment_for_update_inner(
-      deployment,
-      &swarm_or_server,
-      self.skip_auto_update,
-      self.wait_for_auto_update,
-    )
-    .await
-    .map_err(Into::into)
-  }
-}
-
-/// If it goes down the "update available" path,
-/// only send alert if deployment id is not in this cache.
-/// If alert is sent, add ID to cache.
-/// If later it goes down non "update available" path,
-/// remove the id from cache, so next time it does another alert
-/// will be sent.
-fn deployment_alert_sent_cache() -> &'static SetCache<String> {
-  static CACHE: OnceLock<SetCache<String>> = OnceLock::new();
-  CACHE.get_or_init(Default::default)
-}
-
-/// Checks remote registry for latest image digest,
-/// and saves it to database associated with the deployment.
-///
-/// Returns true if update is available and auto deploy is false.
-/// If auto deploy is true, this will deploy.
-#[instrument(
-  "CheckDeploymentForUpdateInner",
-  skip_all,
-  fields(
-    deployment = deployment.id,
-    skip_auto_update,
-    wait_for_auto_update,
-  )
-)]
-pub async fn check_deployment_for_update_inner(
-  deployment: Deployment,
-  swarm_or_server: &SwarmOrServer,
-  skip_auto_update: bool,
-  // Otherwise spawns task to run in background
-  wait_for_auto_update: bool,
-) -> anyhow::Result<CheckDeploymentForUpdateResponse> {
-  let alert_cache = deployment_alert_sent_cache();
-
-  let (image, account, token) = match &deployment.config.image {
-    DeploymentImage::Image { image } => {
-      if image.contains('@') {
-        // Images with a hardcoded digest can't have update.
-        return Ok(CheckDeploymentForUpdateResponse {
-          deployment: deployment.id,
-          update_available: false,
-        });
-      }
-      let domain = extract_registry_domain(image)?;
-      let account =
-        optional_string(&deployment.config.image_registry_account);
-      let token = if let Some(account) = &account {
-        registry_token(&domain, account).await?
-      } else {
-        None
-      };
-      (image, account, token)
-    }
-    DeploymentImage::Build { .. } => {
-      alert_cache.remove(&deployment.id).await;
-      // This method not used for build based deployments
-      // as deployed version vs built version can be inferred from Updates.
-      return Ok(CheckDeploymentForUpdateResponse {
-        deployment: deployment.id,
-        update_available: false,
-      });
-    }
-  };
-
-  let latest_digest = image_digest_cache()
-    .get(swarm_or_server, image, account, token)
-    .await?;
-
-  resource::update_info::<Deployment>(
-    &deployment.id,
-    &DeploymentInfo {
-      latest_image_digest: latest_digest.clone(),
-      deployed_name: deployment.info.deployed_name.clone(),
-    },
-  )
-  .await?;
-
-  let Some((state, Some(current_digests))) =
-    deployment_status_cache()
-      .get(&deployment.id)
-      .await
-      .map(|s| (s.curr.state, s.curr.image_digests.clone()))
-  else {
-    alert_cache.remove(&deployment.id).await;
-    return Ok(CheckDeploymentForUpdateResponse {
-      deployment: deployment.id,
-      update_available: false,
-    });
-  };
-
-  // If not running or latest digest matches current, early return
-  if !matches!(state, DeploymentState::Running)
-    || !latest_digest.update_available(&current_digests)
-  {
-    alert_cache.remove(&deployment.id).await;
-    return Ok(CheckDeploymentForUpdateResponse {
-      deployment: deployment.id,
-      update_available: false,
-    });
-  }
-
-  if !skip_auto_update && deployment.config.auto_update {
-    // Trigger deploy + alert
-
-    // Conservatively remove from alert cache so 'skip_auto_update'
-    // doesn't cause alerts not to be sent on subsequent calls.
-    alert_cache.remove(&deployment.id).await;
-
-    let swarm_id = swarm_or_server.swarm_id().map(str::to_string);
-    let swarm_name = swarm_or_server.swarm_name().map(str::to_string);
-    let server_id = swarm_or_server.server_id().map(str::to_string);
-    let server_name =
-      swarm_or_server.server_name().map(str::to_string);
-    let id = deployment.id.clone();
-    let name = deployment.name.clone();
-    let image = image.clone();
-
-    let run = async move {
-      match execute::inner_handler(
-        ExecuteRequest::Deploy(Deploy {
-          deployment: name.clone(),
-          stop_signal: None,
-          stop_time: None,
-        }),
-        auto_redeploy_user().to_owned(),
-      )
-      .await
-      {
-        Ok(res) => {
-          let ExecutionResult::Single(update) = res else {
-            unreachable!()
-          };
-          let Ok(update) =
-            poll_update_until_complete(&update.id).await
-          else {
-            return;
-          };
-          if update.success {
-            let ts = komodo_timestamp();
-            let alert = Alert {
-              id: Default::default(),
-              ts,
-              resolved: true,
-              resolved_ts: ts.into(),
-              level: SeverityLevel::Ok,
-              target: ResourceTarget::Deployment(id.clone()),
-              data: AlertData::DeploymentAutoUpdated {
-                id,
-                name,
-                swarm_id,
-                swarm_name,
-                server_id,
-                server_name,
-                image,
-              },
-            };
-            let res = db_client().alerts.insert_one(&alert).await;
-            if let Err(e) = res {
-              error!(
-                "Failed to record DeploymentAutoUpdated to db | {e:#}"
-              );
-            }
-            send_alerts(&[alert]).await;
-          }
-        }
-        Err(e) => {
-          warn!("Failed to auto update Deployment {name} | {e:#}",)
-        }
-      }
-    };
-
-    if wait_for_auto_update {
-      run.await
-    } else {
-      tokio::spawn(run);
-    }
-  } else {
-    // Avoid spamming alerts
-    if alert_cache.contains(&deployment.id).await {
-      return Ok(CheckDeploymentForUpdateResponse {
-        deployment: deployment.id,
-        update_available: true,
-      });
-    }
-    alert_cache.insert(deployment.id.clone()).await;
-    let ts = komodo_timestamp();
-    let alert = Alert {
-      id: Default::default(),
-      ts,
-      resolved: true,
-      resolved_ts: ts.into(),
-      level: SeverityLevel::Ok,
-      target: ResourceTarget::Deployment(deployment.id.clone()),
-      data: AlertData::DeploymentImageUpdateAvailable {
-        id: deployment.id.clone(),
-        name: deployment.name.clone(),
-        swarm_id: swarm_or_server.swarm_id().map(str::to_string),
-        swarm_name: swarm_or_server.swarm_name().map(str::to_string),
-        server_id: swarm_or_server.server_id().map(str::to_string),
-        server_name: swarm_or_server
-          .server_name()
-          .map(str::to_string),
-        image: image.clone(),
-      },
-    };
-    let res = db_client().alerts.insert_one(&alert).await;
-    if let Err(e) = res {
-      error!(
-        "Failed to record DeploymentImageUpdateAvailable to db | {e:#}"
-      );
-    }
-    send_alerts(&[alert]).await;
-  }
-
-  Ok(CheckDeploymentForUpdateResponse {
-    deployment: deployment.id,
-    update_available: !deployment.config.auto_update,
-  })
-}
-
-//
-
-impl Resolve<WriteArgs> for BatchCheckDeploymentForUpdate {
-  #[instrument(
-    "BatchCheckDeploymentForUpdate",
-    skip_all,
-    fields(
-      operator = user.id,
-      pattern = self.pattern,
-      tags = self.tags.join(","),
-      skip_auto_update = self.skip_auto_update,
-      wait_for_auto_update = self.wait_for_auto_update,
-    )
-  )]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> Result<Self::Response, Self::Error> {
-    let all_tags = if self.tags.is_empty() {
-      vec![]
-    } else {
-      get_all_tags(None).await?
-    };
-
-    let deployments = list_full_for_user_using_pattern::<Deployment>(
-      &self.pattern,
-      ResourceQuery {
-        tags: self.tags,
-        ..Default::default()
-      },
-      None,
-      None,
-      user,
-      PermissionLevel::Execute.into(),
-      &all_tags,
-    )
-    .await?;
-
-    let res = deployments
-      .into_iter()
-      .map(|deployment| async move {
-        let swarm_or_server = get_swarm_or_server(
-          &deployment.config.swarm_id,
-          &deployment.config.server_id,
-        )
-        .await?;
-        swarm_or_server.verify_has_target().map_err(|e| e.error)?;
-        check_deployment_for_update_inner(
-          deployment,
-          &swarm_or_server,
-          self.skip_auto_update,
-          self.wait_for_auto_update,
-        )
-        .await
-      })
-      .collect::<FuturesOrdered<_>>()
-      .collect::<Vec<_>>()
-      .await
-      .into_iter()
-      .filter_map(|res| {
-        res
-          .inspect_err(|e| {
-            warn!(
-              "Failed to check deployment for update in batch run | {e:#}"
-            )
-          })
-          .ok()
-      })
-      .collect();
-    Ok(res)
-  }
-}

bin/core/src/api/write/mod.rs

@@ -1,30 +1,29 @@
+use std::time::Instant;
+
 use anyhow::Context;
 use axum::{
   Extension, Router, extract::Path, middleware, routing::post,
 };
+use derive_variants::{EnumVariants, ExtractVariant};
 use komodo_client::{api::write::*, entities::user::User};
-use mogh_auth_server::middleware::authenticate_request;
-use mogh_error::Json;
-use mogh_error::Response;
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
+use response::Response;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use strum::Display;
-use strum::EnumDiscriminants;
+use serror::Json;
 use typeshare::typeshare;
 use uuid::Uuid;
 
-use crate::auth::KomodoAuthImpl;
+use crate::auth::auth_request;
 
 use super::Variant;
 
 mod action;
-mod alert;
 mod alerter;
 mod build;
 mod builder;
 mod deployment;
-mod onboarding;
+mod onboarding_key;
 mod permissions;
 mod procedure;
 mod provider;
@@ -33,43 +32,56 @@ mod resource;
 mod server;
 mod service_user;
 mod stack;
-mod swarm;
 mod sync;
 mod tag;
-mod terminal;
 mod user;
 mod user_group;
 mod variable;
 
-pub use {
-  deployment::check_deployment_for_update_inner,
-  stack::check_stack_for_update_inner,
-};
-
 pub struct WriteArgs {
   pub user: User,
 }
 
 #[typeshare]
 #[derive(
-  Serialize, Deserialize, Debug, Clone, Resolve, EnumDiscriminants,
+  Serialize, Deserialize, Debug, Clone, Resolve, EnumVariants,
 )]
-#[strum_discriminants(name(WriteRequestMethod), derive(Display))]
+#[variant_derive(Debug)]
 #[args(WriteArgs)]
 #[response(Response)]
-#[error(mogh_error::Error)]
+#[error(serror::Error)]
 #[serde(tag = "type", content = "params")]
 pub enum WriteRequest {
+  // ==== USER ====
+  CreateLocalUser(CreateLocalUser),
+  UpdateUserUsername(UpdateUserUsername),
+  UpdateUserPassword(UpdateUserPassword),
+  DeleteUser(DeleteUser),
+
+  // ==== SERVICE USER ====
+  CreateServiceUser(CreateServiceUser),
+  UpdateServiceUserDescription(UpdateServiceUserDescription),
+  CreateApiKeyForServiceUser(CreateApiKeyForServiceUser),
+  DeleteApiKeyForServiceUser(DeleteApiKeyForServiceUser),
+
+  // ==== USER GROUP ====
+  CreateUserGroup(CreateUserGroup),
+  RenameUserGroup(RenameUserGroup),
+  DeleteUserGroup(DeleteUserGroup),
+  AddUserToUserGroup(AddUserToUserGroup),
+  RemoveUserFromUserGroup(RemoveUserFromUserGroup),
+  SetUsersInUserGroup(SetUsersInUserGroup),
+  SetEveryoneUserGroup(SetEveryoneUserGroup),
+
+  // ==== PERMISSIONS ====
+  UpdateUserAdmin(UpdateUserAdmin),
+  UpdateUserBasePermissions(UpdateUserBasePermissions),
+  UpdatePermissionOnResourceType(UpdatePermissionOnResourceType),
+  UpdatePermissionOnTarget(UpdatePermissionOnTarget),
+
   // ==== RESOURCE ====
   UpdateResourceMeta(UpdateResourceMeta),
 
-  // ==== SWARM ====
-  CreateSwarm(CreateSwarm),
-  CopySwarm(CopySwarm),
-  DeleteSwarm(DeleteSwarm),
-  UpdateSwarm(UpdateSwarm),
-  RenameSwarm(RenameSwarm),
-
   // ==== SERVER ====
   CreateServer(CreateServer),
   CopyServer(CopyServer),
@@ -77,14 +89,11 @@ pub enum WriteRequest {
   UpdateServer(UpdateServer),
   RenameServer(RenameServer),
   CreateNetwork(CreateNetwork),
-  UpdateServerPublicKey(UpdateServerPublicKey),
-  RotateServerKeys(RotateServerKeys),
-
-  // ==== TERMINAL ====
   CreateTerminal(CreateTerminal),
   DeleteTerminal(DeleteTerminal),
   DeleteAllTerminals(DeleteAllTerminals),
-  BatchDeleteAllTerminals(BatchDeleteAllTerminals),
+  UpdateServerPublicKey(UpdateServerPublicKey),
+  RotateServerKeys(RotateServerKeys),
 
   // ==== STACK ====
   CreateStack(CreateStack),
@@ -94,8 +103,8 @@ pub enum WriteRequest {
   RenameStack(RenameStack),
   WriteStackFileContents(WriteStackFileContents),
   RefreshStackCache(RefreshStackCache),
-  CheckStackForUpdate(CheckStackForUpdate),
-  BatchCheckStackForUpdate(BatchCheckStackForUpdate),
+  CreateStackWebhook(CreateStackWebhook),
+  DeleteStackWebhook(DeleteStackWebhook),
 
   // ==== DEPLOYMENT ====
   CreateDeployment(CreateDeployment),
@@ -104,8 +113,6 @@ pub enum WriteRequest {
   DeleteDeployment(DeleteDeployment),
   UpdateDeployment(UpdateDeployment),
   RenameDeployment(RenameDeployment),
-  CheckDeploymentForUpdate(CheckDeploymentForUpdate),
-  BatchCheckDeploymentForUpdate(BatchCheckDeploymentForUpdate),
 
   // ==== BUILD ====
   CreateBuild(CreateBuild),
@@ -115,6 +122,15 @@ pub enum WriteRequest {
   RenameBuild(RenameBuild),
   WriteBuildFileContents(WriteBuildFileContents),
   RefreshBuildCache(RefreshBuildCache),
+  CreateBuildWebhook(CreateBuildWebhook),
+  DeleteBuildWebhook(DeleteBuildWebhook),
+
+  // ==== BUILDER ====
+  CreateBuilder(CreateBuilder),
+  CopyBuilder(CopyBuilder),
+  DeleteBuilder(DeleteBuilder),
+  UpdateBuilder(UpdateBuilder),
+  RenameBuilder(RenameBuilder),
 
   // ==== REPO ====
   CreateRepo(CreateRepo),
@@ -123,6 +139,15 @@ pub enum WriteRequest {
   UpdateRepo(UpdateRepo),
   RenameRepo(RenameRepo),
   RefreshRepoCache(RefreshRepoCache),
+  CreateRepoWebhook(CreateRepoWebhook),
+  DeleteRepoWebhook(DeleteRepoWebhook),
+
+  // ==== ALERTER ====
+  CreateAlerter(CreateAlerter),
+  CopyAlerter(CopyAlerter),
+  DeleteAlerter(DeleteAlerter),
+  UpdateAlerter(UpdateAlerter),
+  RenameAlerter(RenameAlerter),
 
   // ==== PROCEDURE ====
   CreateProcedure(CreateProcedure),
@@ -147,52 +172,8 @@ pub enum WriteRequest {
   WriteSyncFileContents(WriteSyncFileContents),
   CommitSync(CommitSync),
   RefreshResourceSyncPending(RefreshResourceSyncPending),
-
-  // ==== BUILDER ====
-  CreateBuilder(CreateBuilder),
-  CopyBuilder(CopyBuilder),
-  DeleteBuilder(DeleteBuilder),
-  UpdateBuilder(UpdateBuilder),
-  RenameBuilder(RenameBuilder),
-
-  // ==== ALERTER ====
-  CreateAlerter(CreateAlerter),
-  CopyAlerter(CopyAlerter),
-  DeleteAlerter(DeleteAlerter),
-  UpdateAlerter(UpdateAlerter),
-  RenameAlerter(RenameAlerter),
-
-  // ==== ONBOARDING KEY ====
-  CreateOnboardingKey(CreateOnboardingKey),
-  UpdateOnboardingKey(UpdateOnboardingKey),
-  DeleteOnboardingKey(DeleteOnboardingKey),
-
-  // ==== USER ====
-  PushRecentlyViewed(PushRecentlyViewed),
-  SetLastSeenUpdate(SetLastSeenUpdate),
-  CreateLocalUser(CreateLocalUser),
-  DeleteUser(DeleteUser),
-
-  // ==== SERVICE USER ====
-  CreateServiceUser(CreateServiceUser),
-  UpdateServiceUserDescription(UpdateServiceUserDescription),
-  CreateApiKeyForServiceUser(CreateApiKeyForServiceUser),
-  DeleteApiKeyForServiceUser(DeleteApiKeyForServiceUser),
-
-  // ==== USER GROUP ====
-  CreateUserGroup(CreateUserGroup),
-  RenameUserGroup(RenameUserGroup),
-  DeleteUserGroup(DeleteUserGroup),
-  AddUserToUserGroup(AddUserToUserGroup),
-  RemoveUserFromUserGroup(RemoveUserFromUserGroup),
-  SetUsersInUserGroup(SetUsersInUserGroup),
-  SetEveryoneUserGroup(SetEveryoneUserGroup),
-
-  // ==== PERMISSIONS ====
-  UpdateUserAdmin(UpdateUserAdmin),
-  UpdateUserBasePermissions(UpdateUserBasePermissions),
-  UpdatePermissionOnResourceType(UpdatePermissionOnResourceType),
-  UpdatePermissionOnTarget(UpdatePermissionOnTarget),
+  CreateSyncWebhook(CreateSyncWebhook),
+  DeleteSyncWebhook(DeleteSyncWebhook),
 
   // ==== TAG ====
   CreateTag(CreateTag),
@@ -211,31 +192,28 @@ pub enum WriteRequest {
   CreateGitProviderAccount(CreateGitProviderAccount),
   UpdateGitProviderAccount(UpdateGitProviderAccount),
   DeleteGitProviderAccount(DeleteGitProviderAccount),
-  #[serde(alias = "CreateDockerRegistryAccount")]
-  CreateImageRegistryAccount(CreateImageRegistryAccount),
-  #[serde(alias = "UpdateDockerRegistryAccount")]
-  UpdateImageRegistryAccount(UpdateImageRegistryAccount),
-  #[serde(alias = "DeleteDockerRegistryAccount")]
-  DeleteImageRegistryAccount(DeleteImageRegistryAccount),
+  CreateDockerRegistryAccount(CreateDockerRegistryAccount),
+  UpdateDockerRegistryAccount(UpdateDockerRegistryAccount),
+  DeleteDockerRegistryAccount(DeleteDockerRegistryAccount),
 
-  // ==== ALERT ====
-  CloseAlert(CloseAlert),
+  // ==== ONBOARDING KEY ====
+  CreateOnboardingKey(CreateOnboardingKey),
+  UpdateOnboardingKey(UpdateOnboardingKey),
+  DeleteOnboardingKey(DeleteOnboardingKey),
 }
 
 pub fn router() -> Router {
   Router::new()
     .route("/", post(handler))
     .route("/{variant}", post(variant_handler))
-    .layer(middleware::from_fn(
-      authenticate_request::<KomodoAuthImpl, true>,
-    ))
+    .layer(middleware::from_fn(auth_request))
 }
 
 async fn variant_handler(
   user: Extension<User>,
   Path(Variant { variant }): Path<Variant>,
   Json(params): Json<serde_json::Value>,
-) -> mogh_error::Result<axum::response::Response> {
+) -> serror::Result<axum::response::Response> {
   let req: WriteRequest = serde_json::from_value(json!({
     "type": variant,
     "params": params,
@@ -246,50 +224,41 @@ async fn variant_handler(
 async fn handler(
   Extension(user): Extension<User>,
   Json(request): Json<WriteRequest>,
-) -> mogh_error::Result<axum::response::Response> {
-  let res = tokio::spawn(task(request, user))
+) -> serror::Result<axum::response::Response> {
+  let req_id = Uuid::new_v4();
+
+  let res = tokio::spawn(task(req_id, request, user))
     .await
     .context("failure in spawned task");
 
   res?
 }
 
+#[instrument(
+  name = "WriteRequest",
+  skip(user, request),
+  fields(
+    user_id = user.id,
+    request = format!("{:?}", request.extract_variant())
+  )
+)]
 async fn task(
+  req_id: Uuid,
   request: WriteRequest,
   user: User,
-) -> mogh_error::Result<axum::response::Response> {
-  let task_id = Uuid::new_v4();
-  let method: WriteRequestMethod = (&request).into();
+) -> serror::Result<axum::response::Response> {
+  info!("/write request | user: {}", user.username);
 
-  let user_id = user.id.clone();
-  let username = user.username.clone();
-
-  if !matches!(
-    request,
-    WriteRequest::SetLastSeenUpdate(_)
-      | WriteRequest::PushRecentlyViewed(_)
-  ) {
-    info!(
-      task_id = task_id.to_string(),
-      method = method.to_string(),
-      user_id,
-      username,
-      "WRITE REQUEST",
-    );
-  }
+  let timer = Instant::now();
 
   let res = request.resolve(&WriteArgs { user }).await;
 
   if let Err(e) = &res {
-    warn!(
-      task_id = task_id.to_string(),
-      method = method.to_string(),
-      user_id,
-      username,
-      "WRITE REQUEST | ERROR: {:#}",
-      e.error
-    );
+    warn!("/write request {req_id} error: {:#}", e.error);
   }
 
+  let elapsed = timer.elapsed();
+  debug!("/write request {req_id} | resolve time: {elapsed:?}");
+
   res.map(|res| res.0)
 }

bin/core/src/api/write/onboarding_key.rs

@@ -6,80 +6,42 @@ use komodo_client::{
     DeleteOnboardingKey, DeleteOnboardingKeyResponse,
     UpdateOnboardingKey, UpdateOnboardingKeyResponse,
   },
-  entities::{
-    komodo_timestamp, onboarding_key::OnboardingKey, random_string,
-  },
+  entities::{komodo_timestamp, onboarding_key::OnboardingKey},
 };
-use mogh_error::{AddStatusCode, AddStatusCodeError};
-use mogh_pki::EncodedKeyPair;
-use mogh_resolver::Resolve;
+use noise::key::EncodedKeyPair;
 use reqwest::StatusCode;
+use resolver_api::Resolve;
+use serror::{AddStatusCode, AddStatusCodeError};
 
-use crate::{
-  api::write::WriteArgs, helpers::query::get_all_tags,
-  state::db_client,
-};
+use crate::{api::write::WriteArgs, state::db_client};
 
 //
 
 impl Resolve<WriteArgs> for CreateOnboardingKey {
-  #[instrument(
-    "CreateOnboardingKey",
-    skip_all,
-    fields(
-      operator = admin.id,
-      name = self.name,
-      expires = self.expires,
-      tags = format!("{:?}", self.tags),
-      copy_server = self.copy_server,
-      create_builder = self.create_builder,
-    )
-  )]
+  #[instrument(name = "CreateServerOnboardingKey", skip(self, admin))]
   async fn resolve(
     self,
     WriteArgs { user: admin }: &WriteArgs,
-  ) -> mogh_error::Result<CreateOnboardingKeyResponse> {
+  ) -> serror::Result<CreateOnboardingKeyResponse> {
     if !admin.admin {
       return Err(
         anyhow!("This call is admin only")
           .status_code(StatusCode::FORBIDDEN),
       );
     }
-    let private_key = if let Some(private_key) = self.private_key {
-      private_key
+    let keys = if let Some(private_key) = self.private_key {
+      EncodedKeyPair::from_private_key(&private_key)?
     } else {
-      format!("O_{}_O", random_string(28))
-    };
-    let public_key = EncodedKeyPair::from_private_key(
-      mogh_pki::PkiKind::Mutual,
-      &private_key,
-    )?
-    .public
-    .into_inner();
-    let tags = if self.tags.is_empty() {
-      self.tags
-    } else {
-      // fix_tags by ensuring existence, and force replace with tag name.
-      let all_tags = get_all_tags(None).await?;
-      self
-        .tags
-        .into_iter()
-        .filter_map(|tag| {
-          let tag =
-            all_tags.iter().find(|t| t.id == tag || t.name == tag)?;
-          Some(tag.name.clone())
-        })
-        .collect()
+      EncodedKeyPair::generate()?
     };
     let onboarding_key = OnboardingKey {
-      public_key,
+      public_key: keys.public.into_inner(),
       name: self.name,
       enabled: true,
       onboarded: Default::default(),
       created_at: komodo_timestamp(),
       expires: self.expires,
-      tags,
-      privileged: self.privileged,
+      tags: self.tags,
       copy_server: self.copy_server,
       create_builder: self.create_builder,
     };
@@ -100,7 +62,7 @@ impl Resolve<WriteArgs> for CreateOnboardingKey {
         "No Server onboarding key found on database after create",
       )?;
     Ok(CreateOnboardingKeyResponse {
-      private_key,
+      private_key: keys.private.into_inner(),
       created,
     })
   }
@@ -109,19 +71,10 @@ impl Resolve<WriteArgs> for CreateOnboardingKey {
 //
 
 impl Resolve<WriteArgs> for UpdateOnboardingKey {
-  #[instrument(
-    "UpdateOnboardingKey",
-    skip_all,
-    fields(
-      operator = admin.id,
-      public_key = self.public_key,
-      update = format!("{:?}", self),
-    )
-  )]
   async fn resolve(
     self,
     WriteArgs { user: admin }: &WriteArgs,
-  ) -> mogh_error::Result<UpdateOnboardingKeyResponse> {
+  ) -> serror::Result<UpdateOnboardingKeyResponse> {
     if !admin.admin {
       return Err(
         anyhow!("This call is admin only")
@@ -157,28 +110,9 @@ impl Resolve<WriteArgs> for UpdateOnboardingKey {
     }
 
     if let Some(tags) = self.tags {
-      let tags = if tags.is_empty() {
-        tags
-      } else {
-        // fix_tags by ensuring existence, and force replace with tag name.
-        let all_tags = get_all_tags(None).await?;
-        tags
-          .into_iter()
-          .filter_map(|tag| {
-            let tag = all_tags
-              .iter()
-              .find(|t| t.id == tag || t.name == tag)?;
-            Some(tag.name.clone())
-          })
-          .collect()
-      };
       update.insert("tags", tags);
     }
 
-    if let Some(privileged) = self.privileged {
-      update.insert("privileged", privileged);
-    }
-
     if let Some(copy_server) = self.copy_server {
       update.insert("copy_server", copy_server);
     }
@@ -206,18 +140,11 @@ impl Resolve<WriteArgs> for UpdateOnboardingKey {
 //
 
 impl Resolve<WriteArgs> for DeleteOnboardingKey {
-  #[instrument(
-    "DeleteOnboardingKey",
-    skip_all,
-    fields(
-      operator = admin.id,
-      public_key = self.public_key,
-    )
-  )]
+  #[instrument(name = "DeleteServerOnboardingKey", skip(admin))]
   async fn resolve(
     self,
     WriteArgs { user: admin }: &WriteArgs,
-  ) -> mogh_error::Result<DeleteOnboardingKeyResponse> {
+  ) -> serror::Result<DeleteOnboardingKeyResponse> {
     if !admin.admin {
       return Err(
         anyhow!("This call is admin only")

bin/core/src/api/write/permissions.rs

@@ -15,26 +15,18 @@ use komodo_client::{
     permission::{UserTarget, UserTargetVariant},
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{helpers::query::get_user, state::db_client};
 
 use super::WriteArgs;
 
 impl Resolve<WriteArgs> for UpdateUserAdmin {
-  #[instrument(
-    "UpdateUserAdmin",
-    skip_all,
-    fields(
-      operator = super_admin.id,
-      target_user = self.user_id,
-      admin = self.admin,
-    )
-  )]
+  #[instrument(name = "UpdateUserAdmin", skip(super_admin))]
   async fn resolve(
     self,
     WriteArgs { user: super_admin }: &WriteArgs,
-  ) -> mogh_error::Result<UpdateUserAdminResponse> {
+  ) -> serror::Result<UpdateUserAdminResponse> {
     if !super_admin.super_admin {
       return Err(
         anyhow!("Only super admins can call this method.").into(),
@@ -68,21 +60,11 @@ impl Resolve<WriteArgs> for UpdateUserAdmin {
 }
 
 impl Resolve<WriteArgs> for UpdateUserBasePermissions {
-  #[instrument(
-    "UpdateUserBasePermissions",
-    skip_all,
-    fields(
-      operator = admin.id,
-      target_user = self.user_id,
-      enabled = self.enabled,
-      create_servers = self.create_servers,
-      create_builds = self.create_builds,
-    )
-  )]
+  #[instrument(name = "UpdateUserBasePermissions", skip(admin))]
   async fn resolve(
     self,
     WriteArgs { user: admin }: &WriteArgs,
-  ) -> mogh_error::Result<UpdateUserBasePermissionsResponse> {
+  ) -> serror::Result<UpdateUserBasePermissionsResponse> {
     if !admin.admin {
       return Err(anyhow!("this method is admin only").into());
     }
@@ -135,20 +117,11 @@ impl Resolve<WriteArgs> for UpdateUserBasePermissions {
 }
 
 impl Resolve<WriteArgs> for UpdatePermissionOnResourceType {
-  #[instrument(
-    "UpdatePermissionOnResourceType",
-    skip_all,
-    fields(
-      operator = admin.id,
-      user_target = format!("{:?}", self.user_target),
-      resource_type = self.resource_type.to_string(),
-      permission = format!("{:?}", self.permission),
-    )
-  )]
+  #[instrument(name = "UpdatePermissionOnResourceType", skip(admin))]
   async fn resolve(
     self,
     WriteArgs { user: admin }: &WriteArgs,
-  ) -> mogh_error::Result<UpdatePermissionOnResourceTypeResponse> {
+  ) -> serror::Result<UpdatePermissionOnResourceTypeResponse> {
     if !admin.admin {
       return Err(anyhow!("this method is admin only").into());
     }
@@ -212,21 +185,11 @@ impl Resolve<WriteArgs> for UpdatePermissionOnResourceType {
 }
 
 impl Resolve<WriteArgs> for UpdatePermissionOnTarget {
-  #[instrument(
-    "UpdatePermissionOnTarget",
-    skip_all,
-    fields(
-      operator = admin.id,
-      user_target = format!("{:?}", self.user_target),
-      resource_type = self.resource_target.extract_variant().to_string(),
-      resource_id = self.resource_target.extract_variant_id().1,
-      permission = format!("{:?}", self.permission),
-    )
-  )]
+  #[instrument(name = "UpdatePermissionOnTarget", skip(admin))]
   async fn resolve(
     self,
     WriteArgs { user: admin }: &WriteArgs,
-  ) -> mogh_error::Result<UpdatePermissionOnTargetResponse> {
+  ) -> serror::Result<UpdatePermissionOnTargetResponse> {
     if !admin.admin {
       return Err(anyhow!("this method is admin only").into());
     }
@@ -295,7 +258,7 @@ impl Resolve<WriteArgs> for UpdatePermissionOnTarget {
 /// checks if inner id is actually a `name`, and replaces it with id if so.
 async fn extract_user_target_with_validation(
   user_target: &UserTarget,
-) -> mogh_error::Result<(UserTargetVariant, String)> {
+) -> serror::Result<(UserTargetVariant, String)> {
   match user_target {
     UserTarget::User(ident) => {
       let filter = match ObjectId::from_str(ident) {
@@ -306,8 +269,8 @@ async fn extract_user_target_with_validation(
         .users
         .find_one(filter)
         .await
-        .context("Failed to query db for users")?
-        .context("No matching user found")?
+        .context("failed to query db for users")?
+        .context("no matching user found")?
         .id;
       Ok((UserTargetVariant::User, id))
     }
@@ -320,8 +283,8 @@ async fn extract_user_target_with_validation(
         .user_groups
         .find_one(filter)
         .await
-        .context("Failed to query db for user_groups")?
-        .context("No matching user_group found")?
+        .context("failed to query db for user_groups")?
+        .context("no matching user_group found")?
         .id;
       Ok((UserTargetVariant::UserGroup, id))
     }
@@ -331,68 +294,12 @@ async fn extract_user_target_with_validation(
 /// checks if inner id is actually a `name`, and replaces it with id if so.
 async fn extract_resource_target_with_validation(
   resource_target: &ResourceTarget,
-) -> mogh_error::Result<(ResourceTargetVariant, String)> {
+) -> serror::Result<(ResourceTargetVariant, String)> {
   match resource_target {
     ResourceTarget::System(_) => {
       let res = resource_target.extract_variant_id();
       Ok((res.0, res.1.clone()))
     }
-    ResourceTarget::Swarm(ident) => {
-      let filter = match ObjectId::from_str(ident) {
-        Ok(id) => doc! { "_id": id },
-        Err(_) => doc! { "name": ident },
-      };
-      let id = db_client()
-        .swarms
-        .find_one(filter)
-        .await
-        .context("Failed to query db for swarms")?
-        .context("No matching swarm found")?
-        .id;
-      Ok((ResourceTargetVariant::Swarm, id))
-    }
-    ResourceTarget::Server(ident) => {
-      let filter = match ObjectId::from_str(ident) {
-        Ok(id) => doc! { "_id": id },
-        Err(_) => doc! { "name": ident },
-      };
-      let id = db_client()
-        .servers
-        .find_one(filter)
-        .await
-        .context("Failed to query db for servers")?
-        .context("No matching server found")?
-        .id;
-      Ok((ResourceTargetVariant::Server, id))
-    }
-    ResourceTarget::Stack(ident) => {
-      let filter = match ObjectId::from_str(ident) {
-        Ok(id) => doc! { "_id": id },
-        Err(_) => doc! { "name": ident },
-      };
-      let id = db_client()
-        .stacks
-        .find_one(filter)
-        .await
-        .context("Failed to query db for stacks")?
-        .context("No matching stack found")?
-        .id;
-      Ok((ResourceTargetVariant::Stack, id))
-    }
-    ResourceTarget::Deployment(ident) => {
-      let filter = match ObjectId::from_str(ident) {
-        Ok(id) => doc! { "_id": id },
-        Err(_) => doc! { "name": ident },
-      };
-      let id = db_client()
-        .deployments
-        .find_one(filter)
-        .await
-        .context("Failed to query db for deployments")?
-        .context("No matching deployment found")?
-        .id;
-      Ok((ResourceTargetVariant::Deployment, id))
-    }
     ResourceTarget::Build(ident) => {
       let filter = match ObjectId::from_str(ident) {
         Ok(id) => doc! { "_id": id },
@@ -402,11 +309,53 @@ async fn extract_resource_target_with_validation(
         .builds
         .find_one(filter)
         .await
-        .context("Failed to query db for builds")?
-        .context("No matching build found")?
+        .context("failed to query db for builds")?
+        .context("no matching build found")?
         .id;
       Ok((ResourceTargetVariant::Build, id))
     }
+    ResourceTarget::Builder(ident) => {
+      let filter = match ObjectId::from_str(ident) {
+        Ok(id) => doc! { "_id": id },
+        Err(_) => doc! { "name": ident },
+      };
+      let id = db_client()
+        .builders
+        .find_one(filter)
+        .await
+        .context("failed to query db for builders")?
+        .context("no matching builder found")?
+        .id;
+      Ok((ResourceTargetVariant::Builder, id))
+    }
+    ResourceTarget::Deployment(ident) => {
+      let filter = match ObjectId::from_str(ident) {
+        Ok(id) => doc! { "_id": id },
+        Err(_) => doc! { "name": ident },
+      };
+      let id = db_client()
+        .deployments
+        .find_one(filter)
+        .await
+        .context("failed to query db for deployments")?
+        .context("no matching deployment found")?
+        .id;
+      Ok((ResourceTargetVariant::Deployment, id))
+    }
+    ResourceTarget::Server(ident) => {
+      let filter = match ObjectId::from_str(ident) {
+        Ok(id) => doc! { "_id": id },
+        Err(_) => doc! { "name": ident },
+      };
+      let id = db_client()
+        .servers
+        .find_one(filter)
+        .await
+        .context("failed to query db for servers")?
+        .context("no matching server found")?
+        .id;
+      Ok((ResourceTargetVariant::Server, id))
+    }
     ResourceTarget::Repo(ident) => {
       let filter = match ObjectId::from_str(ident) {
         Ok(id) => doc! { "_id": id },
@@ -416,11 +365,25 @@ async fn extract_resource_target_with_validation(
         .repos
         .find_one(filter)
         .await
-        .context("Failed to query db for repos")?
-        .context("No matching repo found")?
+        .context("failed to query db for repos")?
+        .context("no matching repo found")?
         .id;
       Ok((ResourceTargetVariant::Repo, id))
     }
+    ResourceTarget::Alerter(ident) => {
+      let filter = match ObjectId::from_str(ident) {
+        Ok(id) => doc! { "_id": id },
+        Err(_) => doc! { "name": ident },
+      };
+      let id = db_client()
+        .alerters
+        .find_one(filter)
+        .await
+        .context("failed to query db for alerters")?
+        .context("no matching alerter found")?
+        .id;
+      Ok((ResourceTargetVariant::Alerter, id))
+    }
     ResourceTarget::Procedure(ident) => {
       let filter = match ObjectId::from_str(ident) {
         Ok(id) => doc! { "_id": id },
@@ -430,8 +393,8 @@ async fn extract_resource_target_with_validation(
         .procedures
         .find_one(filter)
         .await
-        .context("Failed to query db for procedures")?
-        .context("No matching procedure found")?
+        .context("failed to query db for procedures")?
+        .context("no matching procedure found")?
         .id;
       Ok((ResourceTargetVariant::Procedure, id))
     }
@@ -444,8 +407,8 @@ async fn extract_resource_target_with_validation(
         .actions
         .find_one(filter)
         .await
-        .context("Failed to query db for actions")?
-        .context("No matching action found")?
+        .context("failed to query db for actions")?
+        .context("no matching action found")?
         .id;
       Ok((ResourceTargetVariant::Action, id))
     }
@@ -458,38 +421,24 @@ async fn extract_resource_target_with_validation(
         .resource_syncs
         .find_one(filter)
         .await
-        .context("Failed to query db for resource syncs")?
-        .context("No matching resource sync found")?
+        .context("failed to query db for resource syncs")?
+        .context("no matching resource sync found")?
         .id;
       Ok((ResourceTargetVariant::ResourceSync, id))
     }
-    ResourceTarget::Builder(ident) => {
+    ResourceTarget::Stack(ident) => {
       let filter = match ObjectId::from_str(ident) {
         Ok(id) => doc! { "_id": id },
         Err(_) => doc! { "name": ident },
       };
       let id = db_client()
-        .builders
+        .stacks
         .find_one(filter)
         .await
-        .context("Failed to query db for builders")?
-        .context("No matching builder found")?
+        .context("failed to query db for stacks")?
+        .context("no matching stack found")?
         .id;
-      Ok((ResourceTargetVariant::Builder, id))
-    }
-    ResourceTarget::Alerter(ident) => {
-      let filter = match ObjectId::from_str(ident) {
-        Ok(id) => doc! { "_id": id },
-        Err(_) => doc! { "name": ident },
-      };
-      let id = db_client()
-        .alerters
-        .find_one(filter)
-        .await
-        .context("Failed to query db for alerters")?
-        .context("No matching alerter found")?
-        .id;
-      Ok((ResourceTargetVariant::Alerter, id))
+      Ok((ResourceTargetVariant::Stack, id))
     }
   }
 }

bin/core/src/api/write/procedure.rs

@@ -4,45 +4,29 @@ use komodo_client::{
     permission::PermissionLevel, procedure::Procedure, update::Update,
   },
 };
-use mogh_resolver::Resolve;
+use resolver_api::Resolve;
 
 use crate::{permission::get_check_permissions, resource};
 
 use super::WriteArgs;
 
 impl Resolve<WriteArgs> for CreateProcedure {
-  #[instrument(
-    "CreateProcedure",
-    skip_all,
-    fields(
-      operator = user.id,
-      procedure = self.name,
-      config = serde_json::to_string(&self.config).unwrap()
-    )
-  )]
+  #[instrument(name = "CreateProcedure", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<CreateProcedureResponse> {
+  ) -> serror::Result<CreateProcedureResponse> {
     resource::create::<Procedure>(&self.name, self.config, None, user)
       .await
   }
 }
 
 impl Resolve<WriteArgs> for CopyProcedure {
-  #[instrument(
-    "CopyProcedure",
-    skip_all,
-    fields(
-      operator = user.id,
-      procedure = self.name,
-      copy_procedure = self.id,
-    )
-  )]
+  #[instrument(name = "CopyProcedure", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<CopyProcedureResponse> {
+  ) -> serror::Result<CopyProcedureResponse> {
     let Procedure { config, .. } =
       get_check_permissions::<Procedure>(
         &self.id,
@@ -61,19 +45,11 @@ impl Resolve<WriteArgs> for CopyProcedure {
 }
 
 impl Resolve<WriteArgs> for UpdateProcedure {
-  #[instrument(
-    "UpdateProcedure",
-    skip_all,
-    fields(
-      operator = user.id,
-      procedure = self.id,
-      update = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
+  #[instrument(name = "UpdateProcedure", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<UpdateProcedureResponse> {
+  ) -> serror::Result<UpdateProcedureResponse> {
     Ok(
       resource::update::<Procedure>(&self.id, self.config, user)
         .await?,
@@ -82,19 +58,11 @@ impl Resolve<WriteArgs> for UpdateProcedure {
 }
 
 impl Resolve<WriteArgs> for RenameProcedure {
-  #[instrument(
-    "RenameProcedure",
-    skip_all,
-    fields(
-      operator = user.id,
-      procedure = self.id,
-      new_name = self.name,
-    )
-  )]
+  #[instrument(name = "RenameProcedure", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Update> {
+  ) -> serror::Result<Update> {
     Ok(
       resource::rename::<Procedure>(&self.id, &self.name, user)
         .await?,
@@ -103,18 +71,11 @@ impl Resolve<WriteArgs> for RenameProcedure {
 }
 
 impl Resolve<WriteArgs> for DeleteProcedure {
-  #[instrument(
-    "DeleteProcedure",
-    skip_all,
-    fields(
-      operator = user.id,
-      procedure = self.id
-    )
-  )]
+  #[instrument(name = "DeleteProcedure", skip(args))]
   async fn resolve(
     self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<DeleteProcedureResponse> {
-    Ok(resource::delete::<Procedure>(&self.id, user).await?)
+    args: &WriteArgs,
+  ) -> serror::Result<DeleteProcedureResponse> {
+    Ok(resource::delete::<Procedure>(&self.id, args).await?)
   }
 }

bin/core/src/api/write/provider.rs

@@ -7,12 +7,10 @@ use komodo_client::{
   api::write::*,
   entities::{
     Operation, ResourceTarget,
-    provider::{GitProviderAccount, ImageRegistryAccount},
+    provider::{DockerRegistryAccount, GitProviderAccount},
   },
 };
-use mogh_error::AddStatusCodeError;
-use mogh_resolver::Resolve;
-use reqwest::StatusCode;
+use resolver_api::Resolve;
 
 use crate::{
   helpers::update::{add_update, make_update},
@@ -22,41 +20,25 @@ use crate::{
 use super::WriteArgs;
 
 impl Resolve<WriteArgs> for CreateGitProviderAccount {
-  #[instrument(
-    "CreateGitProviderAccount",
-    skip_all,
-    fields(
-      operator = user.id,
-      domain = self.account.domain,
-      username = self.account.username,
-      https = self.account.https.unwrap_or(true),
-    )
-  )]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<CreateGitProviderAccountResponse> {
+  ) -> serror::Result<CreateGitProviderAccountResponse> {
     if !user.admin {
       return Err(
-        anyhow!("Only admins can create git provider accounts")
-          .status_code(StatusCode::FORBIDDEN),
+        anyhow!("only admins can create git provider accounts")
+          .into(),
       );
     }
 
     let mut account: GitProviderAccount = self.account.into();
 
     if account.domain.is_empty() {
-      return Err(
-        anyhow!("Domain cannot be empty string.")
-          .status_code(StatusCode::BAD_REQUEST),
-      );
+      return Err(anyhow!("domain cannot be empty string.").into());
     }
 
     if account.username.is_empty() {
-      return Err(
-        anyhow!("Username cannot be empty string.")
-          .status_code(StatusCode::BAD_REQUEST),
-      );
+      return Err(anyhow!("username cannot be empty string.").into());
     }
 
     let mut update = make_update(
@@ -69,14 +51,14 @@ impl Resolve<WriteArgs> for CreateGitProviderAccount {
       .git_accounts
       .insert_one(&account)
       .await
-      .context("Failed to create git provider account on db")?
+      .context("failed to create git provider account on db")?
       .inserted_id
       .as_object_id()
-      .context("Inserted id is not ObjectId")?
+      .context("inserted id is not ObjectId")?
       .to_string();
 
     update.push_simple_log(
-      "Create git provider account",
+      "create git provider account",
       format!(
         "Created git provider account for {} with username {}",
         account.domain, account.username
@@ -88,7 +70,7 @@ impl Resolve<WriteArgs> for CreateGitProviderAccount {
     add_update(update)
       .await
       .inspect_err(|e| {
-        error!("Failed to add update for create git provider account | {e:#}")
+        error!("failed to add update for create git provider account | {e:#}")
       })
       .ok();
 
@@ -97,25 +79,14 @@ impl Resolve<WriteArgs> for CreateGitProviderAccount {
 }
 
 impl Resolve<WriteArgs> for UpdateGitProviderAccount {
-  #[instrument(
-    "UpdateGitProviderAccount",
-    skip_all,
-    fields(
-      operator = user.id,
-      id = self.id,
-      domain = self.account.domain,
-      username = self.account.username,
-      https = self.account.https.unwrap_or(true),
-    )
-  )]
   async fn resolve(
     mut self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<UpdateGitProviderAccountResponse> {
+  ) -> serror::Result<UpdateGitProviderAccountResponse> {
     if !user.admin {
       return Err(
-        anyhow!("Only admins can update git provider accounts")
-          .status_code(StatusCode::FORBIDDEN),
+        anyhow!("only admins can update git provider accounts")
+          .into(),
       );
     }
 
@@ -123,8 +94,8 @@ impl Resolve<WriteArgs> for UpdateGitProviderAccount {
       && domain.is_empty()
     {
       return Err(
-        anyhow!("Cannot update git provider with empty domain")
-          .status_code(StatusCode::BAD_REQUEST),
+        anyhow!("cannot update git provider with empty domain")
+          .into(),
       );
     }
 
@@ -132,8 +103,8 @@ impl Resolve<WriteArgs> for UpdateGitProviderAccount {
       && username.is_empty()
     {
       return Err(
-        anyhow!("Cannot update git provider with empty username")
-          .status_code(StatusCode::BAD_REQUEST),
+        anyhow!("cannot update git provider with empty username")
+          .into(),
       );
     }
 
@@ -147,7 +118,7 @@ impl Resolve<WriteArgs> for UpdateGitProviderAccount {
     );
 
     let account = to_document(&self.account).context(
-      "Failed to serialize partial git provider account to bson",
+      "failed to serialize partial git provider account to bson",
     )?;
     let db = db_client();
     update_one_by_id(
@@ -157,17 +128,17 @@ impl Resolve<WriteArgs> for UpdateGitProviderAccount {
       None,
     )
     .await
-    .context("Failed to update git provider account on db")?;
+    .context("failed to update git provider account on db")?;
 
     let Some(account) = find_one_by_id(&db.git_accounts, &self.id)
       .await
-      .context("Failed to query db for git accounts")?
+      .context("failed to query db for git accounts")?
     else {
-      return Err(anyhow!("No account found with given id").into());
+      return Err(anyhow!("no account found with given id").into());
     };
 
     update.push_simple_log(
-      "Update git provider account",
+      "update git provider account",
       format!(
         "Updated git provider account for {} with username {}",
         account.domain, account.username
@@ -179,7 +150,7 @@ impl Resolve<WriteArgs> for UpdateGitProviderAccount {
     add_update(update)
       .await
       .inspect_err(|e| {
-        error!("Failed to add update for update git provider account | {e:#}")
+        error!("failed to add update for update git provider account | {e:#}")
       })
       .ok();
 
@@ -188,22 +159,14 @@ impl Resolve<WriteArgs> for UpdateGitProviderAccount {
 }
 
 impl Resolve<WriteArgs> for DeleteGitProviderAccount {
-  #[instrument(
-    "DeleteGitProviderAccount",
-    skip_all,
-    fields(
-      operator = user.id,
-      id = self.id,
-    )
-  )]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<DeleteGitProviderAccountResponse> {
+  ) -> serror::Result<DeleteGitProviderAccountResponse> {
     if !user.admin {
       return Err(
-        anyhow!("Only admins can delete git provider accounts")
-          .status_code(StatusCode::FORBIDDEN),
+        anyhow!("only admins can delete git provider accounts")
+          .into(),
       );
     }
 
@@ -216,19 +179,16 @@ impl Resolve<WriteArgs> for DeleteGitProviderAccount {
     let db = db_client();
     let Some(account) = find_one_by_id(&db.git_accounts, &self.id)
       .await
-      .context("Failed to query db for git accounts")?
+      .context("failed to query db for git accounts")?
     else {
-      return Err(
-        anyhow!("No account found with given id")
-          .status_code(StatusCode::BAD_REQUEST),
-      );
+      return Err(anyhow!("no account found with given id").into());
     };
     delete_one_by_id(&db.git_accounts, &self.id, None)
       .await
       .context("failed to delete git account on db")?;
 
     update.push_simple_log(
-      "Delete git provider account",
+      "delete git provider account",
       format!(
         "Deleted git provider account for {} with username {}",
         account.domain, account.username
@@ -240,7 +200,7 @@ impl Resolve<WriteArgs> for DeleteGitProviderAccount {
     add_update(update)
       .await
       .inspect_err(|e| {
-        error!("Failed to add update for delete git provider account | {e:#}")
+        error!("failed to add update for delete git provider account | {e:#}")
       })
       .ok();
 
@@ -248,43 +208,28 @@ impl Resolve<WriteArgs> for DeleteGitProviderAccount {
   }
 }
 
-impl Resolve<WriteArgs> for CreateImageRegistryAccount {
-  #[instrument(
-    "CreateDockerRegistryAccount",
-    skip_all,
-    fields(
-      operator = user.id,
-      domain = self.account.domain,
-      username = self.account.username,
-    )
-  )]
+impl Resolve<WriteArgs> for CreateDockerRegistryAccount {
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<CreateImageRegistryAccountResponse> {
+  ) -> serror::Result<CreateDockerRegistryAccountResponse> {
     if !user.admin {
       return Err(
         anyhow!(
-          "Only admins can create docker registry account accounts"
+          "only admins can create docker registry account accounts"
         )
-        .status_code(StatusCode::FORBIDDEN),
+        .into(),
       );
     }
 
-    let mut account: ImageRegistryAccount = self.account.into();
+    let mut account: DockerRegistryAccount = self.account.into();
 
     if account.domain.is_empty() {
-      return Err(
-        anyhow!("Domain cannot be empty string.")
-          .status_code(StatusCode::BAD_REQUEST),
-      );
+      return Err(anyhow!("domain cannot be empty string.").into());
     }
 
     if account.username.is_empty() {
-      return Err(
-        anyhow!("Username cannot be empty string.")
-          .status_code(StatusCode::BAD_REQUEST),
-      );
+      return Err(anyhow!("username cannot be empty string.").into());
     }
 
     let mut update = make_update(
@@ -298,15 +243,15 @@ impl Resolve<WriteArgs> for CreateImageRegistryAccount {
       .insert_one(&account)
       .await
       .context(
-        "Failed to create docker registry account account on db",
+        "failed to create docker registry account account on db",
       )?
       .inserted_id
       .as_object_id()
-      .context("Inserted id is not ObjectId")?
+      .context("inserted id is not ObjectId")?
       .to_string();
 
     update.push_simple_log(
-      "Create docker registry account",
+      "create docker registry account",
       format!(
         "Created docker registry account account for {} with username {}",
         account.domain, account.username
@@ -318,7 +263,7 @@ impl Resolve<WriteArgs> for CreateImageRegistryAccount {
     add_update(update)
       .await
       .inspect_err(|e| {
-        error!("Failed to add update for create docker registry account | {e:#}")
+        error!("failed to add update for create docker registry account | {e:#}")
       })
       .ok();
 
@@ -326,25 +271,15 @@ impl Resolve<WriteArgs> for CreateImageRegistryAccount {
   }
 }
 
-impl Resolve<WriteArgs> for UpdateImageRegistryAccount {
-  #[instrument(
-    "UpdateDockerRegistryAccount",
-    skip_all,
-    fields(
-      operator = user.id,
-      id = self.id,
-      domain = self.account.domain,
-      username = self.account.username,
-    )
-  )]
+impl Resolve<WriteArgs> for UpdateDockerRegistryAccount {
   async fn resolve(
     mut self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<UpdateImageRegistryAccountResponse> {
+  ) -> serror::Result<UpdateDockerRegistryAccountResponse> {
     if !user.admin {
       return Err(
-        anyhow!("Only admins can update docker registry accounts")
-          .status_code(StatusCode::FORBIDDEN),
+        anyhow!("only admins can update docker registry accounts")
+          .into(),
       );
     }
 
@@ -353,9 +288,9 @@ impl Resolve<WriteArgs> for UpdateImageRegistryAccount {
     {
       return Err(
         anyhow!(
-          "Cannot update docker registry account with empty domain"
+          "cannot update docker registry account with empty domain"
         )
-        .status_code(StatusCode::BAD_REQUEST),
+        .into(),
       );
     }
 
@@ -364,9 +299,9 @@ impl Resolve<WriteArgs> for UpdateImageRegistryAccount {
     {
       return Err(
         anyhow!(
-          "Cannot update docker registry account with empty username"
+          "cannot update docker registry account with empty username"
         )
-        .status_code(StatusCode::BAD_REQUEST),
+        .into(),
       );
     }
 
@@ -379,7 +314,7 @@ impl Resolve<WriteArgs> for UpdateImageRegistryAccount {
     );
 
     let account = to_document(&self.account).context(
-      "Failed to serialize partial docker registry account account to bson",
+      "failed to serialize partial docker registry account account to bson",
     )?;
 
     let db = db_client();
@@ -391,19 +326,19 @@ impl Resolve<WriteArgs> for UpdateImageRegistryAccount {
     )
     .await
     .context(
-      "Failed to update docker registry account account on db",
+      "failed to update docker registry account account on db",
     )?;
 
     let Some(account) =
       find_one_by_id(&db.registry_accounts, &self.id)
         .await
-        .context("Failed to query db for registry accounts")?
+        .context("failed to query db for registry accounts")?
     else {
-      return Err(anyhow!("No account found with given id").into());
+      return Err(anyhow!("no account found with given id").into());
     };
 
     update.push_simple_log(
-      "Update docker registry account",
+      "update docker registry account",
       format!(
         "Updated docker registry account account for {} with username {}",
         account.domain, account.username
@@ -415,7 +350,7 @@ impl Resolve<WriteArgs> for UpdateImageRegistryAccount {
     add_update(update)
       .await
       .inspect_err(|e| {
-        error!("Failed to add update for update docker registry account | {e:#}")
+        error!("failed to add update for update docker registry account | {e:#}")
       })
       .ok();
 
@@ -423,23 +358,15 @@ impl Resolve<WriteArgs> for UpdateImageRegistryAccount {
   }
 }
 
-impl Resolve<WriteArgs> for DeleteImageRegistryAccount {
-  #[instrument(
-    "DeleteDockerRegistryAccount",
-    skip_all,
-    fields(
-      operator = user.id,
-      id = self.id,
-    )
-  )]
+impl Resolve<WriteArgs> for DeleteDockerRegistryAccount {
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<DeleteImageRegistryAccountResponse> {
+  ) -> serror::Result<DeleteDockerRegistryAccountResponse> {
     if !user.admin {
       return Err(
-        anyhow!("Only admins can delete docker registry accounts")
-          .status_code(StatusCode::FORBIDDEN),
+        anyhow!("only admins can delete docker registry accounts")
+          .into(),
       );
     }
 
@@ -453,19 +380,16 @@ impl Resolve<WriteArgs> for DeleteImageRegistryAccount {
     let Some(account) =
       find_one_by_id(&db.registry_accounts, &self.id)
         .await
-        .context("Failed to query db for git accounts")?
+        .context("failed to query db for git accounts")?
     else {
-      return Err(
-        anyhow!("No account found with given id")
-          .status_code(StatusCode::BAD_REQUEST),
-      );
+      return Err(anyhow!("no account found with given id").into());
     };
     delete_one_by_id(&db.registry_accounts, &self.id, None)
       .await
-      .context("Failed to delete registry account on db")?;
+      .context("failed to delete registry account on db")?;
 
     update.push_simple_log(
-      "Delete registry account",
+      "delete registry account",
       format!(
         "Deleted registry account for {} with username {}",
         account.domain, account.username
@@ -477,7 +401,7 @@ impl Resolve<WriteArgs> for DeleteImageRegistryAccount {
     add_update(update)
       .await
       .inspect_err(|e| {
-        error!("Failed to add update for delete docker registry account | {e:#}")
+        error!("failed to add update for delete docker registry account | {e:#}")
       })
       .ok();
 

bin/core/src/api/write/repo.rs

@@ -1,4 +1,4 @@
-use anyhow::Context;
+use anyhow::{Context, anyhow};
 use database::mongo_indexed::doc;
 use database::mungos::{
   by_id::update_one_by_id, mongodb::bson::to_document,
@@ -7,16 +7,21 @@ use formatting::format_serror;
 use komodo_client::{
   api::write::*,
   entities::{
-    NoData, Operation, RepoExecutionArgs, komodo_timestamp,
+    NoData, Operation, RepoExecutionArgs,
+    config::core::CoreConfig,
+    komodo_timestamp,
     permission::PermissionLevel,
-    repo::{Repo, RepoInfo},
+    repo::{PartialRepoConfig, Repo, RepoInfo},
     server::Server,
     to_path_compatible_name,
     update::{Log, Update},
   },
 };
-use mogh_resolver::Resolve;
+use octorust::types::{
+  ReposCreateWebhookRequest, ReposCreateWebhookRequestConfig,
+};
 use periphery_client::api;
+use resolver_api::Resolve;
 
 use crate::{
   config::core_config,
@@ -26,44 +31,28 @@ use crate::{
   },
   permission::get_check_permissions,
   resource,
-  state::{action_states, db_client},
+  state::{action_states, db_client, github_client},
 };
 
 use super::WriteArgs;
 
 impl Resolve<WriteArgs> for CreateRepo {
-  #[instrument(
-    "CreateRepo",
-    skip_all,
-    fields(
-      operator = user.id,
-      repo = self.name,
-      config = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
+  #[instrument(name = "CreateRepo", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Repo> {
+  ) -> serror::Result<Repo> {
     resource::create::<Repo>(&self.name, self.config, None, user)
       .await
   }
 }
 
 impl Resolve<WriteArgs> for CopyRepo {
-  #[instrument(
-    "CopyRepo",
-    skip_all,
-    fields(
-      operator = user.id,
-      repo = self.name,
-      copy_repo = self.id,
-    )
-  )]
+  #[instrument(name = "CopyRepo", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Repo> {
+  ) -> serror::Result<Repo> {
     let Repo { config, .. } = get_check_permissions::<Repo>(
       &self.id,
       user,
@@ -76,54 +65,28 @@ impl Resolve<WriteArgs> for CopyRepo {
 }
 
 impl Resolve<WriteArgs> for DeleteRepo {
-  #[instrument(
-    "DeleteRepo",
-    skip_all,
-    fields(
-      operator = user.id,
-      repo = self.id,
-    )
-  )]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Repo> {
-    Ok(resource::delete::<Repo>(&self.id, user).await?)
+  #[instrument(name = "DeleteRepo", skip(args))]
+  async fn resolve(self, args: &WriteArgs) -> serror::Result<Repo> {
+    Ok(resource::delete::<Repo>(&self.id, args).await?)
   }
 }
 
 impl Resolve<WriteArgs> for UpdateRepo {
-  #[instrument(
-    "UpdateRepo",
-    skip_all,
-    fields(
-      operator = user.id,
-      repo = self.id,
-      update = serde_json::to_string(&self.config).unwrap()
-    )
-  )]
+  #[instrument(name = "UpdateRepo", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Repo> {
+  ) -> serror::Result<Repo> {
     Ok(resource::update::<Repo>(&self.id, self.config, user).await?)
   }
 }
 
 impl Resolve<WriteArgs> for RenameRepo {
-  #[instrument(
-    "RenameRepo",
-    skip_all,
-    fields(
-      operator = user.id,
-      repo = self.id,
-      new_name = self.name
-    )
-  )]
+  #[instrument(name = "RenameRepo", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Update> {
+  ) -> serror::Result<Update> {
     let repo = get_check_permissions::<Repo>(
       &self.id,
       user,
@@ -196,10 +159,15 @@ impl Resolve<WriteArgs> for RenameRepo {
 }
 
 impl Resolve<WriteArgs> for RefreshRepoCache {
+  #[instrument(
+    name = "RefreshRepoCache",
+    level = "debug",
+    skip(user)
+  )]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<NoData> {
+  ) -> serror::Result<NoData> {
     // Even though this is a write request, this doesn't change any config. Anyone that can execute the
     // repo should be able to do this.
     let repo = get_check_permissions::<Repo>(
@@ -267,3 +235,220 @@ impl Resolve<WriteArgs> for RefreshRepoCache {
     Ok(NoData {})
   }
 }
+
+impl Resolve<WriteArgs> for CreateRepoWebhook {
+  #[instrument(name = "CreateRepoWebhook", skip(args))]
+  async fn resolve(
+    self,
+    args: &WriteArgs,
+  ) -> serror::Result<CreateRepoWebhookResponse> {
+    let Some(github) = github_client() else {
+      return Err(
+        anyhow!(
+          "github_webhook_app is not configured in core config toml"
+        )
+        .into(),
+      );
+    };
+
+    let repo = get_check_permissions::<Repo>(
+      &self.repo,
+      &args.user,
+      PermissionLevel::Write.into(),
+    )
+    .await?;
+
+    if repo.config.repo.is_empty() {
+      return Err(
+        anyhow!("No repo configured, can't create webhook").into(),
+      );
+    }
+
+    let mut split = repo.config.repo.split('/');
+    let owner = split.next().context("Repo repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Err(
+        anyhow!("Cannot manage repo webhooks under owner {owner}")
+          .into(),
+      );
+    };
+
+    let repo_name =
+      split.next().context("Repo repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    // First make sure the webhook isn't already created (inactive ones are ignored)
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo_name)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      webhook_secret,
+      ..
+    } = core_config();
+
+    let webhook_secret = if repo.config.webhook_secret.is_empty() {
+      webhook_secret
+    } else {
+      &repo.config.webhook_secret
+    };
+
+    let host = if webhook_base_url.is_empty() {
+      host
+    } else {
+      webhook_base_url
+    };
+    let url = match self.action {
+      RepoWebhookAction::Clone => {
+        format!("{host}/listener/github/repo/{}/clone", repo.id)
+      }
+      RepoWebhookAction::Pull => {
+        format!("{host}/listener/github/repo/{}/pull", repo.id)
+      }
+      RepoWebhookAction::Build => {
+        format!("{host}/listener/github/repo/{}/build", repo.id)
+      }
+    };
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == url {
+        return Ok(NoData {});
+      }
+    }
+
+    // Now good to create the webhook
+    let request = ReposCreateWebhookRequest {
+      active: Some(true),
+      config: Some(ReposCreateWebhookRequestConfig {
+        url,
+        secret: webhook_secret.to_string(),
+        content_type: String::from("json"),
+        insecure_ssl: None,
+        digest: Default::default(),
+        token: Default::default(),
+      }),
+      events: vec![String::from("push")],
+      name: String::from("web"),
+    };
+    github_repos
+      .create_webhook(owner, repo_name, &request)
+      .await
+      .context("failed to create webhook")?;
+
+    if !repo.config.webhook_enabled {
+      UpdateRepo {
+        id: repo.id,
+        config: PartialRepoConfig {
+          webhook_enabled: Some(true),
+          ..Default::default()
+        },
+      }
+      .resolve(args)
+      .await
+      .map_err(|e| e.error)
+      .context("failed to update repo to enable webhook")?;
+    }
+
+    Ok(NoData {})
+  }
+}
+
+impl Resolve<WriteArgs> for DeleteRepoWebhook {
+  #[instrument(name = "DeleteRepoWebhook", skip(user))]
+  async fn resolve(
+    self,
+    WriteArgs { user }: &WriteArgs,
+  ) -> serror::Result<DeleteRepoWebhookResponse> {
+    let Some(github) = github_client() else {
+      return Err(
+        anyhow!(
+          "github_webhook_app is not configured in core config toml"
+        )
+        .into(),
+      );
+    };
+
+    let repo = get_check_permissions::<Repo>(
+      &self.repo,
+      user,
+      PermissionLevel::Write.into(),
+    )
+    .await?;
+
+    if repo.config.git_provider != "github.com" {
+      return Err(
+        anyhow!("Can only manage github.com repo webhooks").into(),
+      );
+    }
+
+    if repo.config.repo.is_empty() {
+      return Err(
+        anyhow!("No repo configured, can't create webhook").into(),
+      );
+    }
+
+    let mut split = repo.config.repo.split('/');
+    let owner = split.next().context("Repo repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Err(
+        anyhow!("Cannot manage repo webhooks under owner {owner}")
+          .into(),
+      );
+    };
+
+    let repo_name =
+      split.next().context("Repo repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    // First make sure the webhook isn't already created (inactive ones are ignored)
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo_name)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      ..
+    } = core_config();
+
+    let host = if webhook_base_url.is_empty() {
+      host
+    } else {
+      webhook_base_url
+    };
+    let url = match self.action {
+      RepoWebhookAction::Clone => {
+        format!("{host}/listener/github/repo/{}/clone", repo.id)
+      }
+      RepoWebhookAction::Pull => {
+        format!("{host}/listener/github/repo/{}/pull", repo.id)
+      }
+      RepoWebhookAction::Build => {
+        format!("{host}/listener/github/repo/{}/build", repo.id)
+      }
+    };
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == url {
+        github_repos
+          .delete_webhook(owner, repo_name, webhook.id)
+          .await
+          .context("failed to delete webhook")?;
+        return Ok(NoData {});
+      }
+    }
+
+    // No webhook to delete, all good
+    Ok(NoData {})
+  }
+}

bin/core/src/api/write/resource.rs

@@ -4,35 +4,21 @@ use komodo_client::{
   entities::{
     ResourceTarget, action::Action, alerter::Alerter, build::Build,
     builder::Builder, deployment::Deployment, procedure::Procedure,
-    repo::Repo, server::Server, stack::Stack, swarm::Swarm,
-    sync::ResourceSync,
+    repo::Repo, server::Server, stack::Stack, sync::ResourceSync,
   },
 };
-use mogh_error::AddStatusCodeError;
-use mogh_resolver::Resolve;
-use reqwest::StatusCode;
+use resolver_api::Resolve;
 
 use crate::resource::{self, ResourceMetaUpdate};
 
 use super::WriteArgs;
 
 impl Resolve<WriteArgs> for UpdateResourceMeta {
-  #[instrument(
-    "UpdateResourceMeta",
-    skip_all,
-    fields(
-      operator = args.user.id,
-      resource_type = self.target.extract_variant().to_string(),
-      resource_id = self.target.extract_variant_id().1,
-      description = self.description,
-      template = self.template,
-      tags = format!("{:?}", self.tags),
-    )
-  )]
+  #[instrument(name = "UpdateResourceMeta", skip(args))]
   async fn resolve(
     self,
     args: &WriteArgs,
-  ) -> mogh_error::Result<UpdateResourceMetaResponse> {
+  ) -> serror::Result<UpdateResourceMetaResponse> {
     let meta = ResourceMetaUpdate {
       description: self.description,
       template: self.template,
@@ -42,18 +28,12 @@ impl Resolve<WriteArgs> for UpdateResourceMeta {
       ResourceTarget::System(_) => {
         return Err(
           anyhow!("cannot update meta of System resource target")
-            .status_code(StatusCode::BAD_REQUEST),
+            .into(),
         );
       }
-      ResourceTarget::Swarm(id) => {
-        resource::update_meta::<Swarm>(&id, meta, args).await?;
-      }
       ResourceTarget::Server(id) => {
         resource::update_meta::<Server>(&id, meta, args).await?;
       }
-      ResourceTarget::Stack(id) => {
-        resource::update_meta::<Stack>(&id, meta, args).await?;
-      }
       ResourceTarget::Deployment(id) => {
         resource::update_meta::<Deployment>(&id, meta, args).await?;
       }
@@ -63,6 +43,12 @@ impl Resolve<WriteArgs> for UpdateResourceMeta {
       ResourceTarget::Repo(id) => {
         resource::update_meta::<Repo>(&id, meta, args).await?;
       }
+      ResourceTarget::Builder(id) => {
+        resource::update_meta::<Builder>(&id, meta, args).await?;
+      }
+      ResourceTarget::Alerter(id) => {
+        resource::update_meta::<Alerter>(&id, meta, args).await?;
+      }
       ResourceTarget::Procedure(id) => {
         resource::update_meta::<Procedure>(&id, meta, args).await?;
       }
@@ -73,11 +59,8 @@ impl Resolve<WriteArgs> for UpdateResourceMeta {
         resource::update_meta::<ResourceSync>(&id, meta, args)
           .await?;
       }
-      ResourceTarget::Builder(id) => {
-        resource::update_meta::<Builder>(&id, meta, args).await?;
-      }
-      ResourceTarget::Alerter(id) => {
-        resource::update_meta::<Alerter>(&id, meta, args).await?;
+      ResourceTarget::Stack(id) => {
+        resource::update_meta::<Stack>(&id, meta, args).await?;
       }
     }
     Ok(UpdateResourceMetaResponse {})

bin/core/src/api/write/server.rs

@@ -3,15 +3,15 @@ use formatting::{bold, format_serror};
 use komodo_client::{
   api::write::*,
   entities::{
-    Operation,
+    NoData, Operation,
     permission::PermissionLevel,
     server::{Server, ServerInfo},
     to_docker_compatible_name,
     update::{Update, UpdateStatus},
   },
 };
-use mogh_resolver::Resolve;
 use periphery_client::api;
+use resolver_api::Resolve;
 
 use crate::{
   helpers::{
@@ -25,19 +25,11 @@ use crate::{
 use super::WriteArgs;
 
 impl Resolve<WriteArgs> for CreateServer {
-  #[instrument(
-    "CreateServer",
-    skip_all,
-    fields(
-      operator = user.id,
-      server = self.name,
-      config = serde_json::to_string(&self.config).unwrap()
-    )
-  )]
+  #[instrument(name = "CreateServer", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Server> {
+  ) -> serror::Result<Server> {
     resource::create::<Server>(
       &self.name,
       self.config,
@@ -52,19 +44,11 @@ impl Resolve<WriteArgs> for CreateServer {
 }
 
 impl Resolve<WriteArgs> for CopyServer {
-  #[instrument(
-    "CopyServer",
-    skip_all,
-    fields(
-      operator = user.id,
-      server = self.name,
-      copy_server = self.id,
-    )
-  )]
+  #[instrument(name = "CopyServer", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Server> {
+  ) -> serror::Result<Server> {
     let Server { config, .. } = get_check_permissions::<Server>(
       &self.id,
       user,
@@ -86,72 +70,38 @@ impl Resolve<WriteArgs> for CopyServer {
 }
 
 impl Resolve<WriteArgs> for DeleteServer {
-  #[instrument(
-    "DeleteServer",
-    skip_all,
-    fields(
-      operator = user.id,
-      server = self.id,
-    )
-  )]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Server> {
-    Ok(resource::delete::<Server>(&self.id, user).await?)
+  #[instrument(name = "DeleteServer", skip(args))]
+  async fn resolve(self, args: &WriteArgs) -> serror::Result<Server> {
+    Ok(resource::delete::<Server>(&self.id, args).await?)
   }
 }
 
 impl Resolve<WriteArgs> for UpdateServer {
-  #[instrument(
-    "UpdateServer",
-    skip_all,
-    fields(
-      operator = user.id,
-      server = self.id,
-      update = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
+  #[instrument(name = "UpdateServer", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Server> {
+  ) -> serror::Result<Server> {
     Ok(resource::update::<Server>(&self.id, self.config, user).await?)
   }
 }
 
 impl Resolve<WriteArgs> for RenameServer {
-  #[instrument(
-    "RenameServer",
-    skip_all,
-    fields(
-      operator = user.id,
-      server = self.id,
-      new_name = self.name,
-    )
-  )]
+  #[instrument(name = "RenameServer", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Update> {
+  ) -> serror::Result<Update> {
     Ok(resource::rename::<Server>(&self.id, &self.name, user).await?)
   }
 }
 
 impl Resolve<WriteArgs> for CreateNetwork {
-  #[instrument(
-    "CreateNetwork",
-    skip_all,
-    fields(
-      operator = user.id,
-      server = self.server,
-      network = self.name
-    )
-  )]
+  #[instrument(name = "CreateNetwork", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Update> {
+  ) -> serror::Result<Update> {
     let server = get_check_permissions::<Server>(
       &self.server,
       user,
@@ -187,18 +137,88 @@ impl Resolve<WriteArgs> for CreateNetwork {
   }
 }
 
+impl Resolve<WriteArgs> for CreateTerminal {
+  #[instrument(name = "CreateTerminal", skip(user))]
+  async fn resolve(
+    self,
+    WriteArgs { user }: &WriteArgs,
+  ) -> serror::Result<NoData> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Write.terminal(),
+    )
+    .await?;
+
+    let periphery = periphery_client(&server).await?;
+
+    periphery
+      .request(api::terminal::CreateTerminal {
+        name: self.name,
+        command: self.command,
+        recreate: self.recreate,
+      })
+      .await
+      .context("Failed to create terminal on Periphery")?;
+
+    Ok(NoData {})
+  }
+}
+
+impl Resolve<WriteArgs> for DeleteTerminal {
+  #[instrument(name = "DeleteTerminal", skip(user))]
+  async fn resolve(
+    self,
+    WriteArgs { user }: &WriteArgs,
+  ) -> serror::Result<NoData> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Write.terminal(),
+    )
+    .await?;
+
+    let periphery = periphery_client(&server).await?;
+
+    periphery
+      .request(api::terminal::DeleteTerminal {
+        terminal: self.terminal,
+      })
+      .await
+      .context("Failed to delete terminal on Periphery")?;
+
+    Ok(NoData {})
+  }
+}
+
+impl Resolve<WriteArgs> for DeleteAllTerminals {
+  #[instrument(name = "DeleteAllTerminals", skip(user))]
+  async fn resolve(
+    self,
+    WriteArgs { user }: &WriteArgs,
+  ) -> serror::Result<NoData> {
+    let server = get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Write.terminal(),
+    )
+    .await?;
+
+    let periphery = periphery_client(&server).await?;
+
+    periphery
+      .request(api::terminal::DeleteAllTerminals {})
+      .await
+      .context("Failed to delete all terminals on Periphery")?;
+
+    Ok(NoData {})
+  }
+}
+
 //
 
 impl Resolve<WriteArgs> for UpdateServerPublicKey {
-  #[instrument(
-    "UpdateServerPublicKey",
-    skip_all,
-    fields(
-      operator = args.user.id,
-      server = self.server,
-      public_key = self.public_key,
-    )
-  )]
+  #[instrument(name = "UpdateServerPublicKey", skip(args))]
   async fn resolve(
     self,
     args: &WriteArgs,
@@ -229,14 +249,7 @@ impl Resolve<WriteArgs> for UpdateServerPublicKey {
 //
 
 impl Resolve<WriteArgs> for RotateServerKeys {
-  #[instrument(
-    "RotateServerKeys",
-    skip_all,
-    fields(
-      operator = args.user.id,
-      server = self.server,
-    )
-  )]
+  #[instrument(name = "RotateServerPrivateKey", skip(args))]
   async fn resolve(
     self,
     args: &WriteArgs,

bin/core/src/api/write/service_user.rs

@@ -1,62 +1,54 @@
+use std::str::FromStr;
+
 use anyhow::{Context, anyhow};
-use database::mungos::{by_id::find_one_by_id, mongodb::bson::doc};
+use database::mungos::{
+  by_id::find_one_by_id,
+  mongodb::bson::{doc, oid::ObjectId},
+};
 use komodo_client::{
-  api::write::*,
+  api::{user::CreateApiKey, write::*},
   entities::{
     komodo_timestamp,
-    user::{NewUserParams, User, UserConfig},
+    user::{User, UserConfig},
   },
 };
-use mogh_auth_client::api::manage::CreateApiKey;
-use mogh_auth_server::api::manage::api_key::create_api_key;
-use mogh_error::{AddStatusCode as _, AddStatusCodeError as _};
-use mogh_resolver::Resolve;
-use reqwest::StatusCode;
+use resolver_api::Resolve;
 
-use crate::{
-  auth::KomodoAuthImpl, helpers::validations::validate_username,
-  state::db_client,
-};
+use crate::{api::user::UserArgs, state::db_client};
 
 use super::WriteArgs;
 
 impl Resolve<WriteArgs> for CreateServiceUser {
-  #[instrument(
-    "CreateServiceUser",
-    skip_all,
-    fields(
-      operator = user.id,
-      username = self.username,
-      description = self.description,
-    )
-  )]
+  #[instrument(name = "CreateServiceUser", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<CreateServiceUserResponse> {
+  ) -> serror::Result<CreateServiceUserResponse> {
     if !user.admin {
+      return Err(anyhow!("user not admin").into());
+    }
+    if ObjectId::from_str(&self.username).is_ok() {
       return Err(
-        anyhow!("Only Admins can manage Service Users")
-          .status_code(StatusCode::FORBIDDEN),
+        anyhow!("username cannot be valid ObjectId").into(),
       );
     }
-
-    validate_username(&self.username)
-      .status_code(StatusCode::BAD_REQUEST)?;
-
     let config = UserConfig::Service {
       description: self.description,
     };
-
-    let mut user = User::new(NewUserParams {
+    let mut user = User {
+      id: Default::default(),
       username: self.username,
+      config,
       enabled: true,
       admin: false,
       super_admin: false,
-      config,
+      create_server_permissions: false,
+      create_build_permissions: false,
+      last_update_view: 0,
+      recents: Default::default(),
+      all: Default::default(),
       updated_at: komodo_timestamp(),
-    });
-
+    };
     user.id = db_client()
       .users
       .insert_one(&user)
@@ -66,48 +58,29 @@ impl Resolve<WriteArgs> for CreateServiceUser {
       .as_object_id()
       .context("inserted id is not object id")?
       .to_string();
-
     Ok(user)
   }
 }
 
 impl Resolve<WriteArgs> for UpdateServiceUserDescription {
-  #[instrument(
-    "UpdateServiceUserDescription",
-    skip_all,
-    fields(
-      operator = user.id,
-      username = self.username,
-      description = self.description,
-    )
-  )]
+  #[instrument(name = "UpdateServiceUserDescription", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<UpdateServiceUserDescriptionResponse> {
+  ) -> serror::Result<UpdateServiceUserDescriptionResponse> {
     if !user.admin {
-      return Err(
-        anyhow!("Only Admins can manage Service Users")
-          .status_code(StatusCode::FORBIDDEN),
-      );
+      return Err(anyhow!("user not admin").into());
     }
-
     let db = db_client();
-
     let service_user = db
       .users
       .find_one(doc! { "username": &self.username })
       .await
-      .context("Failed to query db for user")?
-      .context("No user with given username")?;
-
+      .context("failed to query db for user")?
+      .context("no user with given username")?;
     let UserConfig::Service { .. } = &service_user.config else {
-      return Err(
-        anyhow!("Target user is not Service User")
-          .status_code(StatusCode::FORBIDDEN),
-      );
+      return Err(anyhow!("user is not service user").into());
     };
-
     db.users
       .update_one(
         doc! { "username": &self.username },
@@ -115,107 +88,66 @@ impl Resolve<WriteArgs> for UpdateServiceUserDescription {
       )
       .await
       .context("failed to update user on db")?;
-
-    let service_user = db
+    let res = db
       .users
       .find_one(doc! { "username": &self.username })
       .await
       .context("failed to query db for user")?
       .context("user with username not found")?;
-
-    Ok(service_user)
+    Ok(res)
   }
 }
 
 impl Resolve<WriteArgs> for CreateApiKeyForServiceUser {
-  #[instrument(
-    "CreateApiKeyForServiceUser",
-    skip_all,
-    fields(
-      operator = user.id,
-      service_user = self.user_id,
-      name = self.name,
-      expires = self.expires,
-    )
-  )]
+  #[instrument(name = "CreateApiKeyForServiceUser", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<CreateApiKeyForServiceUserResponse> {
+  ) -> serror::Result<CreateApiKeyForServiceUserResponse> {
     if !user.admin {
-      return Err(
-        anyhow!("Only Admins can manage Service Users")
-          .status_code(StatusCode::FORBIDDEN),
-      );
+      return Err(anyhow!("user not admin").into());
     }
-
     let service_user =
       find_one_by_id(&db_client().users, &self.user_id)
         .await
-        .context("Failed to query db for user")?
-        .context("No user found with id")?;
-
+        .context("failed to query db for user")?
+        .context("no user found with id")?;
     let UserConfig::Service { .. } = &service_user.config else {
-      return Err(
-        anyhow!("Target user is not Service User")
-          .status_code(StatusCode::FORBIDDEN),
-      );
+      return Err(anyhow!("user is not service user").into());
     };
-
-    create_api_key(
-      &KomodoAuthImpl,
-      service_user.id,
-      CreateApiKey {
-        name: self.name,
-        expires: self.expires as u64,
-      },
-    )
+    CreateApiKey {
+      name: self.name,
+      expires: self.expires,
+    }
+    .resolve(&UserArgs { user: service_user })
     .await
   }
 }
 
 impl Resolve<WriteArgs> for DeleteApiKeyForServiceUser {
-  #[instrument(
-    "DeleteApiKeyForServiceUser",
-    skip_all,
-    fields(
-      operator = user.id,
-      key = self.key,
-    )
-  )]
+  #[instrument(name = "DeleteApiKeyForServiceUser", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<DeleteApiKeyForServiceUserResponse> {
+  ) -> serror::Result<DeleteApiKeyForServiceUserResponse> {
     if !user.admin {
-      return Err(
-        anyhow!("Only Admins can manage Service Users")
-          .status_code(StatusCode::FORBIDDEN),
-      );
+      return Err(anyhow!("user not admin").into());
     }
-
     let db = db_client();
-
     let api_key = db
       .api_keys
       .find_one(doc! { "key": &self.key })
       .await
       .context("failed to query db for api key")?
       .context("did not find matching api key")?;
-
     let service_user =
       find_one_by_id(&db_client().users, &api_key.user_id)
         .await
         .context("failed to query db for user")?
         .context("no user found with id")?;
-
     let UserConfig::Service { .. } = &service_user.config else {
-      return Err(
-        anyhow!("Target user is not Service User")
-          .status_code(StatusCode::FORBIDDEN),
-      );
+      return Err(anyhow!("user is not service user").into());
     };
-
     db.api_keys
       .delete_one(doc! { "key": self.key })
       .await

bin/core/src/api/write/swarm.rs

@@ -1,108 +0,0 @@
-use komodo_client::{
-  api::write::*,
-  entities::{
-    permission::PermissionLevel, swarm::Swarm, update::Update,
-  },
-};
-use mogh_resolver::Resolve;
-
-use crate::{permission::get_check_permissions, resource};
-
-use super::WriteArgs;
-
-impl Resolve<WriteArgs> for CreateSwarm {
-  #[instrument(
-    "CreateSwarm",
-    skip_all,
-    fields(
-      operator = user.id,
-      swarm = self.name,
-      config = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Swarm> {
-    resource::create::<Swarm>(&self.name, self.config, None, user)
-      .await
-  }
-}
-
-impl Resolve<WriteArgs> for CopySwarm {
-  #[instrument(
-    "CopySwarm",
-    skip_all,
-    fields(
-      operator = user.id,
-      swarm = self.name,
-      copy_swarm = self.id,
-    )
-  )]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Swarm> {
-    let Swarm { config, .. } = get_check_permissions::<Swarm>(
-      &self.id,
-      user,
-      PermissionLevel::Read.into(),
-    )
-    .await?;
-    resource::create::<Swarm>(&self.name, config.into(), None, user)
-      .await
-  }
-}
-
-impl Resolve<WriteArgs> for DeleteSwarm {
-  #[instrument(
-    "DeleteSwarm",
-    skip_all,
-    fields(
-      operator = user.id,
-      swarm = self.id,
-    )
-  )]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Swarm> {
-    Ok(resource::delete::<Swarm>(&self.id, user).await?)
-  }
-}
-
-impl Resolve<WriteArgs> for UpdateSwarm {
-  #[instrument(
-    "UpdateSwarm",
-    skip_all,
-    fields(
-      operator = user.id,
-      swarm = self.id,
-      update = serde_json::to_string(&self.config).unwrap()
-    )
-  )]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Swarm> {
-    Ok(resource::update::<Swarm>(&self.id, self.config, user).await?)
-  }
-}
-
-impl Resolve<WriteArgs> for RenameSwarm {
-  #[instrument(
-    "RenameSwarm",
-    skip_all,
-    fields(
-      operator = user.id,
-      swarm = self.id,
-      new_name = self.name
-    )
-  )]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Update> {
-    Ok(resource::rename::<Swarm>(&self.id, &self.name, user).await?)
-  }
-}

bin/core/src/api/write/sync.rs

@@ -12,13 +12,14 @@ use formatting::format_serror;
 use komodo_client::{
   api::{read::ExportAllResourcesToToml, write::*},
   entities::{
-    self, Operation, RepoExecutionArgs, ResourceTarget,
+    self, NoData, Operation, RepoExecutionArgs, ResourceTarget,
     action::Action,
     alert::{Alert, AlertData, SeverityLevel},
     alerter::Alerter,
     all_logs_success,
     build::Build,
     builder::Builder,
+    config::core::CoreConfig,
     deployment::Deployment,
     komodo_timestamp,
     permission::PermissionLevel,
@@ -26,15 +27,19 @@ use komodo_client::{
     repo::Repo,
     server::Server,
     stack::Stack,
-    swarm::Swarm,
-    sync::{ResourceSync, ResourceSyncInfo},
+    sync::{
+      PartialResourceSyncConfig, ResourceSync, ResourceSyncInfo,
+      SyncDeployUpdate,
+    },
     to_path_compatible_name,
     update::{Log, Update},
     user::sync_user,
   },
 };
-use mogh_resolver::Resolve;
-use tracing::Instrument;
+use octorust::types::{
+  ReposCreateWebhookRequest, ReposCreateWebhookRequestConfig,
+};
+use resolver_api::Resolve;
 
 use crate::{
   alert::send_alerts,
@@ -48,7 +53,7 @@ use crate::{
   },
   permission::get_check_permissions,
   resource,
-  state::db_client,
+  state::{db_client, github_client},
   sync::{
     deploy::SyncDeployParams, remote::RemoteResources,
     view::push_updates_for_view,
@@ -58,19 +63,11 @@ use crate::{
 use super::WriteArgs;
 
 impl Resolve<WriteArgs> for CreateResourceSync {
-  #[instrument(
-    "CreateResourceSync",
-    skip_all,
-    fields(
-      operator = user.id,
-      sync = self.name,
-      config = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
+  #[instrument(name = "CreateResourceSync", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<ResourceSync> {
+  ) -> serror::Result<ResourceSync> {
     resource::create::<ResourceSync>(
       &self.name,
       self.config,
@@ -82,19 +79,11 @@ impl Resolve<WriteArgs> for CreateResourceSync {
 }
 
 impl Resolve<WriteArgs> for CopyResourceSync {
-  #[instrument(
-    "CopyResourceSync",
-    skip_all,
-    fields(
-      operator = user.id,
-      sync = self.name,
-      copy_sync = self.id,
-    )
-  )]
+  #[instrument(name = "CopyResourceSync", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<ResourceSync> {
+  ) -> serror::Result<ResourceSync> {
     let ResourceSync { config, .. } =
       get_check_permissions::<ResourceSync>(
         &self.id,
@@ -113,36 +102,21 @@ impl Resolve<WriteArgs> for CopyResourceSync {
 }
 
 impl Resolve<WriteArgs> for DeleteResourceSync {
-  #[instrument(
-    "DeleteResourceSync",
-    skip_all,
-    fields(
-      operator = user.id,
-      sync = self.id,
-    )
-  )]
+  #[instrument(name = "DeleteResourceSync", skip(args))]
   async fn resolve(
     self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<ResourceSync> {
-    Ok(resource::delete::<ResourceSync>(&self.id, user).await?)
+    args: &WriteArgs,
+  ) -> serror::Result<ResourceSync> {
+    Ok(resource::delete::<ResourceSync>(&self.id, args).await?)
   }
 }
 
 impl Resolve<WriteArgs> for UpdateResourceSync {
-  #[instrument(
-    "UpdateResourceSync",
-    skip_all,
-    fields(
-      operator = user.id,
-      sync = self.id,
-      update = serde_json::to_string(&self.config).unwrap(),
-    )
-  )]
+  #[instrument(name = "UpdateResourceSync", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<ResourceSync> {
+  ) -> serror::Result<ResourceSync> {
     Ok(
       resource::update::<ResourceSync>(&self.id, self.config, user)
         .await?,
@@ -151,19 +125,11 @@ impl Resolve<WriteArgs> for UpdateResourceSync {
 }
 
 impl Resolve<WriteArgs> for RenameResourceSync {
-  #[instrument(
-    "RenameResourceSync",
-    skip_all,
-    fields(
-      operator = user.id,
-      sync = self.id,
-      new_name = self.name
-    )
-  )]
+  #[instrument(name = "RenameResourceSync", skip(user))]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<Update> {
+  ) -> serror::Result<Update> {
     Ok(
       resource::rename::<ResourceSync>(&self.id, &self.name, user)
         .await?,
@@ -172,20 +138,8 @@ impl Resolve<WriteArgs> for RenameResourceSync {
 }
 
 impl Resolve<WriteArgs> for WriteSyncFileContents {
-  #[instrument(
-    "WriteSyncFileContents",
-    skip_all,
-    fields(
-      operator = args.user.id,
-      sync = self.sync,
-      resource_path = self.resource_path,
-      file_path = self.file_path,
-    )
-  )]
-  async fn resolve(
-    self,
-    args: &WriteArgs,
-  ) -> mogh_error::Result<Update> {
+  #[instrument(name = "WriteSyncFileContents", skip(args))]
+  async fn resolve(self, args: &WriteArgs) -> serror::Result<Update> {
     let sync = get_check_permissions::<ResourceSync>(
       &self.sync,
       &args.user,
@@ -229,13 +183,12 @@ impl Resolve<WriteArgs> for WriteSyncFileContents {
   }
 }
 
-#[instrument("WriteSyncFileContentsOnHost", skip_all)]
 async fn write_sync_file_contents_on_host(
   req: WriteSyncFileContents,
   args: &WriteArgs,
   sync: ResourceSync,
   mut update: Update,
-) -> mogh_error::Result<Update> {
+) -> serror::Result<Update> {
   let WriteSyncFileContents {
     sync: _,
     resource_path,
@@ -253,7 +206,15 @@ async fn write_sync_file_contents_on_host(
     .context("Invalid resource path")?;
   let full_path = root.join(&resource_path).join(&file_path);
 
-  if let Err(e) = mogh_secret_file::write_async(&full_path, &contents)
+  if let Some(parent) = full_path.parent() {
+    tokio::fs::create_dir_all(parent).await.with_context(|| {
+      format!(
+        "Failed to initialize resource file parent directory {parent:?}"
+      )
+    })?;
+  }
+
+  if let Err(e) = tokio::fs::write(&full_path, &contents)
     .await
     .with_context(|| {
       format!(
@@ -292,14 +253,13 @@ async fn write_sync_file_contents_on_host(
   Ok(update)
 }
 
-#[instrument("WriteSyncFileContentsGit", skip_all)]
 async fn write_sync_file_contents_git(
   req: WriteSyncFileContents,
   args: &WriteArgs,
   sync: ResourceSync,
   repo: Option<Repo>,
   mut update: Update,
-) -> mogh_error::Result<Update> {
+) -> serror::Result<Update> {
   let WriteSyncFileContents {
     sync: _,
     resource_path,
@@ -444,18 +404,8 @@ async fn write_sync_file_contents_git(
 }
 
 impl Resolve<WriteArgs> for CommitSync {
-  #[instrument(
-    "CommitSync",
-    skip_all,
-    fields(
-      operator = args.user.id,
-      sync = self.sync,
-    )
-  )]
-  async fn resolve(
-    self,
-    args: &WriteArgs,
-  ) -> mogh_error::Result<Update> {
+  #[instrument(name = "CommitSync", skip(args))]
+  async fn resolve(self, args: &WriteArgs) -> serror::Result<Update> {
     let WriteArgs { user } = args;
 
     let sync = get_check_permissions::<entities::sync::ResourceSync>(
@@ -516,20 +466,11 @@ impl Resolve<WriteArgs> for CommitSync {
       None
     };
 
-    // Get the latest existing resources to preserve any meta values
-    let RemoteResources { resources, .. } =
-      crate::sync::remote::get_remote_resources(&sync, repo.as_ref())
-        .await
-        .context("failed to get remote resources")?;
-
     let res = ExportAllResourcesToToml {
       include_resources: sync.config.include_resources,
       tags: sync.config.match_tags.clone(),
       include_variables: sync.config.include_variables,
       include_user_groups: sync.config.include_user_groups,
-      existing: resources
-        .inspect_err(|e| warn!("Existing resource TOML is unavailable, resource meta will not be preserved | ERROR: {e:#}"))
-        .ok(),
     }
     .resolve(&ReadArgs {
       user: sync_user().to_owned(),
@@ -550,14 +491,16 @@ impl Resolve<WriteArgs> for CommitSync {
         .sync_directory
         .join(to_path_compatible_name(&sync.name))
         .join(&resource_path);
-      let span = info_span!("CommitSyncOnHost");
-      if let Err(e) =
-        mogh_secret_file::write_async(&file_path, &res.toml)
-          .instrument(span)
+      if let Some(parent) = file_path.parent() {
+        tokio::fs::create_dir_all(parent)
           .await
-          .with_context(|| {
-            format!("Failed to write resource file to {file_path:?}",)
-          })
+          .with_context(|| format!("Failed to initialize resource file parent directory {parent:?}"))?;
+      };
+      if let Err(e) = tokio::fs::write(&file_path, &res.toml)
+        .await
+        .with_context(|| {
+          format!("Failed to write resource file to {file_path:?}",)
+        })
       {
         update.push_error_log(
           "Write resource file",
@@ -646,7 +589,6 @@ impl Resolve<WriteArgs> for CommitSync {
   }
 }
 
-#[instrument("CommitSyncGit", skip_all)]
 async fn commit_git_sync(
   mut args: RepoExecutionArgs,
   resource_path: &Path,
@@ -691,10 +633,15 @@ async fn commit_git_sync(
 }
 
 impl Resolve<WriteArgs> for RefreshResourceSyncPending {
+  #[instrument(
+    name = "RefreshResourceSyncPending",
+    level = "debug",
+    skip(user)
+  )]
   async fn resolve(
     self,
     WriteArgs { user }: &WriteArgs,
-  ) -> mogh_error::Result<ResourceSync> {
+  ) -> serror::Result<ResourceSync> {
     // Even though this is a write request, this doesn't change any config. Anyone that can execute the
     // sync should be able to do this.
     let mut sync =
@@ -785,40 +732,110 @@ impl Resolve<WriteArgs> for RefreshResourceSyncPending {
 
           let mut diffs = Vec::new();
 
-          macro_rules! push_updates {
-            ($(($Type:ident, $field:ident)),* $(,)?) => {
-              $(
-                push_updates_for_view::<$Type>(
-                  resources.$field,
-                  delete,
-                  None,
-                  None,
-                  &id_to_tags,
-                  &sync.config.match_tags,
-                  &mut diffs,
-                )
-                .await?;
-              )*
-            };
-          }
-          // New resource types need to be added here manually.
-          push_updates!(
-            (Server, servers),
-            (Swarm, swarms),
-            (Stack, stacks),
-            (Deployment, deployments),
-            (Build, builds),
-            (Repo, repos),
-            (Procedure, procedures),
-            (Action, actions),
-            (Builder, builders),
-            (Alerter, alerters),
-            (ResourceSync, resource_syncs),
-          );
+          push_updates_for_view::<Server>(
+            resources.servers,
+            delete,
+            None,
+            None,
+            &id_to_tags,
+            &sync.config.match_tags,
+            &mut diffs,
+          )
+          .await?;
+          push_updates_for_view::<Stack>(
+            resources.stacks,
+            delete,
+            None,
+            None,
+            &id_to_tags,
+            &sync.config.match_tags,
+            &mut diffs,
+          )
+          .await?;
+          push_updates_for_view::<Deployment>(
+            resources.deployments,
+            delete,
+            None,
+            None,
+            &id_to_tags,
+            &sync.config.match_tags,
+            &mut diffs,
+          )
+          .await?;
+          push_updates_for_view::<Build>(
+            resources.builds,
+            delete,
+            None,
+            None,
+            &id_to_tags,
+            &sync.config.match_tags,
+            &mut diffs,
+          )
+          .await?;
+          push_updates_for_view::<Repo>(
+            resources.repos,
+            delete,
+            None,
+            None,
+            &id_to_tags,
+            &sync.config.match_tags,
+            &mut diffs,
+          )
+          .await?;
+          push_updates_for_view::<Procedure>(
+            resources.procedures,
+            delete,
+            None,
+            None,
+            &id_to_tags,
+            &sync.config.match_tags,
+            &mut diffs,
+          )
+          .await?;
+          push_updates_for_view::<Action>(
+            resources.actions,
+            delete,
+            None,
+            None,
+            &id_to_tags,
+            &sync.config.match_tags,
+            &mut diffs,
+          )
+          .await?;
+          push_updates_for_view::<Builder>(
+            resources.builders,
+            delete,
+            None,
+            None,
+            &id_to_tags,
+            &sync.config.match_tags,
+            &mut diffs,
+          )
+          .await?;
+          push_updates_for_view::<Alerter>(
+            resources.alerters,
+            delete,
+            None,
+            None,
+            &id_to_tags,
+            &sync.config.match_tags,
+            &mut diffs,
+          )
+          .await?;
+          push_updates_for_view::<ResourceSync>(
+            resources.resource_syncs,
+            delete,
+            None,
+            None,
+            &id_to_tags,
+            &sync.config.match_tags,
+            &mut diffs,
+          )
+          .await?;
 
           (diffs, deploy_updates)
         } else {
-          Default::default()
+          (Vec::new(), SyncDeployUpdate::default())
         };
 
       let variable_updates = if sync.config.include_variables {
@@ -852,7 +869,7 @@ impl Resolve<WriteArgs> for RefreshResourceSyncPending {
 
     let (
       resource_updates,
-      (pending_deploys, pending_deploy_error),
+      deploy_updates,
       variable_updates,
       user_group_updates,
       pending_error,
@@ -868,7 +885,7 @@ impl Resolve<WriteArgs> for RefreshResourceSyncPending {
     };
 
     let has_updates = !resource_updates.is_empty()
-      || !pending_deploys.is_empty()
+      || !deploy_updates.to_deploy == 0
       || !variable_updates.is_empty()
       || !user_group_updates.is_empty();
 
@@ -880,8 +897,7 @@ impl Resolve<WriteArgs> for RefreshResourceSyncPending {
       remote_errors: sync.info.remote_errors,
       pending_hash: sync.info.pending_hash,
       pending_message: sync.info.pending_message,
-      pending_deploys,
-      pending_deploy_error,
+      pending_deploy: deploy_updates,
       resource_updates,
       variable_updates,
       user_group_updates,
@@ -966,3 +982,215 @@ impl Resolve<WriteArgs> for RefreshResourceSyncPending {
     Ok(crate::resource::get::<ResourceSync>(&sync.id).await?)
   }
 }
+
+impl Resolve<WriteArgs> for CreateSyncWebhook {
+  #[instrument(name = "CreateSyncWebhook", skip(args))]
+  async fn resolve(
+    self,
+    args: &WriteArgs,
+  ) -> serror::Result<CreateSyncWebhookResponse> {
+    let WriteArgs { user } = args;
+    let Some(github) = github_client() else {
+      return Err(
+        anyhow!(
+          "github_webhook_app is not configured in core config toml"
+        )
+        .into(),
+      );
+    };
+
+    let sync = get_check_permissions::<ResourceSync>(
+      &self.sync,
+      user,
+      PermissionLevel::Write.into(),
+    )
+    .await?;
+
+    if sync.config.repo.is_empty() {
+      return Err(
+        anyhow!("No repo configured, can't create webhook").into(),
+      );
+    }
+
+    let mut split = sync.config.repo.split('/');
+    let owner = split.next().context("Sync repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Err(
+        anyhow!("Cannot manage repo webhooks under owner {owner}")
+          .into(),
+      );
+    };
+
+    let repo =
+      split.next().context("Repo repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    // First make sure the webhook isn't already created (inactive ones are ignored)
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      webhook_secret,
+      ..
+    } = core_config();
+
+    let webhook_secret = if sync.config.webhook_secret.is_empty() {
+      webhook_secret
+    } else {
+      &sync.config.webhook_secret
+    };
+
+    let host = if webhook_base_url.is_empty() {
+      host
+    } else {
+      webhook_base_url
+    };
+    let url = match self.action {
+      SyncWebhookAction::Refresh => {
+        format!("{host}/listener/github/sync/{}/refresh", sync.id)
+      }
+      SyncWebhookAction::Sync => {
+        format!("{host}/listener/github/sync/{}/sync", sync.id)
+      }
+    };
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == url {
+        return Ok(NoData {});
+      }
+    }
+
+    // Now good to create the webhook
+    let request = ReposCreateWebhookRequest {
+      active: Some(true),
+      config: Some(ReposCreateWebhookRequestConfig {
+        url,
+        secret: webhook_secret.to_string(),
+        content_type: String::from("json"),
+        insecure_ssl: None,
+        digest: Default::default(),
+        token: Default::default(),
+      }),
+      events: vec![String::from("push")],
+      name: String::from("web"),
+    };
+    github_repos
+      .create_webhook(owner, repo, &request)
+      .await
+      .context("failed to create webhook")?;
+
+    if !sync.config.webhook_enabled {
+      UpdateResourceSync {
+        id: sync.id,
+        config: PartialResourceSyncConfig {
+          webhook_enabled: Some(true),
+          ..Default::default()
+        },
+      }
+      .resolve(args)
+      .await
+      .map_err(|e| e.error)
+      .context("failed to update sync to enable webhook")?;
+    }
+
+    Ok(NoData {})
+  }
+}
+
+impl Resolve<WriteArgs> for DeleteSyncWebhook {
+  #[instrument(name = "DeleteSyncWebhook", skip(user))]
+  async fn resolve(
+    self,
+    WriteArgs { user }: &WriteArgs,
+  ) -> serror::Result<DeleteSyncWebhookResponse> {
+    let Some(github) = github_client() else {
+      return Err(
+        anyhow!(
+          "github_webhook_app is not configured in core config toml"
+        )
+        .into(),
+      );
+    };
+
+    let sync = get_check_permissions::<ResourceSync>(
+      &self.sync,
+      user,
+      PermissionLevel::Write.into(),
+    )
+    .await?;
+
+    if sync.config.git_provider != "github.com" {
+      return Err(
+        anyhow!("Can only manage github.com repo webhooks").into(),
+      );
+    }
+
+    if sync.config.repo.is_empty() {
+      return Err(
+        anyhow!("No repo configured, can't create webhook").into(),
+      );
+    }
+
+    let mut split = sync.config.repo.split('/');
+    let owner = split.next().context("Sync repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Err(
+        anyhow!("Cannot manage repo webhooks under owner {owner}")
+          .into(),
+      );
+    };
+
+    let repo =
+      split.next().context("Sync repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    // First make sure the webhook isn't already created (inactive ones are ignored)
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      ..
+    } = core_config();
+
+    let host = if webhook_base_url.is_empty() {
+      host
+    } else {
+      webhook_base_url
+    };
+    let url = match self.action {
+      SyncWebhookAction::Refresh => {
+        format!("{host}/listener/github/sync/{}/refresh", sync.id)
+      }
+      SyncWebhookAction::Sync => {
+        format!("{host}/listener/github/sync/{}/sync", sync.id)
+      }
+    };
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == url {
+        github_repos
+          .delete_webhook(owner, repo, webhook.id)
+          .await
+          .context("failed to delete webhook")?;
+        return Ok(NoData {});
+      }
+    }
+
+    // No webhook to delete, all good
+    Ok(NoData {})
+  }
+}