Skip to content

Commit

Permalink
Merge pull request #606 from fabriziosestito/refactor/lib-main-config
Browse files Browse the repository at this point in the history 
refactor: refactor main function, add lib.rs and refactor config/cli related code
  • Loading branch information
@fabriziosestito
fabriziosestito authored Dec 5, 2023
2 parents a3118a7 + a35bdee commit 63c9f32
Show file tree
Hide file tree
Showing 11 changed files with 626 additions and 562 deletions.
1 change: 1 addition & 0 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/api/audit_and_validation.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use crate::{
name = "audit",
fields(
request_uid=tracing::field::Empty,
host=crate::cli::HOSTNAME.as_str(),
host=crate::config::HOSTNAME.as_str(),
policy_id=policy_id.as_str(),
name=tracing::field::Empty,
namespace=tracing::field::Empty,
Expand Down Expand Up @@ -60,7 +60,7 @@ pub(crate) async fn audit(
name = "validation",
fields(
request_uid=tracing::field::Empty,
host=crate::cli::HOSTNAME.as_str(),
host=crate::config::HOSTNAME.as_str(),
policy_id=policy_id.as_str(),
name=tracing::field::Empty,
namespace=tracing::field::Empty,
Expand Down Expand Up @@ -91,7 +91,7 @@ pub(crate) async fn validation(
name = "validation_raw",
fields(
request_uid=tracing::field::Empty,
host=crate::cli::HOSTNAME.as_str(),
host=crate::config::HOSTNAME.as_str(),
policy_id=policy_id.as_str(),
allowed=tracing::field::Empty,
mutated=tracing::field::Empty,
Expand Down
135 changes: 0 additions & 135 deletions src/cli.rs
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,8 @@
use crate::settings::{read_policies_file, Policy};
use anyhow::{anyhow, Result};
use clap::builder::PossibleValue;
use clap::{crate_authors, crate_description, crate_name, crate_version, Arg, Command};
use itertools::Itertools;
use lazy_static::lazy_static;
use policy_evaluator::burrego;
use policy_evaluator::policy_fetcher::{
sources::{read_sources_file, Sources},
verify::config::{read_verification_file, LatestVerificationConfig},
};
use std::{collections::HashMap, env, net::SocketAddr, path::Path};
use tracing_subscriber::prelude::*;
use tracing_subscriber::{fmt, EnvFilter};

static SERVICE_NAME: &str = "kubewarden-policy-server";
const DOCKER_CONFIG_ENV_VAR: &str = "DOCKER_CONFIG";

lazy_static! {
static ref VERSION_AND_BUILTINS: String = {
Expand All @@ -30,8 +18,6 @@ lazy_static! {
builtins,
)
};
pub(crate) static ref HOSTNAME: String =
std::env::var("HOSTNAME").unwrap_or_else(|_| String::from("unknown"));
}

pub(crate) fn build_cli() -> Command {
Expand Down Expand Up @@ -232,124 +218,3 @@ pub(crate) fn build_cli() -> Command {
)
.long_version(VERSION_AND_BUILTINS.as_str())
}

pub(crate) fn api_bind_address(matches: &clap::ArgMatches) -> Result<SocketAddr> {
format!(
"{}:{}",
matches.get_one::<String>("address").unwrap(),
matches.get_one::<String>("port").unwrap()
)
.parse()
.map_err(|e| anyhow!("error parsing arguments: {}", e))
}

pub(crate) fn tls_files(matches: &clap::ArgMatches) -> Result<(String, String)> {
let cert_file = matches.get_one::<String>("cert-file").unwrap().to_owned();
let key_file = matches.get_one::<String>("key-file").unwrap().to_owned();
if cert_file.is_empty() != key_file.is_empty() {
Err(anyhow!("error parsing arguments: either both --cert-file and --key-file must be provided, or neither"))
} else {
Ok((cert_file, key_file))
}
}

pub(crate) fn policies(matches: &clap::ArgMatches) -> Result<HashMap<String, Policy>> {
let policies_file = Path::new(matches.get_one::<String>("policies").unwrap());
read_policies_file(policies_file).map_err(|e| {
anyhow!(
"error while loading policies from {:?}: {}",
policies_file,
e
)
})
}

pub(crate) fn verification_config(
matches: &clap::ArgMatches,
) -> Result<Option<LatestVerificationConfig>> {
match matches.get_one::<String>("verification-path") {
None => Ok(None),
Some(path) => {
let verification_file = Path::new(path);
Ok(Some(read_verification_file(verification_file)?))
}
}
}

// Setup the tracing system. This MUST be done inside of a tokio Runtime
// because some collectors rely on it and would panic otherwise.
pub(crate) fn setup_tracing(matches: &clap::ArgMatches) -> Result<()> {
// setup logging
let filter_layer = EnvFilter::new(matches.get_one::<String>("log-level").unwrap())
// some of our dependencies generate trace events too, but we don't care about them ->
// let's filter them
.add_directive("cranelift_codegen=off".parse().unwrap())
.add_directive("cranelift_wasm=off".parse().unwrap())
.add_directive("h2=off".parse().unwrap())
.add_directive("hyper=off".parse().unwrap())
.add_directive("regalloc=off".parse().unwrap())
.add_directive("tower=off".parse().unwrap())
.add_directive("wasmtime_cranelift=off".parse().unwrap())
.add_directive("wasmtime_jit=off".parse().unwrap());

match matches.get_one::<String>("log-fmt").unwrap().as_str() {
"json" => tracing_subscriber::registry()
.with(filter_layer)
.with(fmt::layer().json())
.init(),
"text" => {
let enable_color = !matches.contains_id("log-no-color");
let layer = fmt::layer().with_ansi(enable_color);

tracing_subscriber::registry()
.with(filter_layer)
.with(layer)
.init()
}
"otlp" => {
// Create a new OpenTelemetry pipeline sending events to a
// OpenTelemetry collector using the OTLP format.
// The collector must run on localhost (eg: use a sidecar inside of k8s)
// using GRPC
let tracer = opentelemetry_otlp::new_pipeline()
.tracing()
.with_exporter(opentelemetry_otlp::new_exporter().tonic())
.with_trace_config(opentelemetry_sdk::trace::config().with_resource(
opentelemetry_sdk::Resource::new(vec![opentelemetry::KeyValue::new(
"service.name",
SERVICE_NAME,
)]),
))
.install_batch(opentelemetry_sdk::runtime::Tokio)?;

// Create a tracing layer with the configured tracer
let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);
tracing_subscriber::registry()
.with(filter_layer)
.with(telemetry)
.with(fmt::layer())
.init()
}

_ => return Err(anyhow!("Unknown log message format")),
};

Ok(())
}

pub(crate) fn remote_server_options(matches: &clap::ArgMatches) -> Result<Option<Sources>> {
let sources = match matches.get_one::<String>("sources-path") {
Some(sources_file) => Some(
read_sources_file(Path::new(sources_file))
.map_err(|e| anyhow!("error while loading sources from {}: {}", sources_file, e))?,
),
None => None,
};

if let Some(docker_config_json_path) = matches.get_one::<String>("docker-config-json-path") {
// docker_credential crate expects the config path in the $DOCKER_CONFIG. Keep docker-config-json-path parameter for backwards compatibility
env::set_var(DOCKER_CONFIG_ENV_VAR, docker_config_json_path);
}

Ok(sources)
}
2 changes: 1 addition & 1 deletion src/communication.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ use policy_evaluator::policy_evaluator::ValidateRequest;
use std::collections::HashMap;
use tokio::sync::oneshot;

use crate::config::Policy;
use crate::policy_downloader::FetchedPolicies;
use crate::settings::Policy;

#[derive(Debug, Clone)]
pub(crate) enum RequestOrigin {
Expand Down
Loading

0 comments on commit 63c9f32

Please sign in to comment.