From 717542fe53fea502fbfb6cc4b1d936e112f3be7b Mon Sep 17 00:00:00 2001 From: joris Date: Mon, 15 Jan 2024 15:01:34 +0100 Subject: [PATCH] add base path + url --- .github/workflows/push.yaml | 1 + agent_api_rest/src/lib.rs | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 49ac247d..2a492ea8 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -16,6 +16,7 @@ on: branches: - main - dev + - feat/pipeline env: ARTIFACTORY_HOST: europe-west4-docker.pkg.dev diff --git a/agent_api_rest/src/lib.rs b/agent_api_rest/src/lib.rs index 4d90b106..d3469d25 100644 --- a/agent_api_rest/src/lib.rs +++ b/agent_api_rest/src/lib.rs @@ -22,14 +22,14 @@ use std::env; pub const AGGREGATE_ID: &str = "agg-id-F39A0C"; pub fn app(state: ApplicationState) -> Router { - let prefix: Option = env::var_os("AGENT_APPLICATION_BASE_PATH").map(|os| { + let base_path: Option = env::var_os("AGENT_APPLICATION_BASE_PATH").map(|os| { println!("AGENT_APPLICATION_BASE_PATH can't start or end with '/'"); os.into_string().expect("Can't parse AGENT_APPLICATION_BASE_PATH") }); let path = |suffix: &str| -> String { - if let Some(prefix) = &prefix { - format!("/{}{}", prefix, suffix) + if let Some(base_path) = &base_path { + format!("/{}{}", base_path, suffix) } else { suffix.to_string() }