Skip to content

Commit

Permalink
Move runner creation to builder pattern
Browse files Browse the repository at this point in the history 
To allow users to optionally set a custom system_id start moving the
runner creation to a builder pattern. This will also come in handy when
starting to add more version information for the runner.

Signed-off-by: Sjoerd Simons <[email protected]>
  • Loading branch information
@sjoerdsimons
sjoerdsimons committed Feb 17, 2024
1 parent 0ff8566 commit 3396f2a
Show file tree
Hide file tree
Showing 6 changed files with 165 additions and 131 deletions.
8 changes: 6 additions & 2 deletions gitlab-runner/examples/demo-runner.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ use std::io::Read;
use futures::io::Cursor;
use futures::AsyncRead;
use gitlab_runner::job::Job;
use gitlab_runner::{outputln, GitlabLayer, JobHandler, JobResult, Phase, Runner, UploadableFile};
use gitlab_runner::{
outputln, GitlabLayer, JobHandler, JobResult, Phase, RunnerBuilder, UploadableFile,
};
use serde::Deserialize;
use structopt::StructOpt;
use tokio::signal::unix::{signal, SignalKind};
Expand Down Expand Up @@ -202,7 +204,9 @@ async fn main() {

info!("Using {} as build storage prefix", dir.path().display());

let mut runner = Runner::new(opts.server, opts.token, dir.path().to_path_buf(), jobs);
let mut runner = RunnerBuilder::new(opts.server, opts.token, dir.path(), jobs)
.build()
.await;

let mut term = signal(SignalKind::terminate()).expect("Failed to register signal handler");
let mut int = signal(SignalKind::interrupt()).expect("Failed to register signal handler");
Expand Down
69 changes: 11 additions & 58 deletions gitlab-runner/src/client.rs
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
use hmac::{Hmac, Mac};
use rand::distributions::{Alphanumeric, DistString};
use reqwest::multipart::{Form, Part};
use reqwest::{Body, StatusCode};
use serde::de::Deserializer;
use serde::{Deserialize, Serialize};
use serde_json::Value as JsonValue;
use std::collections::HashMap;
use std::fmt::Write;
use std::fs::File;
use std::io::Read;
use std::ops::Not;
use std::time::Duration;
use thiserror::Error;
use tokio::io::{AsyncWrite, AsyncWriteExt};
use tracing::warn;
use url::Url;
use zip::result::ZipError;

Expand Down Expand Up @@ -286,8 +280,7 @@ pub(crate) struct Client {
}

impl Client {
pub fn new(url: Url, token: String) -> Self {
let system_id = Self::generate_system_id();
pub fn new(url: Url, token: String, system_id: String) -> Self {
Self {
client: reqwest::Client::new(),
url,
Expand All @@ -296,54 +289,6 @@ impl Client {
}
}

fn generate_system_id_from_machine_id() -> Option<String> {
// Ideally this would be async for consistency, but that's for the next API bump really. In
// practise the client will be created at the start of the runner and the amount read is
// really tiny so blocking is not a real issue.
let mut f = match File::open("/etc/machine-id") {
Ok(f) => f,
Err(e) if e.kind() == std::io::ErrorKind::NotFound => return None,
Err(e) => {
warn!("Failed to open machine-id: {e}");
return None;
}
};

let mut id = [0u8; 32];
match f.read(&mut id) {
Ok(r) if r != 32 => {
warn!("Short read from machine-id (only {} bytes)", r);
return None;
}
Err(e) => {
warn!("Failed to read from machine-id: {e}");
return None;
}
_ => (),
};

// Infallable as a hmac can take a key of any size
let mut mac = Hmac::<sha2::Sha256>::new_from_slice(&id).unwrap();
mac.update(b"gitlab-runner");

let mut system_id = String::from("s_");
for b in &mac.finalize().into_bytes()[0..6] {
// Infallable: writing to a string
write!(&mut system_id, "{:02x}", b).unwrap();
}
Some(system_id)
}

fn generate_system_id() -> String {
if let Some(system_id) = Self::generate_system_id_from_machine_id() {
system_id
} else {
let mut system_id = String::from("r_");
Alphanumeric.append_string(&mut rand::thread_rng(), &mut system_id, 12);
system_id
}
}

pub async fn request_job(&self) -> Result<Option<JobResponse>, Error> {
let request = JobRequest {
token: &self.token,
Expand Down Expand Up @@ -584,7 +529,11 @@ mod test {
async fn no_job() {
let mock = GitlabRunnerMock::start().await;

let client = Client::new(mock.uri(), mock.runner_token().to_string());
let client = Client::new(
mock.uri(),
mock.runner_token().to_string(),
"s_ystem_id1234".to_string(),
);

let job = client.request_job().await.unwrap();

Expand All @@ -596,7 +545,11 @@ mod test {
let mock = GitlabRunnerMock::start().await;
mock.add_dummy_job("process job".to_string());

let client = Client::new(mock.uri(), mock.runner_token().to_string());
let client = Client::new(
mock.uri(),
mock.runner_token().to_string(),
"s_ystem_id1234".to_string(),
);

if let Some(job) = client.request_job().await.unwrap() {
client
Expand Down
177 changes: 133 additions & 44 deletions gitlab-runner/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//! runner can be implement as such:
//!
//! ```rust,no_run
//! use gitlab_runner::{outputln, GitlabLayer, Runner, JobHandler, JobResult, Phase};
//! use gitlab_runner::{outputln, GitlabLayer, RunnerBuilder, JobHandler, JobResult, Phase};
//! use tracing_subscriber::prelude::*;
//! use std::path::PathBuf;
//!
Expand Down Expand Up @@ -41,11 +41,14 @@
//! )
//! .with(layer)
//! .init();
//! let mut runner = Runner::new(
//! "https://gitlab.example.com".try_into().unwrap(),
//! "runner token".to_owned(),
//! PathBuf::from("/tmp"),
//! jobs);
//! let mut runner = RunnerBuilder::new(
//! "https://gitlab.example.com".try_into().expect("failed to parse url"),
//! "runner token",
//! "/tmp",
//! jobs
//! )
//! .build()
//! .await;
//! runner.run(move | _job | async move { Ok(Run{}) }, 16).await.unwrap();
//! }
//! ```
Expand Down Expand Up @@ -82,19 +85,27 @@ use crate::client::Client;
mod run;
use crate::run::Run;
pub mod job;
use hmac::Hmac;
use hmac::Mac;
use job::{Job, JobLog};
pub mod uploader;
pub use logging::GitlabLayer;
use rand::distributions::Alphanumeric;
use rand::distributions::DistString;
use runlist::JobRunList;
use tokio::fs::File;
use tokio::io::AsyncReadExt;
use tokio_util::sync::CancellationToken;
use tracing::debug;
use tracing::instrument::WithSubscriber;
pub use uploader::UploadFile;

mod runlist;
use crate::runlist::RunList;

use futures::prelude::*;
use futures::AsyncRead;
use std::borrow::Cow;
use std::fmt::Write;
use std::path::PathBuf;
use tokio::time::{sleep, Duration};
use tracing::warn;
Expand Down Expand Up @@ -274,56 +285,134 @@ where
}
}

/// Runner for gitlab
///
/// The runner is responsible for communicating with gitlab to request new job and spawn them.
#[derive(Debug)]
pub struct Runner {
client: Client,
/// Builder for [`Runner`]
pub struct RunnerBuilder {
server: Url,
token: String,
build_dir: PathBuf,
system_id: Option<String>,
run_list: RunList<u64, JobLog>,
}

impl Runner {
/// Create a new Runner for the given server url and runner token, storing (temporary job
/// files) in build_dir
///
/// The build_dir is used to store temporary files during a job run. This will also configure a
/// default tracing subscriber if that's not wanted use [`Runner::new_with_layer`] instead.
impl RunnerBuilder {
/// Create a new [`RunnerBuilder`] for the given server url, runner token,
/// build dir and job list (as created by GitlabLayer::new).
///
/// The build_dir is used to store temporary files during a job run.
/// ```
/// # use gitlab_runner::{GitlabLayer, Runner};
/// # use tracing_subscriber::prelude::*;
/// # use tracing_subscriber::{prelude::*, Registry};
/// # use gitlab_runner::{RunnerBuilder, GitlabLayer};
/// # use url::Url;
/// #
///
/// let (layer, jobs) = GitlabLayer::new();
/// tracing_subscriber::Registry::default()
/// .with(
/// tracing_subscriber::fmt::Layer::new()
/// .pretty()
/// .with_filter(tracing::metadata::LevelFilter::INFO),
/// )
/// .with(layer)
/// .init();
/// #[tokio::main]
/// # async fn main() {
/// let dir = tempfile::tempdir().unwrap();
/// let runner = Runner::new(Url::parse("https://gitlab.com/").unwrap(),
/// "RunnerToken".to_string(),
/// dir.path().to_path_buf(),
/// jobs);
/// let (layer, jobs) = GitlabLayer::new();
/// let subscriber = Registry::default().with(layer).init();
/// let runner = RunnerBuilder::new(
/// Url::parse("https://gitlab.com/").unwrap(),
/// "RunnerToken",
/// dir.path(),
/// jobs
/// )
/// .build()
/// .await;
/// # }
/// ```
///
/// # Panics
///
/// Panics if a default subscriber is already setup
pub fn new(server: Url, token: String, build_dir: PathBuf, jobs: JobRunList) -> Self {
Self {
client: Client::new(server, token),
build_dir,
pub fn new<P: Into<PathBuf>, S: Into<String>>(
server: Url,
token: S,
build_dir: P,
jobs: JobRunList,
) -> Self {
RunnerBuilder {
server,
token: token.into(),
build_dir: build_dir.into(),
system_id: None,
run_list: jobs.inner(),
}
}

/// Set the [system_id](https://docs.gitlab.com/runner/fleet_scaling/#generation-of-system_id-identifiers) for this runner
///
/// The system_id will be truncated to 64 characters to match gitlabs limit,
/// but no further validation will be done. It's up to the call to ensure the
/// system_id is valid for gitlab
pub fn system_id<S: Into<String>>(mut self, system_id: S) -> Self {
let mut system_id = system_id.into();
system_id.truncate(64);
self.system_id = Some(system_id);
self
}

async fn generate_system_id_from_machine_id() -> Option<String> {
let mut f = match File::open("/etc/machine-id").await {
Ok(f) => f,
Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
debug!("/etc/machine-id not found, not generate systemd id based on it");
return None;
}
Err(e) => {
warn!("Failed to open machine-id: {e}");
return None;
}
};

let mut id = [0u8; 32];
if let Err(e) = f.read_exact(&mut id).await {
warn!("Failed to read from machine-id: {e}");
return None;
};

// Infallable as a hmac can take a key of any size
let mut mac = Hmac::<sha2::Sha256>::new_from_slice(&id).unwrap();
mac.update(b"gitlab-runner");

let mut system_id = String::from("s_");
for b in &mac.finalize().into_bytes()[0..6] {
// Infallable: writing to a string
write!(&mut system_id, "{:02x}", b).unwrap();
}
Some(system_id)
}

async fn generate_system_id() -> String {
if let Some(system_id) = Self::generate_system_id_from_machine_id().await {
system_id
} else {
let mut system_id = String::from("r_");
Alphanumeric.append_string(&mut rand::thread_rng(), &mut system_id, 12);
system_id
}
}

/// Build the runner.
pub async fn build(self) -> Runner {
let system_id = match self.system_id {
Some(system_id) => system_id,
None => Self::generate_system_id().await,
};
let client = Client::new(self.server, self.token, system_id);
Runner {
client,
build_dir: self.build_dir,
run_list: self.run_list,
}
}
}

/// Runner for gitlab
///
/// The runner is responsible for communicating with gitlab to request new job and spawn them.
#[derive(Debug)]
pub struct Runner {
client: Client,
build_dir: PathBuf,
run_list: RunList<u64, JobLog>,
}

impl Runner {
/// The number of jobs currently running
pub fn running(&self) -> usize {
self.run_list.size()
Expand All @@ -336,7 +425,7 @@ impl Runner {
/// the actual job handler. Returns whether or not a job was received or an error if polling
/// gitlab failed.
///
/// Note that this function is not cancel save. If the future gets cancelled gitlab might have
/// Note that this function is not cancel safe. If the future gets cancelled gitlab might have
/// provided a job for which processing didn't start yet.
pub async fn request_job<F, J, U, Ret>(&mut self, process: F) -> Result<bool, client::Error>
where
Expand Down
Loading

0 comments on commit 3396f2a

Please sign in to comment.