Fix build

Signed-off-by: Xuanwo <github@xuanwo.io>
vectordotdev · Jul 29, 2023 · e3298a4 · e3298a4
1 parent 23426d0
commit e3298a4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/sinks/mod.rs b/src/sinks/mod.rs
@@ -87,6 +87,8 @@ pub mod redis;
 pub mod s3_common;
 #[cfg(feature = "sinks-sematext")]
 pub mod sematext;
+#[cfg(feature = "sinks-sftp")]
+pub mod sftp;
 #[cfg(feature = "sinks-socket")]
 pub mod socket;
 #[cfg(feature = "sinks-splunk_hec")]
@@ -99,8 +101,6 @@ pub mod vector;
 pub mod webhdfs;
 #[cfg(feature = "sinks-websocket")]
 pub mod websocket;
-#[cfg(feature = "sinks-sftp")]
-pub mod sftp;
 
 pub use vector_core::{config::Input, sink::VectorSink};
 

diff --git a/src/sinks/sftp/config.rs b/src/sinks/sftp/config.rs
@@ -1,6 +1,5 @@
 use codecs::{encoding::Framer, JsonSerializerConfig, NewlineDelimitedEncoderConfig};
-use opendal::{layers::LoggingLayer, services::Webhdfs, Operator};
-use opendal::Scheme::Sftp;
+use opendal::{layers::LoggingLayer, services::Sftp, Operator};
 use tower::ServiceBuilder;
 use vector_config::configurable_component;
 use vector_core::{
@@ -84,9 +83,9 @@ pub struct SftpConfig {
 
     #[configurable(derived)]
     #[serde(
-    default,
-    deserialize_with = "crate::serde::bool_or_struct",
-    skip_serializing_if = "crate::serde::skip_serializing_if_default"
+        default,
+        deserialize_with = "crate::serde::bool_or_struct",
+        skip_serializing_if = "crate::serde::skip_serializing_if_default"
     )]
     pub acknowledgements: AcknowledgementsConfig,
 }
@@ -99,7 +98,7 @@ impl GenerateConfig for SftpConfig {
             endpoint: "127.0.0.1:22".to_string(),
 
             user: "ubuntu".to_string(),
-            key: "/home/ubuntu/.ssh/is_rsa".to_string(),
+            key: "/home/ubuntu/.ssh/id_rsa".to_string(),
             known_hosts_strategy: "strict".to_string(),
             encoding: (
                 Some(NewlineDelimitedEncoderConfig::new()),
@@ -111,7 +110,7 @@ impl GenerateConfig for SftpConfig {
 
             acknowledgements: Default::default(),
         })
-            .unwrap()
+        .unwrap()
     }
 }
 

diff --git a/src/sinks/sftp/test.rs b/src/sinks/sftp/test.rs
@@ -22,7 +22,7 @@ fn default_config(encoding: EncodingConfigWithFraming) -> SftpConfig {
         prefix: "%F/".to_string(),
         endpoint: "127.0.0.1:22".to_string(),
         user: "ubuntu".to_string(),
-        key: "/home/ubuntu/.ssh/is_rsa".to_string(),
+        key: "/home/ubuntu/.ssh/id_rsa".to_string(),
         known_hosts_strategy: "strict".to_string(),
         encoding,
         compression: Compression::gzip_default(),