Skip to content

fix(aws_s3 source): Allow region to be optional #18258

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

Merged
jszwedko merged 1 commit into from
Aug 15, 2023
Merged

fix(aws_s3 source): Allow region to be optional #18258

Show file tree
Hide file tree
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
18 changes: 16 additions & 2 deletions src/aws/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,19 @@ pub async fn create_client<T: ClientBuilder>(
tls_options: &Option<TlsConfig>,
is_sink: bool,
) -> crate::Result<T::Client> {
create_client_and_region::<T>(auth, region, endpoint, proxy, tls_options, is_sink)
.await
.map(|(client, _)| client)
}

pub async fn create_client_and_region<T: ClientBuilder>(
auth: &AwsAuthentication,
region: Option<Region>,
endpoint: Option<String>,
proxy: &ProxyConfig,
tls_options: &Option<TlsConfig>,
is_sink: bool,
) -> crate::Result<(T::Client, Region)> {
let retry_config = RetryConfig::disabled();

// The default credentials chains will look for a region if not given but we'd like to
Expand All @@ -169,9 +182,10 @@ pub async fn create_client<T: ClientBuilder>(
let config = config_builder.build();

let client =
create_smithy_client::<T>(region, proxy, tls_options, is_sink, retry_config).await?;
create_smithy_client::<T>(region.clone(), proxy, tls_options, is_sink, retry_config)
.await?;

Ok(T::build(client, &config))
Ok((T::build(client, &config), region))
}

pub async fn sign_request(
Expand Down
16 changes: 5 additions & 11 deletions src/sources/aws_s3/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use super::util::MultilineConfig;
use crate::codecs::DecodingConfig;
use crate::config::DataType;
use crate::{
aws::{auth::AwsAuthentication, create_client, RegionOrEndpoint},
aws::{auth::AwsAuthentication, create_client, create_client_and_region, RegionOrEndpoint},
common::{s3::S3ClientBuilder, sqs::SqsClientBuilder},
config::{
ProxyConfig, SourceAcknowledgementsConfig, SourceConfig, SourceContext, SourceOutput,
Expand Down Expand Up @@ -223,16 +223,12 @@ impl AwsS3Config {
proxy: &ProxyConfig,
log_namespace: LogNamespace,
) -> crate::Result<sqs::Ingestor> {
let region = self
.region
.region()
.ok_or(CreateSqsIngestorError::RegionMissing)?;

let region = self.region.region();
let endpoint = self.region.endpoint();

let s3_client = create_client::<S3ClientBuilder>(
&self.auth,
Some(region.clone()),
region.clone(),
endpoint.clone(),
proxy,
&self.tls_options,
Expand All @@ -246,9 +242,9 @@ impl AwsS3Config {

match self.sqs {
Some(ref sqs) => {
let sqs_client = create_client::<SqsClientBuilder>(
let (sqs_client, region) = create_client_and_region::<SqsClientBuilder>(
&self.auth,
Some(region.clone()),
region.clone(),
endpoint,
proxy,
&sqs.tls_options,
Expand Down Expand Up @@ -284,8 +280,6 @@ enum CreateSqsIngestorError {
Credentials { source: crate::Error },
#[snafu(display("Configuration for `sqs` required when strategy=sqs"))]
ConfigMissing,
#[snafu(display("Region is required"))]
RegionMissing,
#[snafu(display("Endpoint is invalid"))]
InvalidEndpoint,
}
Expand Down