Skip to content

enhancement(http provider): allow environment interpolation from http provider config #24341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sonnens wants to merge 1 commit into
base: master
Choose a base branch
from
Open

enhancement(http provider): allow environment interpolation from http provider config #24341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions src/providers/http.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use vector_lib::configurable::configurable_component;

use super::BuildResult;
use crate::{
config::{self, Format, ProxyConfig, provider::ProviderConfig},
config::{self, interpolate, Format, ProxyConfig, provider::ProviderConfig},
http::HttpClient,
signal,
tls::{TlsConfig, TlsSettings},
Expand Down Expand Up @@ -56,6 +56,9 @@ pub struct HttpConfig {
/// Which config format expected to be loaded
#[configurable(derived)]
config_format: Format,

/// Enable environment variable interpolation
interpolate_env: bool,
}

impl Default for HttpConfig {
Expand All @@ -67,6 +70,7 @@ impl Default for HttpConfig {
tls_options: None,
proxy: Default::default(),
config_format: Format::default(),
interpolate_env: false,
}
}
}
Expand Down Expand Up @@ -131,12 +135,30 @@ async fn http_request_to_config_builder(
headers: &IndexMap<String, String>,
proxy: &ProxyConfig,
config_format: &Format,
interpolate_env: bool,
) -> BuildResult {
let config_str = http_request(url, tls_options, headers, proxy)
.await
.map_err(|e| vec![e.to_owned()])?;

config::load(config_str.chunk(), *config_format)
if !interpolate_env {
return config::load(config_str.chunk(), *config_format);
}

let env_vars = std::env::vars_os()
.map(|(k, v)| {
(
k.into_string().unwrap_or_default(),
v.into_string().unwrap_or_default(),
)
})
.collect::<std::collections::HashMap<String, String>>();

let config_str = interpolate(std::str::from_utf8(&config_str)
.map_err(|e| vec![e.to_string()])?,
&env_vars)?;

config::load(config_str.as_bytes().chunk(), *config_format)
}

/// Polls the HTTP endpoint after/every `poll_interval_secs`, returning a stream of `ConfigBuilder`.
Expand All @@ -147,6 +169,7 @@ fn poll_http(
headers: IndexMap<String, String>,
proxy: ProxyConfig,
config_format: Format,
interpolate_env: bool,
) -> impl Stream<Item = signal::SignalTo> {
let duration = time::Duration::from_secs(poll_interval_secs);
let mut interval = time::interval_at(time::Instant::now() + duration, duration);
Expand All @@ -155,7 +178,7 @@ fn poll_http(
loop {
interval.tick().await;

match http_request_to_config_builder(&url, tls_options.as_ref(), &headers, &proxy, &config_format).await {
match http_request_to_config_builder(&url, tls_options.as_ref(), &headers, &proxy, &config_format, interpolate_env).await {
Ok(config_builder) => yield signal::SignalTo::ReloadFromConfigBuilder(config_builder),
Err(_) => {},
};
Expand Down Expand Up @@ -187,6 +210,7 @@ impl ProviderConfig for HttpConfig {
&request.headers,
&proxy,
&config_format,
self.interpolate_env,
)
.await?;

Expand All @@ -198,6 +222,7 @@ impl ProviderConfig for HttpConfig {
request.headers.clone(),
proxy.clone(),
config_format,
self.interpolate_env,
));

Ok(config_builder)
Expand Down
Loading