Test: Remove the clients from AppState entirely.

I should be configuring cranelift globally in my per-machine configs, not spreading my build preferences in the project's Cargo.toml.

.webhook_bridge/pipeline-build-semver.yaml

@@ -14,6 +14,9 @@ spec:
       - name: image-name
         description: The name for the built image
         type: string
+      - name: target-name
+        description: The dockerfile target to build
+        type: string
       - name: path-to-image-context
         description: The path to the build context
         type: string
@@ -63,8 +66,6 @@ spec:
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
-        runAfter:
-          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -109,7 +110,7 @@ spec:
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
-              value: task/kaniko/0.6//kaniko.yaml
+              value: task/kaniko/0.6/kaniko.yaml
         params:
           - name: IMAGE
             value: "$(params.image-name):$(tasks.detect-tag.results.tag)"
@@ -122,6 +123,7 @@ spec:
           - name: EXTRA_ARGS
             value:
               - "--destination=$(params.image-name)" # Also write the :latest image
+              - "--target=$(params.target-name)"
               - --cache=true
               - --cache-copy-layers
               - --cache-repo=harbor.fizz.buzz/kanikocache/cache
@@ -135,8 +137,6 @@ spec:
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
-        runAfter:
-          - detect-tag
     finally:
       - name: report-success
         when:
@@ -216,6 +216,8 @@ spec:
   params:
     - name: image-name
       value: "harbor.fizz.buzz/private/webhook-bridge"
+    - name: target-name
+      value: ""
     - name: path-to-image-context
       value: .
     - name: path-to-dockerfile

.webhook_bridge/pipeline-format.yaml

@@ -14,6 +14,9 @@ spec:
       - name: image-name
         description: The name for the built image
         type: string
+      - name: target-name
+        description: The dockerfile target to build
+        type: string
       - name: path-to-image-context
         description: The path to the build context
         type: string
@@ -31,8 +34,6 @@ spec:
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
-        runAfter:
-          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -89,6 +90,7 @@ spec:
             value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
+              - "--target=$(params.target-name)"
               - --cache=true
               - --cache-copy-layers
               - --cache-repo=harbor.fizz.buzz/kanikocache/cache
@@ -102,8 +104,6 @@ spec:
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
-        runAfter:
-          - fetch-repository
       - name: run-cargo-fmt
         taskSpec:
           metadata: {}
@@ -292,7 +292,9 @@ spec:
         secretName: harbor-plain
   params:
     - name: image-name
-      value: "harbor.fizz.buzz/private/webhook-bridge-development"
+      value: "harbor.fizz.buzz/private/webhook-bridge-development-format"
+    - name: target-name
+      value: ""
     - name: path-to-image-context
       value: docker/webhook_bridge_development/
     - name: path-to-dockerfile

.webhook_bridge/pipeline-rust-clippy.yaml

@@ -14,6 +14,9 @@ spec:
       - name: image-name
         description: The name for the built image
         type: string
+      - name: target-name
+        description: The dockerfile target to build
+        type: string
       - name: path-to-image-context
         description: The path to the build context
         type: string
@@ -31,8 +34,6 @@ spec:
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
-        runAfter:
-          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -89,6 +90,7 @@ spec:
             value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
+              - "--target=$(params.target-name)"
               - --cache=true
               - --cache-copy-layers
               - --cache-repo=harbor.fizz.buzz/kanikocache/cache
@@ -102,8 +104,6 @@ spec:
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
-        runAfter:
-          - fetch-repository
       - name: run-cargo-clippy
         taskSpec:
           metadata: {}
@@ -271,7 +271,9 @@ spec:
         secretName: harbor-plain
   params:
     - name: image-name
-      value: "harbor.fizz.buzz/private/webhook-bridge-development"
+      value: "harbor.fizz.buzz/private/webhook-bridge-development-clippy"
+    - name: target-name
+      value: ""
     - name: path-to-image-context
       value: docker/webhook_bridge_development/
     - name: path-to-dockerfile

.webhook_bridge/pipeline-rust-test.yaml

@@ -14,6 +14,9 @@ spec:
       - name: image-name
         description: The name for the built image
         type: string
+      - name: target-name
+        description: The dockerfile target to build
+        type: string
       - name: path-to-image-context
         description: The path to the build context
         type: string
@@ -31,8 +34,6 @@ spec:
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
-        runAfter:
-          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -77,7 +78,7 @@ spec:
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
-              value: task/kaniko/0.6//kaniko.yaml
+              value: task/kaniko/0.6/kaniko.yaml
         params:
           - name: IMAGE
             value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
@@ -89,6 +90,7 @@ spec:
             value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
+              - "--target=$(params.target-name)"
               - --cache=true
               - --cache-copy-layers
               - --cache-repo=harbor.fizz.buzz/kanikocache/cache
@@ -102,8 +104,6 @@ spec:
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
-        runAfter:
-          - fetch-repository
       - name: run-cargo-test
         taskSpec:
           metadata: {}
@@ -261,7 +261,9 @@ spec:
         secretName: harbor-plain
   params:
     - name: image-name
-      value: "harbor.fizz.buzz/private/webhook-bridge-development"
+      value: "harbor.fizz.buzz/private/webhook-bridge-development-test"
+    - name: target-name
+      value: ""
     - name: path-to-image-context
       value: docker/webhook_bridge_development/
     - name: path-to-dockerfile

.webhook_bridge/pipeline-semver.yaml

@@ -26,7 +26,7 @@ spec:
     tasks:
       - name: calculate-tag
         runAfter:
-          - report-pending
+          - fetch-repository
         workspaces:
           - name: source
             workspace: git-source
@@ -77,8 +77,6 @@ spec:
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
-        runAfter:
-          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"

.webhook_bridge/webhook_bridge.toml

@@ -26,6 +26,6 @@ version = "0.0.1"
 
 [[push]]
   name = "build"
-  source = "pipeline-build.yaml"
+  source = "pipeline-build-semver.yaml"
   clone_uri = "git@code.fizz.buzz:talexander/webhook_bridge.git"
   branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ]

Cargo.toml

@@ -1,5 +1,3 @@
-cargo-features = ["codegen-backend"]
-
 [package]
 name = "webhook_bridge"
 version = "0.0.1"
@@ -61,10 +59,3 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
 inherits = "release"
 lto = true
 strip = "symbols"
-
-[profile.dev]
-codegen-backend = "cranelift"
-
-[profile.dev.package."*"]
-codegen-backend = "llvm"
-opt-level = 3

docker/webhook_bridge_development/Dockerfile

@@ -2,6 +2,5 @@ FROM rustlang/rust:nightly-alpine3.20 AS builder
 
 RUN apk add --no-cache musl-dev pkgconfig libressl3.8-libssl libressl-dev
 RUN cargo install --locked --no-default-features --features ci-autoclean cargo-cache
-RUN rustup component add rustc-codegen-cranelift
 RUN rustup component add rustfmt
 RUN rustup component add clippy

src/app_state.rs

@@ -1,13 +1,7 @@
 use std::collections::HashSet;
 use std::sync::Arc;
 
-use kube::Client;
-
-use crate::gitea_client::GiteaClient;
-
 #[derive(Clone)]
 pub(crate) struct AppState {
-    pub(crate) kubernetes_client: Client,
-    pub(crate) gitea: GiteaClient,
     pub(crate) allowed_repos: Arc<HashSet<String>>,
 }

src/lib.rs

@@ -47,14 +47,6 @@ pub async fn init_tracing() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 pub async fn launch_server() -> Result<(), Box<dyn std::error::Error>> {
-    let kubernetes_client: Client = Client::try_default()
-        .await
-        .expect("Set KUBECONFIG to a valid kubernetes config.");
-
-    let gitea_api_root = std::env::var("WEBHOOK_BRIDGE_API_ROOT")?;
-    let gitea_api_token = std::env::var("WEBHOOK_BRIDGE_OAUTH_TOKEN")?;
-    let gitea = GiteaClient::new(gitea_api_root, gitea_api_token);
-
     let allowed_repos = std::env::var("WEBHOOK_BRIDGE_REPO_WHITELIST")?;
     let allowed_repos: HashSet<_> = allowed_repos
         .split(",")
@@ -73,8 +65,6 @@ pub async fn launch_server() -> Result<(), Box<dyn std::error::Error>> {
             TimeoutLayer::new(Duration::from_secs(600)),
         ))
         .with_state(AppState {
-            kubernetes_client,
-            gitea,
             allowed_repos: Arc::new(allowed_repos),
         });
 

src/webhook.rs

@@ -42,24 +42,54 @@ pub(crate) async fn hook(
     debug!("REQ: {:?}", payload);
     match payload {
         HookRequest::Push(webhook_payload) => {
-            handle_push(
+            let kubernetes_client: kube::Client = kube::Client::try_default()
-                state.gitea,
-                state.kubernetes_client,
-                state.allowed_repos.borrow(),
-                webhook_payload,
-            )
                 .await
-            .expect("Failed to handle push event.");
+                .expect("Set KUBECONFIG to a valid kubernetes config.");
-            (
+
+            let gitea_api_root = std::env::var("WEBHOOK_BRIDGE_API_ROOT");
+            let gitea_api_token = std::env::var("WEBHOOK_BRIDGE_OAUTH_TOKEN");
+            let (gitea_api_root, gitea_api_token) = match (gitea_api_root, gitea_api_token) {
+                (Ok(r), Ok(t)) => (r, t),
+                _ => {
+                    return (
                         StatusCode::OK,
                         Json(HookResponse {
                             ok: true,
                             message: None,
                         }),
+                    );
+                }
+            };
+            let gitea = GiteaClient::new(gitea_api_root, gitea_api_token);
+
+            let push_result = handle_push(
+                gitea,
+                kubernetes_client,
+                state.allowed_repos.borrow(),
+                webhook_payload,
             )
+            .await;
+            match push_result {
+                Ok(_) => (
+                    StatusCode::OK,
+                    Json(HookResponse {
+                        ok: true,
+                        message: None,
+                    }),
+                ),
+                Err(_) => (
+                    // StatusCode::INTERNAL_SERVER_ERROR,
+                    StatusCode::OK,
+                    Json(HookResponse {
+                        ok: false,
+                        message: Some("Failed to handle push event.".to_string()),
+                    }),
+                ),
+            }
         }
         HookRequest::Unrecognized(payload) => (
-            StatusCode::BAD_REQUEST,
+            // StatusCode::BAD_REQUEST,
+            StatusCode::OK,
             Json(HookResponse {
                 ok: false,
                 message: Some(format!("unrecognized event type: {payload}")),
@@ -146,9 +176,9 @@ where
 }
 
 async fn check_hash(body: Bytes, secret: String, signature: Vec<u8>) -> Result<Bytes, Response> {
-    tracing::info!("Checking signature {:02x?}", signature.as_slice());
+    tracing::debug!("Checking signature {:02x?}", signature.as_slice());
-    tracing::info!("Using secret {:?}", secret);
+    // tracing::info!("Using secret {:?}", secret);
-    tracing::info!("and body {}", general_purpose::STANDARD.encode(&body));
+    tracing::debug!("and body {}", general_purpose::STANDARD.encode(&body));
     let mut mac = HmacSha256::new_from_slice(secret.as_bytes())
         .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()).into_response())?;
     mac.update(&body);