diff --git a/harmony/src/modules/k8s/ingress.rs b/harmony/src/modules/k8s/ingress.rs index 37bc38e..ca84edf 100644 --- a/harmony/src/modules/k8s/ingress.rs +++ b/harmony/src/modules/k8s/ingress.rs @@ -1,4 +1,4 @@ -use harmony_macros::k8s_ingress_path; +use harmony_macros::ingress_path; use k8s_openapi::api::networking::v1::Ingress; use serde::Serialize; use serde_json::json; @@ -45,7 +45,7 @@ impl Score for K8sIngressScore { fn create_interpret(&self) -> Box> { let path = match self.path.clone() { Some(p) => p, - None => k8s_ingress_path!("/"), + None => ingress_path!("/"), }; let path_type = match self.path_type.clone() { diff --git a/harmony/src/modules/lamp.rs b/harmony/src/modules/lamp.rs index bd883e5..3c5c439 100644 --- a/harmony/src/modules/lamp.rs +++ b/harmony/src/modules/lamp.rs @@ -2,7 +2,7 @@ use convert_case::{Case, Casing}; use dockerfile_builder::instruction::{CMD, COPY, ENV, EXPOSE, FROM, RUN, WORKDIR}; use dockerfile_builder::{Dockerfile, instruction_builder::EnvBuilder}; use fqdn::fqdn; -use harmony_macros::k8s_ingress_path; +use harmony_macros::ingress_path; use non_blank_string_rs::NonBlankString; use serde_json::json; use std::collections::HashMap; @@ -144,7 +144,7 @@ impl Interpret for LAMPInterpret { .as_str() ), port: 8080, - path: Some(k8s_ingress_path!("/")), + path: Some(ingress_path!("/")), path_type: None, namespace: self .get_namespace() diff --git a/harmony_macros/src/lib.rs b/harmony_macros/src/lib.rs index ce28363..4b5132e 100644 --- a/harmony_macros/src/lib.rs +++ b/harmony_macros/src/lib.rs @@ -120,7 +120,7 @@ pub fn yaml(input: TokenStream) -> TokenStream { /// Verify that a string is a valid(ish) kubernetes path /// Panics if path does not start with `/` #[proc_macro] -pub fn k8s_ingress_path(input: TokenStream) -> TokenStream { +pub fn ingress_path(input: TokenStream) -> TokenStream { let input = parse_macro_input!(input as LitStr); let path_str = input.value();