2 Commits

Author SHA1 Message Date
Dreaded_X f51746c5df feat: Add function that applies netmask to ip
Audit / cargo audit (push) Successful in 7m8s
Committed / committed (pull_request) Successful in 42s
CI / cargo shear (pull_request) Successful in 6m11s
CI / prek (pull_request) Successful in 7m43s
Release-plz / Release-plz Release (push) Successful in 9m20s
CI / prek (push) Successful in 9m22s
CI / cargo shear (push) Successful in 9m26s
Release-plz / Release-plz PR (push) Successful in 3m7s
2026-04-21 04:49:31 +02:00
Dreaded_X ca72d08cc1 refactor: Use ViaDeserialize to convert ip address 2026-04-21 04:49:30 +02:00
+11 -5
View File
@@ -1,8 +1,8 @@
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
use std::ops::Deref; use std::ops::Deref;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::str::FromStr;
use minijinja::value::ViaDeserialize;
use minijinja::{AutoEscape, Environment, path_loader}; use minijinja::{AutoEscape, Environment, path_loader};
use walkdir::WalkDir; use walkdir::WalkDir;
@@ -16,6 +16,13 @@ pub struct PathEnvironment<'a> {
path: PathBuf, path: PathBuf,
} }
fn apply_netmask(
ip: ViaDeserialize<Ipv4Addr>,
netmask: ViaDeserialize<Ipv4Addr>,
) -> Result<String, minijinja::Error> {
Ok((*ip & *netmask).to_string())
}
impl<'a> PathEnvironment<'a> { impl<'a> PathEnvironment<'a> {
pub fn new(path: &Path) -> Self { pub fn new(path: &Path) -> Self {
let mut env = Environment::new(); let mut env = Environment::new();
@@ -27,10 +34,7 @@ impl<'a> PathEnvironment<'a> {
env.set_auto_escape_callback(|_| AutoEscape::None); env.set_auto_escape_callback(|_| AutoEscape::None);
// Add filters // Add filters
env.add_filter("to_prefix", |netmask: String| { env.add_filter("to_prefix", |netmask: ViaDeserialize<Ipv4Addr>| {
let netmask = Ipv4Addr::from_str(&netmask).map_err(|err| {
minijinja::Error::new(minijinja::ErrorKind::InvalidOperation, err.to_string())
})?;
let mask = netmask.to_bits(); let mask = netmask.to_bits();
let prefix = mask.leading_ones(); let prefix = mask.leading_ones();
@@ -44,6 +48,8 @@ impl<'a> PathEnvironment<'a> {
} }
}); });
env.add_function("apply_netmask", apply_netmask);
// Helper function for getting the path to kubeconfig files // Helper function for getting the path to kubeconfig files
env.add_filter("kubeconfig", move |names: Vec<String>| { env.add_filter("kubeconfig", move |names: Vec<String>| {
names names