From 4521135b29cca7cc521dbb4e832ce424acf29996 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 2 May 2026 17:50:49 -0400 Subject: [PATCH] Update to the latest catalog. --- .dockerignore | 1 + .webhook_bridge/pipeline-build-semver.yaml | 8 +- .webhook_bridge/pipeline-format.yaml | 10 +- .webhook_bridge/pipeline-rust-clippy.yaml | 8 +- .webhook_bridge/pipeline-rust-test.yaml | 8 +- .webhook_bridge/pipeline-semver.yaml | 8 +- Cargo.lock | 106 ++++----------------- Cargo.toml | 4 +- local_payload.json | 68 +++++++------ run.bash | 11 ++- run_docker.bash | 16 ++++ test_webhook.bash | 13 ++- 12 files changed, 113 insertions(+), 148 deletions(-) create mode 100755 run_docker.bash diff --git a/.dockerignore b/.dockerignore index 30bf250..7409b45 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,3 +2,4 @@ target/ docker/ .dockerignore +*.bash diff --git a/.webhook_bridge/pipeline-build-semver.yaml b/.webhook_bridge/pipeline-build-semver.yaml index 4c5a6c0..1e6892c 100644 --- a/.webhook_bridge/pipeline-build-semver.yaml +++ b/.webhook_bridge/pipeline-build-semver.yaml @@ -63,7 +63,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -88,7 +88,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/git-clone/0.9/git-clone.yaml workspaces: @@ -181,7 +181,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -210,7 +210,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: diff --git a/.webhook_bridge/pipeline-format.yaml b/.webhook_bridge/pipeline-format.yaml index e9a61bb..d81d643 100644 --- a/.webhook_bridge/pipeline-format.yaml +++ b/.webhook_bridge/pipeline-format.yaml @@ -31,7 +31,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -56,7 +56,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/git-clone/0.9/git-clone.yaml workspaces: @@ -184,7 +184,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/git-cli/0.4/git-cli.yaml params: @@ -220,7 +220,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -249,7 +249,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: diff --git a/.webhook_bridge/pipeline-rust-clippy.yaml b/.webhook_bridge/pipeline-rust-clippy.yaml index 4d9cf05..b0366c0 100644 --- a/.webhook_bridge/pipeline-rust-clippy.yaml +++ b/.webhook_bridge/pipeline-rust-clippy.yaml @@ -31,7 +31,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -56,7 +56,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/git-clone/0.9/git-clone.yaml workspaces: @@ -199,7 +199,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -228,7 +228,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: diff --git a/.webhook_bridge/pipeline-rust-test.yaml b/.webhook_bridge/pipeline-rust-test.yaml index 278ba71..05ff873 100644 --- a/.webhook_bridge/pipeline-rust-test.yaml +++ b/.webhook_bridge/pipeline-rust-test.yaml @@ -31,7 +31,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -56,7 +56,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/git-clone/0.9/git-clone.yaml workspaces: @@ -189,7 +189,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -218,7 +218,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: diff --git a/.webhook_bridge/pipeline-semver.yaml b/.webhook_bridge/pipeline-semver.yaml index 285321a..69ac8fd 100644 --- a/.webhook_bridge/pipeline-semver.yaml +++ b/.webhook_bridge/pipeline-semver.yaml @@ -74,7 +74,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -99,7 +99,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/git-clone/0.9/git-clone.yaml workspaces: @@ -124,7 +124,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -153,7 +153,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: df36b3853a5657fd883015cdbf07ad6466918acf + value: f914437a46978b95f325f68d791dcf1a35738f60 - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: diff --git a/Cargo.lock b/Cargo.lock index 015982e..01ac2d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -1039,11 +1039,11 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "matchers" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] @@ -1101,16 +1101,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - [[package]] name = "num-traits" version = "0.2.19" @@ -1198,12 +1188,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "parking" version = "2.2.0" @@ -1403,17 +1387,8 @@ checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] @@ -1424,15 +1399,9 @@ checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.4" @@ -2095,9 +2064,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "log", "pin-project-lite", @@ -2107,9 +2076,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", @@ -2118,41 +2087,26 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", ] [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" dependencies = [ "matchers", - "nu-ansi-term", "once_cell", - "regex", + "regex-automata", "sharded-slab", - "smallvec", "thread_local", "tracing", "tracing-core", - "tracing-log", ] [[package]] @@ -2217,12 +2171,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - [[package]] name = "vcpkg" version = "0.2.15" @@ -2350,28 +2298,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-sys" version = "0.48.0" diff --git a/Cargo.toml b/Cargo.toml index 8068166..99dfd65 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,8 +52,8 @@ sha2 = "0.10.8" tokio = { version = "1.38.0", default-features = false, features = ["macros", "process", "rt-multi-thread", "signal"] } toml = { version = "0.8.19", default-features = false, features = ["display", "parse"] } tower-http = { version = "0.5.2", default-features = false, features = ["trace", "timeout"] } -tracing = { version = "0.1.40", default-features = false, features = ["attributes", "std", "tracing-attributes", "async-await"] } -tracing-subscriber = { version = "0.3.18", default-features = false, features = ["alloc", "ansi", "fmt", "nu-ansi-term", "registry", "sharded-slab", "smallvec", "std", "thread_local", "tracing-log", "env-filter"] } +tracing = { version = "0.1.44", default-features = false, features = [] } +tracing-subscriber = { version = "0.3.23", default-features = false, features = ["env-filter", "fmt"] } [profile.release-lto] inherits = "release" diff --git a/local_payload.json b/local_payload.json index a8e817f..d72c95f 100644 --- a/local_payload.json +++ b/local_payload.json @@ -1,13 +1,13 @@ { - "ref": "refs/heads/kubernetes", - "before": "e767de378a478fa41615cee71a9ba04830520d7d", - "after": "c83b8afd7910f25eb94d90325f3765b5d19900e4", - "compare_url": "https://code.fizz.buzz/talexander/machine_setup/compare/e767de378a478fa41615cee71a9ba04830520d7d...c83b8afd7910f25eb94d90325f3765b5d19900e4", + "ref": "refs/heads/main", + "before": "1f52dd8995987337a3a33ce675625647545490c2", + "after": "f55834712245bd546a5ca982d95ecf47669ba4ab", + "compare_url": "https://code.fizz.buzz/talexander/webhook_bridge/compare/1f52dd8995987337a3a33ce675625647545490c2...f55834712245bd546a5ca982d95ecf47669ba4ab", "commits": [ { - "id": "c83b8afd7910f25eb94d90325f3765b5d19900e4", - "message": "Delete images after 24 hours of being unused.\n", - "url": "https://code.fizz.buzz/talexander/machine_setup/commit/c83b8afd7910f25eb94d90325f3765b5d19900e4", + "id": "f55834712245bd546a5ca982d95ecf47669ba4ab", + "message": "Update to the latest catalog.\n", + "url": "https://code.fizz.buzz/talexander/webhook_bridge/commit/f55834712245bd546a5ca982d95ecf47669ba4ab", "author": { "name": "Tom Alexander", "email": "tom@fizz.buzz", @@ -19,19 +19,25 @@ "username": "" }, "verification": null, - "timestamp": "2026-05-02T15:53:35-04:00", + "timestamp": "2026-05-02T17:50:49-04:00", "added": [], "removed": [], "modified": [ - "nix/kubernetes/roles/kubelet/default.nix" + ".webhook_bridge/pipeline-build-semver.yaml", + ".webhook_bridge/pipeline-format.yaml", + ".webhook_bridge/pipeline-rust-clippy.yaml", + ".webhook_bridge/pipeline-rust-test.yaml", + ".webhook_bridge/pipeline-semver.yaml", + "local_payload.json", + "run.bash" ] } ], "total_commits": 1, "head_commit": { - "id": "c83b8afd7910f25eb94d90325f3765b5d19900e4", - "message": "Delete images after 24 hours of being unused.\n", - "url": "https://code.fizz.buzz/talexander/machine_setup/commit/c83b8afd7910f25eb94d90325f3765b5d19900e4", + "id": "f55834712245bd546a5ca982d95ecf47669ba4ab", + "message": "Update to the latest catalog.\n", + "url": "https://code.fizz.buzz/talexander/webhook_bridge/commit/f55834712245bd546a5ca982d95ecf47669ba4ab", "author": { "name": "Tom Alexander", "email": "tom@fizz.buzz", @@ -43,15 +49,21 @@ "username": "" }, "verification": null, - "timestamp": "2026-05-02T15:53:35-04:00", + "timestamp": "2026-05-02T17:50:49-04:00", "added": [], "removed": [], "modified": [ - "nix/kubernetes/roles/kubelet/default.nix" + ".webhook_bridge/pipeline-build-semver.yaml", + ".webhook_bridge/pipeline-format.yaml", + ".webhook_bridge/pipeline-rust-clippy.yaml", + ".webhook_bridge/pipeline-rust-test.yaml", + ".webhook_bridge/pipeline-semver.yaml", + "local_payload.json", + "run.bash" ] }, "repository": { - "id": 5, + "id": 21, "owner": { "id": 1, "login": "talexander", @@ -77,22 +89,22 @@ "starred_repos_count": 0, "username": "talexander" }, - "name": "machine_setup", - "full_name": "talexander/machine_setup", - "description": "", + "name": "webhook_bridge", + "full_name": "talexander/webhook_bridge", + "description": "A server that receives webhooks from gitea and fires off Tekton jobs in response.", "empty": false, "private": false, "fork": false, "template": false, "mirror": false, - "size": 9940, + "size": 193, "language": "", - "languages_url": "https://code.fizz.buzz/api/v1/repos/talexander/machine_setup/languages", - "html_url": "https://code.fizz.buzz/talexander/machine_setup", - "url": "https://code.fizz.buzz/api/v1/repos/talexander/machine_setup", + "languages_url": "https://code.fizz.buzz/api/v1/repos/talexander/webhook_bridge/languages", + "html_url": "https://code.fizz.buzz/talexander/webhook_bridge", + "url": "https://code.fizz.buzz/api/v1/repos/talexander/webhook_bridge", "link": "", - "ssh_url": "git@git.example.com:talexander/machine_setup.git", - "clone_url": "https://code.fizz.buzz/talexander/machine_setup.git", + "ssh_url": "git@git.example.com:talexander/webhook_bridge.git", + "clone_url": "https://code.fizz.buzz/talexander/webhook_bridge.git", "original_url": "", "website": "", "stars_count": 0, @@ -103,8 +115,8 @@ "release_counter": 0, "default_branch": "main", "archived": false, - "created_at": "2023-07-05T22:53:26Z", - "updated_at": "2026-05-02T19:53:11Z", + "created_at": "2024-07-14T18:48:52Z", + "updated_at": "2026-05-02T22:11:33Z", "archived_at": "1970-01-01T00:00:00Z", "permissions": { "admin": true, @@ -143,7 +155,9 @@ "object_format_name": "sha1", "mirror_updated": "0001-01-01T00:00:00Z", "topics": [], - "licenses": [] + "licenses": [ + "0BSD" + ] }, "pusher": { "id": 1, diff --git a/run.bash b/run.bash index 73e2aca..d778381 100755 --- a/run.bash +++ b/run.bash @@ -4,4 +4,13 @@ set -euo pipefail IFS=$'\n\t' DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -exec env RUST_LOG=webhook_bridge=DEBUG WEBHOOK_BRIDGE_API_ROOT="https://code.fizz.buzz/api" WEBHOOK_BRIDGE_HMAC_SECRET=$(cat /bridge/git/mrmanager/k8s/webhook_bridge/secrets/webhook-bridge/webhook-bridge/HMAC_TOKEN) WEBHOOK_BRIDGE_OAUTH_TOKEN=$(cat /bridge/git/mrmanager/k8s/webhook_bridge/secrets/webhook-bridge/webhook-bridge/OAUTH_TOKEN) WEBHOOK_BRIDGE_REPO_WHITELIST="talexander/webhook_bridge,talexander/homepage,talexander/natter,talexander/poudboot,talexander/ta_waybar_pipewire,talexander/organic" cargo run "${@}" +function main { + exec env RUST_LOG=webhookbridge=DEBUG WEBHOOK_BRIDGE_API_ROOT="https://code.fizz.buzz/api" WEBHOOK_BRIDGE_HMAC_SECRET="$(decrypt_k8s_secret -n webhook-bridge webhook-bridge | jq -r '.HMAC_TOKEN')" WEBHOOK_BRIDGE_OAUTH_TOKEN="$(decrypt_k8s_secret -n webhook-bridge webhook-bridge | jq -r '.OAUTH_TOKEN')" WEBHOOK_BRIDGE_REPO_WHITELIST="talexander/webhook_bridge,talexander/homepage,talexander/natter,talexander/poudboot,talexander/ta_waybar_pipewire,talexander/organic" cargo run "${@}" + #"${@}" +} + +function decrypt_k8s_secret { + kubectl get secret -o json "${@}" | jq '.data[] |= @base64d | .data' +} + +main "${@}" diff --git a/run_docker.bash b/run_docker.bash new file mode 100755 index 0000000..49e1ff3 --- /dev/null +++ b/run_docker.bash @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +# +set -euo pipefail +IFS=$'\n\t' +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +function main { + make -C docker/webhook_bridge build + docker run --rm -i -t -p 9988:9988 -e RUST_LOG=webhookbridge=DEBUG -e WEBHOOK_BRIDGE_API_ROOT="https://code.fizz.buzz/api" -e WEBHOOK_BRIDGE_HMAC_SECRET="$(decrypt_k8s_secret -n webhook-bridge webhook-bridge | jq -r '.HMAC_TOKEN')" -e WEBHOOK_BRIDGE_OAUTH_TOKEN="$(decrypt_k8s_secret -n webhook-bridge webhook-bridge | jq -r '.OAUTH_TOKEN')" -e WEBHOOK_BRIDGE_REPO_WHITELIST="talexander/webhook_bridge,talexander/homepage,talexander/natter,talexander/poudboot,talexander/ta_waybar_pipewire,talexander/organic" webhook-bridge:latest +} + +function decrypt_k8s_secret { + kubectl get secret -o json "${@}" | jq '.data[] |= @base64d | .data' +} + +main "${@}" diff --git a/test_webhook.bash b/test_webhook.bash index 4ce1167..ea16ca9 100755 --- a/test_webhook.bash +++ b/test_webhook.bash @@ -5,14 +5,13 @@ IFS=$'\n\t' DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" function main() { - local payload sha256signature sha1signature - payload=$(base64 -d <