Merge pull request #2 from discord/androo/fixes

some more fixes

build.rs

@@ -151,6 +151,7 @@ fn main() {
  "proto/vector/dd_trace.proto",
  "proto/third-party/google/cloud/bigquery/storage/v1/storage.proto",
  "proto/third-party/google/pubsub/v1/pubsub.proto",
+ "proto/third-party/google/rpc/code.proto",
  "proto/third-party/google/rpc/status.proto",
  "proto/vector/vector.proto",
  ],

src/sinks/gcp/bigquery/config.rs

@@ -1,11 +1,11 @@
-use codecs::encoding::ProtobufSerializerConfig;
+use vector_lib::codecs::encoding::ProtobufSerializerConfig;
 use futures::FutureExt;
 use http::Uri;
 use indoc::indoc;
 use tonic::transport::Channel;
-use vector_config::configurable_component;
+use vector_lib::configurable::configurable_component;
 
-use super::proto::google::cloud::bigquery::storage::v1 as proto;
+use super::proto::third_party::google::cloud::bigquery::storage::v1 as proto;
 use super::request_builder::{BigqueryRequestBuilder, MAX_BATCH_PAYLOAD_SIZE};
 use super::service::{AuthInterceptor, BigqueryService};
 use super::sink::BigquerySink;
@@ -75,7 +75,7 @@ pub struct BigqueryConfig {
  #[serde(
  default,
  deserialize_with = "crate::serde::bool_or_struct",
- skip_serializing_if = "crate::serde::skip_serializing_if_default"
+ skip_serializing_if = "crate::serde::is_default"
  )]
  acknowledgements: AcknowledgementsConfig,
 }

src/sinks/gcp/bigquery/mod.rs

@@ -16,18 +16,20 @@ mod sink;
 
 #[allow(warnings, clippy::pedantic, clippy::nursery)]
 pub(crate) mod proto {
- pub(crate) mod google {
- pub(crate) mod cloud {
- pub(crate) mod bigquery {
- pub(crate) mod storage {
- pub(crate) mod v1 {
- tonic::include_proto!("google.cloud.bigquery.storage.v1");
+ pub(crate) mod third_party {
+ pub(crate) mod google {
+ pub(crate) mod cloud {
+ pub(crate) mod bigquery {
+ pub(crate) mod storage {
+ pub(crate) mod v1 {
+ tonic::include_proto!("google.cloud.bigquery.storage.v1");
+ }
  }
  }
  }
- }
- pub(crate) mod rpc {
- tonic::include_proto!("google.rpc");
+  pub(crate) mod rpc {
+  tonic::include_proto!("google.rpc");
+ }
  }
  }
 }

src/sinks/gcp/bigquery/request_builder.rs

@@ -1,12 +1,12 @@
 use bytes::BytesMut;
-use codecs::encoding::ProtobufSerializer;
+use vector_lib::codecs::encoding::ProtobufSerializer;
 use prost::Message;
 use std::num::NonZeroUsize;
 use tokio_util::codec::Encoder;
-use vector_common::request_metadata::RequestMetadata;
-use vector_core::event::Finalizable;
+use vector_lib::request_metadata::RequestMetadata;
+use vector_lib::event::Finalizable;
 
-use super::proto::google::cloud::bigquery::storage::v1 as proto;
+use super::proto::third_party::google::cloud::bigquery::storage::v1 as proto;
 use super::service::BigqueryRequest;
 use crate::event::{Event, EventFinalizers};
 use crate::sinks::util::metadata::RequestMetadataBuilder;
@@ -22,8 +22,8 @@ pub enum BigqueryRequestBuilderError {
  ProtobufEncoding { message: String }, // `error` needs to be some concrete type
 }
 
-impl From<vector_common::Error> for BigqueryRequestBuilderError {
- fn from(error: vector_common::Error) -> Self {
+impl From<vector_lib::Error> for BigqueryRequestBuilderError {
+ fn from(error: vector_lib::Error) -> Self {
  BigqueryRequestBuilderError::ProtobufEncoding {
  message: format!("{:?}", error),
  }
@@ -142,7 +142,7 @@ mod test {
  use codecs::encoding::{ProtobufSerializerConfig, ProtobufSerializerOptions};
  use std::collections::BTreeMap;
  use std::path::PathBuf;
- use vector_core::event::{Event, EventMetadata, LogEvent, Value};
+ use vector_lib::event::{Event, EventMetadata, LogEvent, Value};
 
  use super::BigqueryRequestBuilder;
  use crate::sinks::util::IncrementalRequestBuilder;

src/sinks/gcp/bigquery/service.rs

@@ -7,11 +7,11 @@ use tonic::service::Interceptor;
 use tonic::transport::Channel;
 use tonic::{Request, Status};
 use tower::Service;
-use vector_common::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
-use vector_core::event::EventStatus;
-use vector_core::stream::DriverResponse;
+use vector_lib::request_metadata::{GroupedCountByteSize, MetaDescriptive, RequestMetadata};
+use vector_lib::event::EventStatus;
+use vector_lib::stream::DriverResponse;
 
-use super::proto::google::cloud::bigquery::storage::v1 as proto;
+use super::proto::third_party::google::cloud::bigquery::storage::v1 as proto;
 use crate::event::{EventFinalizers, Finalizable};
 use crate::gcp::GcpAuthenticator;
 
@@ -75,13 +75,13 @@ impl DriverResponse for BigqueryResponse {
  None => EventStatus::Dropped,
  Some(proto::append_rows_response::Response::AppendResult(_)) => EventStatus::Delivered,
  Some(proto::append_rows_response::Response::Error(status)) => {
- match super::proto::google::rpc::Code::try_from(status.code) {
+ match super::proto::third_party::google::rpc::Code::try_from(status.code) {
  // we really shouldn't be able to get here, but just in case
- Ok(super::proto::google::rpc::Code::Ok) => EventStatus::Delivered,
+ Ok(super::proto::third_party::google::rpc::Code::Ok) => EventStatus::Delivered,
  // these errors can't be retried because the event payload is almost definitely bad
- Ok(super::proto::google::rpc::Code::InvalidArgument)
- | Ok(super::proto::google::rpc::Code::NotFound)
- | Ok(super::proto::google::rpc::Code::AlreadyExists) => EventStatus::Rejected,
+ Ok(super::proto::third_party::google::rpc::Code::InvalidArgument)
+ | Ok(super::proto::third_party::google::rpc::Code::NotFound)
+ | Ok(super::proto::third_party::google::rpc::Code::AlreadyExists) => EventStatus::Rejected,
  // everything else can probably be retried
  _ => EventStatus::Errored,
  }

src/sinks/gcp/bigquery/sink.rs

@@ -2,9 +2,9 @@ use futures_util::{
  stream::{self, BoxStream},
  StreamExt,
 };
-use vector_core::event::Event;
-use vector_core::sink::StreamSink;
-use vector_core::stream::BatcherSettings;
+use vector_lib::event::Event;
+use vector_lib::sink::StreamSink;
+use vector_lib::stream::BatcherSettings;
 
 use super::request_builder::BigqueryRequestBuilder;
 use super::service::BigqueryService;

src/sinks/gcp/mod.rs

@@ -4,7 +4,6 @@ use serde::{Deserialize, Serialize};
 use vector_lib::configurable::configurable_component;
 
 pub mod bigquery;
-pub mod chronicle_unstructured;
 pub mod cloud_storage;
 pub mod pubsub;
 pub mod stackdriver;