1.16.8 (#170)

* update configs

* bump to 1.16.8

Cargo.lock

@@ -41,7 +41,7 @@ dependencies = [
 
 [[package]]
 name = "alerter"
-version = "1.16.7"
+version = "1.16.8"
 dependencies = [
  "anyhow",
  "axum",
@@ -943,7 +943,7 @@ dependencies = [
 
 [[package]]
 name = "command"
-version = "1.16.7"
+version = "1.16.8"
 dependencies = [
  "komodo_client",
  "run_command",
@@ -1355,7 +1355,7 @@ dependencies = [
 
 [[package]]
 name = "environment_file"
-version = "1.16.7"
+version = "1.16.8"
 dependencies = [
  "thiserror",
 ]
@@ -1439,7 +1439,7 @@ dependencies = [
 
 [[package]]
 name = "formatting"
-version = "1.16.7"
+version = "1.16.8"
 dependencies = [
  "serror",
 ]
@@ -1571,7 +1571,7 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "git"
-version = "1.16.7"
+version = "1.16.8"
 dependencies = [
  "anyhow",
  "command",
@@ -2191,7 +2191,7 @@ dependencies = [
 
 [[package]]
 name = "komodo_cli"
-version = "1.16.7"
+version = "1.16.8"
 dependencies = [
  "anyhow",
  "clap",
@@ -2207,7 +2207,7 @@ dependencies = [
 
 [[package]]
 name = "komodo_client"
-version = "1.16.7"
+version = "1.16.8"
 dependencies = [
  "anyhow",
  "async_timing_util",
@@ -2238,7 +2238,7 @@ dependencies = [
 
 [[package]]
 name = "komodo_core"
-version = "1.16.7"
+version = "1.16.8"
 dependencies = [
  "anyhow",
  "async_timing_util",
@@ -2297,7 +2297,7 @@ dependencies = [
 
 [[package]]
 name = "komodo_periphery"
-version = "1.16.7"
+version = "1.16.8"
 dependencies = [
  "anyhow",
  "async_timing_util",
@@ -2384,7 +2384,7 @@ dependencies = [
 
 [[package]]
 name = "logger"
-version = "1.16.7"
+version = "1.16.8"
 dependencies = [
  "anyhow",
  "komodo_client",
@@ -3090,7 +3090,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "periphery_client"
-version = "1.16.7"
+version = "1.16.8"
 dependencies = [
  "anyhow",
  "komodo_client",
@@ -4865,7 +4865,7 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "update_logger"
-version = "1.16.7"
+version = "1.16.8"
 dependencies = [
  "anyhow",
  "komodo_client",

Cargo.toml

@@ -9,7 +9,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.16.7"
+version = "1.16.8"
 edition = "2021"
 authors = ["mbecker20 <becker.maxh@gmail.com>"]
 license = "GPL-3.0-or-later"

bin/core/src/listener/resources.rs

@@ -132,11 +132,6 @@ impl RepoExecution for BuildRepo {
   }
 }
 
-#[derive(Deserialize)]
-pub struct RepoWebhookPath {
-  pub option: RepoWebhookOption,
-}
-
 #[derive(Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum RepoWebhookOption {
@@ -244,11 +239,6 @@ impl StackExecution for DeployStack {
   }
 }
 
-#[derive(Deserialize)]
-pub struct StackWebhookPath {
-  pub option: StackWebhookOption,
-}
-
 #[derive(Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum StackWebhookOption {
@@ -340,11 +330,6 @@ impl SyncExecution for RunSync {
   }
 }
 
-#[derive(Deserialize)]
-pub struct SyncWebhookPath {
-  pub option: SyncWebhookOption,
-}
-
 #[derive(Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum SyncWebhookOption {
@@ -410,7 +395,7 @@ fn procedure_locks() -> &'static ListenerLockCache {
 
 pub async fn handle_procedure_webhook<B: super::VerifyBranch>(
   procedure: Procedure,
-  target_branch: String,
+  target_branch: &str,
   body: String,
 ) -> anyhow::Result<()> {
   // Acquire and hold lock to make a task queue for
@@ -457,7 +442,7 @@ fn action_locks() -> &'static ListenerLockCache {
 
 pub async fn handle_action_webhook<B: super::VerifyBranch>(
   action: Action,
-  target_branch: String,
+  target_branch: &str,
   body: String,
 ) -> anyhow::Result<()> {
   // Acquire and hold lock to make a task queue for

bin/core/src/listener/router.rs

@@ -3,7 +3,9 @@ use komodo_client::entities::{
   action::Action, build::Build, procedure::Procedure, repo::Repo,
   resource::Resource, stack::Stack, sync::ResourceSync,
 };
+use reqwest::StatusCode;
 use serde::Deserialize;
+use serror::AddStatusCode;
 use tracing::Instrument;
 
 use crate::resource::KomodoResource;
@@ -12,8 +14,8 @@ use super::{
   resources::{
     handle_action_webhook, handle_build_webhook,
     handle_procedure_webhook, handle_repo_webhook,
-    handle_stack_webhook, handle_sync_webhook, RepoWebhookPath,
-    StackWebhookPath, SyncWebhookPath,
+    handle_stack_webhook, handle_sync_webhook, RepoWebhookOption,
+    StackWebhookOption, SyncWebhookOption,
   },
   CustomSecret, VerifyBranch, VerifySecret,
 };
@@ -24,7 +26,14 @@ struct Id {
 }
 
 #[derive(Deserialize)]
-struct Branch {
+struct IdAndOption<T> {
+  id: String,
+  option: T,
+}
+
+#[derive(Deserialize)]
+struct IdAndBranch {
+  id: String,
   #[serde(default = "default_branch")]
   branch: String,
 }
@@ -64,7 +73,7 @@ pub fn router<P: VerifySecret + VerifyBranch>() -> Router {
   .route(
     "/repo/:id/:option",
     post(
-      |Path(Id { id }), Path(RepoWebhookPath { option }), headers: HeaderMap, body: String| async move {
+      |Path(IdAndOption::<RepoWebhookOption> { id, option }), headers: HeaderMap, body: String| async move {
         let repo =
           auth_webhook::<P, Repo>(&id, headers, &body).await?;
         tokio::spawn(async move {
@@ -90,7 +99,7 @@ pub fn router<P: VerifySecret + VerifyBranch>() -> Router {
   .route(
     "/stack/:id/:option",
     post(
-      |Path(Id { id }), Path(StackWebhookPath { option }), headers: HeaderMap, body: String| async move {
+      |Path(IdAndOption::<StackWebhookOption> { id, option }), headers: HeaderMap, body: String| async move {
         let stack =
           auth_webhook::<P, Stack>(&id, headers, &body).await?;
         tokio::spawn(async move {
@@ -116,7 +125,7 @@ pub fn router<P: VerifySecret + VerifyBranch>() -> Router {
   .route(
     "/sync/:id/:option",
     post(
-      |Path(Id { id }), Path(SyncWebhookPath { option }), headers: HeaderMap, body: String| async move {
+      |Path(IdAndOption::<SyncWebhookOption> { id, option }), headers: HeaderMap, body: String| async move {
         let sync =
           auth_webhook::<P, ResourceSync>(&id, headers, &body).await?;
         tokio::spawn(async move {
@@ -142,19 +151,19 @@ pub fn router<P: VerifySecret + VerifyBranch>() -> Router {
   .route(
     "/procedure/:id/:branch",
     post(
-      |Path(Id { id }), Path(Branch { branch }), headers: HeaderMap, body: String| async move {
+      |Path(IdAndBranch { id, branch }), headers: HeaderMap, body: String| async move {
         let procedure =
           auth_webhook::<P, Procedure>(&id, headers, &body).await?;
         tokio::spawn(async move {
           let span = info_span!("ProcedureWebhook", id);
           async {
             let res = handle_procedure_webhook::<P>(
-              procedure, branch, body,
+              procedure, &branch, body,
             )
             .await;
             if let Err(e) = res {
               warn!(
-                "Failed at running webhook for procedure {id} | {e:#}"
+                "Failed at running webhook for procedure {id} | target branch: {branch} | {e:#}"
               );
             }
           }
@@ -168,19 +177,19 @@ pub fn router<P: VerifySecret + VerifyBranch>() -> Router {
   .route(
     "/action/:id/:branch",
     post(
-      |Path(Id { id }), Path(Branch { branch }), headers: HeaderMap, body: String| async move {
+      |Path(IdAndBranch { id, branch }), headers: HeaderMap, body: String| async move {
         let action =
           auth_webhook::<P, Action>(&id, headers, &body).await?;
         tokio::spawn(async move {
           let span = info_span!("ActionWebhook", id);
           async {
             let res = handle_action_webhook::<P>(
-              action, branch, body,
+              action, &branch, body,
             )
             .await;
             if let Err(e) = res {
               warn!(
-                "Failed at running webhook for action {id} | {e:#}"
+                "Failed at running webhook for action {id} | target branch: {branch} | {e:#}"
               );
             }
           }
@@ -202,7 +211,10 @@ where
   P: VerifySecret,
   R: KomodoResource + CustomSecret,
 {
-  let resource = crate::resource::get::<R>(id).await?;
-  P::verify_secret(headers, body, R::custom_secret(&resource))?;
+  let resource = crate::resource::get::<R>(id)
+    .await
+    .status_code(StatusCode::BAD_REQUEST)?;
+  P::verify_secret(headers, body, R::custom_secret(&resource))
+    .status_code(StatusCode::UNAUTHORIZED)?;
   Ok(resource)
 }

client/core/ts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "komodo_client",
-  "version": "1.16.7",
+  "version": "1.16.8",
   "description": "Komodo client package",
   "homepage": "https://komo.do",
   "main": "dist/lib.js",

client/core/ts/src/types.ts

@@ -1,5 +1,5 @@
 /*
- Generated by typeshare 1.11.0
+ Generated by typeshare 1.12.0
 */
 
 export interface MongoIdObj {

docsite/docs/webhooks.md

@@ -30,7 +30,7 @@ https://${HOST}/listener/${AUTH_TYPE}/${RESOURCE_TYPE}/${ID_OR_NAME}/${EXECUTION
 - **`EXECUTION`**:
 	- Which executions are available depends on the `RESOURCE_TYPE`. Builds only have the `/build` action.
 		Repos can select between `/pull`, `/clone`, or `/build`. Stacks have `/deploy` and `/refresh`, and Resource Syncs have `/sync` and `/refresh`.
-	- For **Procedures and Actions**, this will be the **branch to listen to for pushes**, or `__ALL__` to trigger
+	- For **Procedures and Actions**, this will be the **branch to listen to for pushes**, or `__ANY__` to trigger
 		on pushes to any branch.
 
 ## Create the webhook on the Git Provider

frontend/public/client/types.js

@@ -1,5 +1,5 @@
 /*
- Generated by typeshare 1.11.0
+ Generated by typeshare 1.12.0
 */
 /** The levels of permission that a User or UserGroup can have on a resource. */
 export var PermissionLevel;

frontend/src/components/resources/action/config.tsx

@@ -118,17 +118,17 @@ export const ActionConfig = ({ id }: { id: string }) => {
                       value={branch}
                       onChange={(e) => setBranch(e.target.value)}
                       className="w-[200px]"
-                      disabled={branch === "__ALL__"}
+                      disabled={branch === "__ANY__"}
                     />
                     <div className="flex items-center gap-2">
                       <div className="text-muted-foreground text-sm">
-                        All branches:
+                        No branch check:
                       </div>
                       <Switch
-                        checked={branch === "__ALL__"}
+                        checked={branch === "__ANY__"}
                         onCheckedChange={(checked) => {
                           if (checked) {
-                            setBranch("__ALL__");
+                            setBranch("__ANY__");
                           } else {
                             setBranch("main");
                           }

frontend/src/components/resources/procedure/config.tsx

@@ -238,17 +238,17 @@ const ProcedureConfigInner = ({
                       value={branch}
                       onChange={(e) => setBranch(e.target.value)}
                       className="w-[200px]"
-                      disabled={branch === "__ALL__"}
+                      disabled={branch === "__ANY__"}
                     />
                     <div className="flex items-center gap-2">
                       <div className="text-muted-foreground text-sm">
-                        All branches:
+                        No branch check:
                       </div>
                       <Switch
-                        checked={branch === "__ALL__"}
+                        checked={branch === "__ANY__"}
                         onCheckedChange={(checked) => {
                           if (checked) {
-                            setBranch("__ALL__");
+                            setBranch("__ANY__");
                           } else {
                             setBranch("main");
                           }