Skip to content

fix(aws_s3 source): Use the decoder to calculate type defs #18274

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
fuchsnj merged 8 commits into from
Aug 17, 2023
Merged

fix(aws_s3 source): Use the decoder to calculate type defs #18274

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
749619b
fix output type
fuchsnj Aug 16, 2023
c9b1fde
fix output type too
fuchsnj Aug 16, 2023
cb2921f
update tests
fuchsnj Aug 16, 2023
575b00e
fix tests
fuchsnj Aug 16, 2023
8f086b6
add json test
fuchsnj Aug 16, 2023
37f8810
cleanup
fuchsnj Aug 16, 2023
8a88d41
ignore temporary compose files
fuchsnj Aug 16, 2023
8831355
fix .gitignore style
fuchsnj Aug 16, 2023
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
10 changes: 7 additions & 3 deletions src/sources/aws_s3/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{convert::TryInto, io::ErrorKind};
use async_compression::tokio::bufread;
use aws_sdk_s3::types::ByteStream;
use codecs::decoding::{DeserializerConfig, FramingConfig, NewlineDelimitedDecoderOptions};
use codecs::{BytesDeserializerConfig, NewlineDelimitedDecoderConfig};
use codecs::NewlineDelimitedDecoderConfig;
use futures::{stream, stream::StreamExt, TryStreamExt};
use lookup::owned_value_path;
use snafu::Snafu;
Expand Down Expand Up @@ -163,7 +163,8 @@ impl SourceConfig for AwsS3Config {

fn outputs(&self, global_log_namespace: LogNamespace) -> Vec<SourceOutput> {
let log_namespace = global_log_namespace.merge(self.log_namespace);
let mut schema_definition = BytesDeserializerConfig
let mut schema_definition = self
.decoding
.schema_definition(log_namespace)
.with_source_metadata(
Self::NAME,
Expand Down Expand Up @@ -208,7 +209,10 @@ impl SourceConfig for AwsS3Config {
schema_definition = schema_definition.unknown_fields(Kind::bytes());
}

vec![SourceOutput::new_logs(DataType::Log, schema_definition)]
vec![SourceOutput::new_logs(
self.decoding.output_type(),
schema_definition,
)]
}

fn can_acknowledge(&self) -> bool {
Expand Down