Generate names for pipeline runs.
Some checks failed
format Build format has succeeded
clippy Build clippy has failed
rust-test Build rust-test has succeeded

This commit is contained in:
Tom Alexander 2024-09-28 21:50:50 -04:00
parent 470031251c
commit efe37f020a
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
4 changed files with 108 additions and 26 deletions

View File

@ -1,6 +1,6 @@
FROM rustlang/rust:nightly-alpine3.19 AS builder FROM rustlang/rust:nightly-alpine3.20 AS builder
#openssl-dev
RUN apk add --no-cache musl-dev pkgconfig 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 cargo install --locked --no-default-features --features ci-autoclean cargo-cache
RUN rustup component add rustfmt RUN rustup component add rustfmt
RUN rustup component add clippy RUN rustup component add clippy

View File

@ -1,13 +1,13 @@
{ {
"ref": "refs/heads/main", "ref": "refs/heads/main",
"before": "d5902e3e7f62cbd86e095437ccc33e945fcb0791", "before": "b8444344c4821e87a894cd195f8bec39cd501f68",
"after": "b8444344c4821e87a894cd195f8bec39cd501f68", "after": "470031251cc4f7d70227140f7edde09b53c372c4",
"compare_url": "https://code.fizz.buzz/talexander/webhook_bridge/compare/d5902e3e7f62cbd86e095437ccc33e945fcb0791...b8444344c4821e87a894cd195f8bec39cd501f68", "compare_url": "https://code.fizz.buzz/talexander/webhook_bridge/compare/b8444344c4821e87a894cd195f8bec39cd501f68...470031251cc4f7d70227140f7edde09b53c372c4",
"commits": [ "commits": [
{ {
"id": "b8444344c4821e87a894cd195f8bec39cd501f68", "id": "470031251cc4f7d70227140f7edde09b53c372c4",
"message": "Update PipelineRun to tekton v1 from v1beta.\n", "message": "Remove prettier.\n",
"url": "https://code.fizz.buzz/talexander/webhook_bridge/commit/b8444344c4821e87a894cd195f8bec39cd501f68", "url": "https://code.fizz.buzz/talexander/webhook_bridge/commit/470031251cc4f7d70227140f7edde09b53c372c4",
"author": { "author": {
"name": "Tom Alexander", "name": "Tom Alexander",
"email": "tom@fizz.buzz", "email": "tom@fizz.buzz",
@ -19,21 +19,52 @@
"username": "" "username": ""
}, },
"verification": null, "verification": null,
"timestamp": "2024-09-28T20:33:35-04:00", "timestamp": "2024-09-28T21:46:25-04:00",
"added": [], "added": [],
"removed": [], "removed": [],
"modified": [ "modified": [
".webhook_bridge/pipeline-format.yaml", ".webhook_bridge/pipeline-format.yaml",
".webhook_bridge/pipeline-rust-clippy.yaml", "docker/webhook_bridge_development/Dockerfile"
".webhook_bridge/pipeline-rust-test.yaml" ]
},
{
"id": "ed1e1c08d08eb271fa7af35c22b4c9bfbc0d6224",
"message": "Create PipelineRun in response to webhook triggers.\n",
"url": "https://code.fizz.buzz/talexander/webhook_bridge/commit/ed1e1c08d08eb271fa7af35c22b4c9bfbc0d6224",
"author": {
"name": "Tom Alexander",
"email": "tom@fizz.buzz",
"username": ""
},
"committer": {
"name": "Tom Alexander",
"email": "tom@fizz.buzz",
"username": ""
},
"verification": null,
"timestamp": "2024-09-28T19:43:26-04:00",
"added": [
"example_webhook_payload.json",
"src/kubernetes.rs"
],
"removed": [
"example_pipeline_run.json",
"example_pipeline_run.yaml"
],
"modified": [
"src/crd_pipeline_run.rs",
"src/gitea_client/mod.rs",
"src/hook_push.rs",
"src/in_repo_config.rs",
"src/main.rs"
] ]
} }
], ],
"total_commits": 1, "total_commits": 2,
"head_commit": { "head_commit": {
"id": "b8444344c4821e87a894cd195f8bec39cd501f68", "id": "470031251cc4f7d70227140f7edde09b53c372c4",
"message": "Update PipelineRun to tekton v1 from v1beta.\n", "message": "Remove prettier.\n",
"url": "https://code.fizz.buzz/talexander/webhook_bridge/commit/b8444344c4821e87a894cd195f8bec39cd501f68", "url": "https://code.fizz.buzz/talexander/webhook_bridge/commit/470031251cc4f7d70227140f7edde09b53c372c4",
"author": { "author": {
"name": "Tom Alexander", "name": "Tom Alexander",
"email": "tom@fizz.buzz", "email": "tom@fizz.buzz",
@ -45,13 +76,12 @@
"username": "" "username": ""
}, },
"verification": null, "verification": null,
"timestamp": "2024-09-28T20:33:35-04:00", "timestamp": "2024-09-28T21:46:25-04:00",
"added": [], "added": [],
"removed": [], "removed": [],
"modified": [ "modified": [
".webhook_bridge/pipeline-format.yaml", ".webhook_bridge/pipeline-format.yaml",
".webhook_bridge/pipeline-rust-clippy.yaml", "docker/webhook_bridge_development/Dockerfile"
".webhook_bridge/pipeline-rust-test.yaml"
] ]
}, },
"repository": { "repository": {
@ -88,7 +118,7 @@
"template": false, "template": false,
"parent": null, "parent": null,
"mirror": false, "mirror": false,
"size": 286, "size": 293,
"language": "", "language": "",
"languages_url": "https://code.fizz.buzz/api/v1/repos/talexander/webhook_bridge/languages", "languages_url": "https://code.fizz.buzz/api/v1/repos/talexander/webhook_bridge/languages",
"html_url": "https://code.fizz.buzz/talexander/webhook_bridge", "html_url": "https://code.fizz.buzz/talexander/webhook_bridge",
@ -107,7 +137,7 @@
"default_branch": "main", "default_branch": "main",
"archived": false, "archived": false,
"created_at": "2024-07-14T18:48:52Z", "created_at": "2024-07-14T18:48:52Z",
"updated_at": "2024-09-28T23:43:53Z", "updated_at": "2024-09-29T00:34:06Z",
"archived_at": "1970-01-01T00:00:00Z", "archived_at": "1970-01-01T00:00:00Z",
"permissions": { "permissions": {
"admin": true, "admin": true,

View File

@ -1,7 +1,12 @@
use std::borrow::Borrow;
use std::borrow::Cow;
use kube::api::PostParams; use kube::api::PostParams;
use kube::Api; use kube::Api;
use kube::CustomResourceExt; use kube::CustomResourceExt;
use regex::Regex;
use tracing::debug; use tracing::debug;
use tracing::info;
use crate::crd_pipeline_run::PipelineParam; use crate::crd_pipeline_run::PipelineParam;
use crate::crd_pipeline_run::PipelineRun; use crate::crd_pipeline_run::PipelineRun;
@ -16,7 +21,7 @@ pub(crate) async fn run_pipelines(
) -> Result<(), Box<dyn std::error::Error>> { ) -> Result<(), Box<dyn std::error::Error>> {
let jobs: Api<PipelineRun> = Api::namespaced(kubernetes_client, "lighthouse"); let jobs: Api<PipelineRun> = Api::namespaced(kubernetes_client, "lighthouse");
// let jobs: Api<PipelineRun> = Api::default_namespaced(kubernetes_client); // let jobs: Api<PipelineRun> = Api::default_namespaced(kubernetes_client);
tracing::info!("Using crd: {}", serde_json::to_string(&PipelineRun::crd())?); tracing::debug!("Using crd: {}", serde_json::to_string(&PipelineRun::crd())?);
for mut pipeline in pipelines { for mut pipeline in pipelines {
debug!("Kicking off {}", pipeline.name); debug!("Kicking off {}", pipeline.name);
@ -26,7 +31,7 @@ pub(crate) async fn run_pipelines(
if let Some(param_list) = pipeline.pipeline.spec.params.as_mut() { if let Some(param_list) = pipeline.pipeline.spec.params.as_mut() {
param_list.push(PipelineParam { param_list.push(PipelineParam {
name: Some("JOB_NAME".to_owned()), name: Some("JOB_NAME".to_owned()),
value: Some(serde_json::Value::String(pipeline.name)), value: Some(serde_json::Value::String(pipeline.name.clone())),
}); });
param_list.push(PipelineParam { param_list.push(PipelineParam {
name: Some("REPO_OWNER".to_owned()), name: Some("REPO_OWNER".to_owned()),
@ -61,9 +66,55 @@ pub(crate) async fn run_pipelines(
)), )),
}); });
} }
if pipeline.pipeline.metadata.generate_name.is_none()
&& pipeline.pipeline.metadata.name.is_some()
{
std::mem::swap(
&mut pipeline.pipeline.metadata.generate_name,
&mut pipeline.pipeline.metadata.name,
);
if let Some(ref mut name) = pipeline.pipeline.metadata.generate_name {
let mut new_name_stub = sanitize_kubernetes_identifier(format!(
"{}-{}-{}",
name,
hook.get_repo_name()?,
hook.get_repo_owner()?
))?
.into_owned();
new_name_stub.truncate(63);
(*name) = new_name_stub + "-";
debug!("Using generate name: {}", name);
}
}
let pp = PostParams::default(); let pp = PostParams::default();
let created_run = jobs.create(&pp, &pipeline.pipeline).await?; let created_run = jobs.create(&pp, &pipeline.pipeline).await?;
info!("Created PipelineRun {:?}", created_run.metadata.name);
} }
Ok(()) Ok(())
} }
fn sanitize_kubernetes_identifier<'a, O: Into<Cow<'a, str>>>(
original: O,
) -> Result<Cow<'a, str>, Box<dyn std::error::Error>> {
let validate_identifier_regex =
Regex::new(r"[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*")?;
let original = original.into();
if !validate_identifier_regex.is_match(original.borrow()) {
return Ok(original);
}
let mut clean_identifier = String::with_capacity(original.len());
for c in original.chars() {
match c {
'a'..='z' | 'A'..='Z' | '0'..='9' | '.' | '-' => {
clean_identifier.push(c);
}
_ => {
clean_identifier.push('-');
}
};
}
Ok(Cow::Owned(clean_identifier))
}

View File

@ -1,4 +1,5 @@
#![forbid(unsafe_code)] #![forbid(unsafe_code)]
use std::borrow::Borrow;
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
@ -23,6 +24,7 @@ use self::discovery::discover_matching_push_triggers;
use self::discovery::discover_webhook_bridge_config; use self::discovery::discover_webhook_bridge_config;
use self::gitea_client::GiteaClient; use self::gitea_client::GiteaClient;
use self::hook_push::HookPush; use self::hook_push::HookPush;
use self::hook_push::PipelineParamters;
use self::in_repo_config::InRepoConfig; use self::in_repo_config::InRepoConfig;
use self::kubernetes::run_pipelines; use self::kubernetes::run_pipelines;
use self::webhook::hook; use self::webhook::hook;
@ -58,11 +60,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let gitea_api_token = std::env::var("WEBHOOK_BRIDGE_OAUTH_TOKEN")?; let gitea_api_token = std::env::var("WEBHOOK_BRIDGE_OAUTH_TOKEN")?;
let gitea = GiteaClient::new(gitea_api_root, gitea_api_token); let gitea = GiteaClient::new(gitea_api_root, gitea_api_token);
let webhook_payload: HookPush = serde_json::from_str(EXAMPLE_WEBHOOK_PAYLOAD)?;
let repo_tree = gitea let repo_tree = gitea
.get_tree( .get_tree(
"talexander", "talexander",
"webhook_bridge", "webhook_bridge",
"b8444344c4821e87a894cd195f8bec39cd501f68", webhook_payload.get_pull_base_sha()?,
) )
.await?; .await?;
let in_repo_config = discover_webhook_bridge_config(&gitea, &repo_tree).await?; let in_repo_config = discover_webhook_bridge_config(&gitea, &repo_tree).await?;
@ -70,8 +73,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
discover_matching_push_triggers(&gitea, &repo_tree, "refs/heads/main", &in_repo_config) discover_matching_push_triggers(&gitea, &repo_tree, "refs/heads/main", &in_repo_config)
.await?; .await?;
let webhook_payload: HookPush = serde_json::from_str(EXAMPLE_WEBHOOK_PAYLOAD)?;
run_pipelines(webhook_payload, pipelines, kubernetes_client).await?; run_pipelines(webhook_payload, pipelines, kubernetes_client).await?;
// let app = Router::new() // let app = Router::new()