chore: Update lock file (#1133)

* chore: Update lock file

Signed-off-by: Lucio Franco <[email protected]>

* Clean up warnings

Signed-off-by: Lucio Franco <[email protected]>

* Use elastic 0.20

Signed-off-by: Lucio Franco <[email protected]>

* Remove usage of sync es client

Signed-off-by: Lucio Franco <[email protected]>

* Remove elastic in favor of elastic_response

Signed-off-by: Lucio Franco <[email protected]>

* Fix url for structure test

Signed-off-by: Lucio Franco <[email protected]>

Author: LucioFranco

Cargo.lock

@@ -139,7 +139,7 @@ reqwest = "0.9.5"
 tempfile = "3.0.6"
 libc = "0.2.43"
 walkdir = "2.2.7"
-elastic = { git = "https://github.com/elastic-rs/elastic" }
+elastic_responses = "0.20"
 matches = "0.1.8"
 pretty_assertions = "0.6.1"
 proptest = "0.9"

Cargo.toml

@@ -365,7 +365,7 @@ mod integration_tests {
         let (mut input_lines, events) = random_lines_with_stream(100, 11);
 
         let pump = sink.send_all(events);
-        rt.block_on(pump).unwrap();
+        let _ = rt.block_on(pump).unwrap();
 
         std::thread::sleep(std::time::Duration::from_secs(1));
 

src/sinks/aws_kinesis_streams.rs

@@ -422,7 +422,7 @@ mod integration_tests {
         let (lines, events) = random_lines_with_stream(100, 10);
 
         let pump = sink.send_all(events);
-        block_on(pump).unwrap();
+        let _ = block_on(pump).unwrap();
 
         let keys = get_keys(prefix.unwrap());
         assert_eq!(keys.len(), 1);
@@ -566,7 +566,7 @@ mod integration_tests {
         let (lines, events) = random_lines_with_stream(100, 500);
 
         let pump = sink.send_all(events);
-        block_on(pump).unwrap();
+        let _ = block_on(pump).unwrap();
 
         let keys = get_keys(prefix.unwrap());
         assert_eq!(keys.len(), 2);

src/sinks/aws_s3.rs

@@ -98,6 +98,6 @@ mod tests {
 
         let (_input_lines, events) = random_events_with_stream(100, 10);
 
-        sink.send_all(events).wait().unwrap();
+        let _ = sink.send_all(events).wait().unwrap();
     }
 }

src/sinks/blackhole.rs

@@ -448,7 +448,6 @@ mod integration_tests {
         topology::config::SinkConfig,
         Event,
     };
-    use elastic::client::SyncClientBuilder;
     use futures::{Future, Sink};
     use hyper::{Body, Request};
     use serde_json::{json, Value};
@@ -459,7 +458,7 @@ mod integration_tests {
     fn structures_events_correctly() {
         let index = gen_index();
         let config = ElasticSearchConfig {
-            host: "http://localhost:9200/".into(),
+            host: "http://localhost:9200".into(),
             index: Some(index.clone()),
             doc_type: Some("log_lines".into()),
             id_key: Some("my_id".into()),
@@ -484,20 +483,23 @@ mod integration_tests {
         // make sure writes all all visible
         block_on(flush(&config)).unwrap();
 
-        let client = SyncClientBuilder::new().build().unwrap();
-
-        let response = client
-            .search::<Value>()
-            .index(index)
-            .body(json!({
+        let response = reqwest::Client::new()
+            .get(&format!("{}/{}/_search", config.host, index))
+            .json(&json!({
                 "query": { "query_string": { "query": "*" } }
             }))
             .send()
+            .unwrap()
+            .json::<elastic_responses::search::SearchResponse<Value>>()
             .unwrap();
+
+        println!("response {:?}", response);
+
         assert_eq!(1, response.total());
 
         let hit = response.into_hits().next().unwrap();
-        assert_eq!("42", hit.id());
+        let doc = hit.document().unwrap();
+        assert_eq!(Some("42"), doc["my_id"].as_str());
 
         let value = hit.into_document().unwrap();
         let expected = json!({
@@ -558,7 +560,7 @@ mod integration_tests {
         let (input, events) = random_events_with_stream(100, 100);
 
         let pump = sink.send_all(events);
-        block_on(pump).expect("Sending events failed");
+        let _ = block_on(pump).expect("Sending events failed");
 
         // make sure writes all all visible
         block_on(flush(&config)).expect("Flushing writes failed");
@@ -570,24 +572,20 @@ mod integration_tests {
             .unwrap();
         let test_ca = reqwest::Certificate::from_pem(&test_ca).unwrap();
 
-        let http_client = reqwest::Client::builder()
+        let client = reqwest::Client::builder()
             .add_root_certificate(test_ca)
             .build()
             .expect("Could not build HTTP client");
-        let client = SyncClientBuilder::new()
-            .http_client(http_client)
-            .static_node(config.host)
-            .build()
-            .expect("Building test client failed");
 
         let response = client
-            .search::<Value>()
-            .index(index)
-            .body(json!({
+            .get(&format!("{}/{}/_search", config.host, index))
+            .json(&json!({
                 "query": { "query_string": { "query": "*" } }
             }))
             .send()
-            .expect("Issuing test query failed");
+            .unwrap()
+            .json::<elastic_responses::search::SearchResponse<Value>>()
+            .unwrap();
 
         assert_eq!(input.len() as u64, response.total());
         let input = input

src/sinks/elasticsearch.rs

@@ -391,7 +391,7 @@ mod tests {
         let mut rt = Runtime::new().unwrap();
         rt.spawn(server);
 
-        rt.block_on(pump).unwrap();
+        let _ = rt.block_on(pump).unwrap();
         drop(trigger);
 
         let output_lines = rx
@@ -449,7 +449,7 @@ mod tests {
         let mut rt = Runtime::new().unwrap();
         rt.spawn(server);
 
-        rt.block_on(pump).unwrap();
+        let _ = rt.block_on(pump).unwrap();
         drop(trigger);
 
         let output_lines = rx
@@ -507,7 +507,7 @@ mod tests {
         let mut rt = Runtime::new().unwrap();
         rt.spawn(server);
 
-        rt.block_on(pump).unwrap();
+        let _ = rt.block_on(pump).unwrap();
         drop(trigger);
 
         let output_lines = rx

src/sinks/http.rs

@@ -341,7 +341,7 @@ mod integration_test {
         let (input, events) = random_lines_with_stream(100, num_events);
 
         let pump = sink.send_all(events);
-        block_on(pump).unwrap();
+        let _ = block_on(pump).unwrap();
 
         // read back everything from the beginning
         let mut client_config = rdkafka::ClientConfig::new();

src/sinks/kafka.rs

@@ -333,7 +333,7 @@ mod integration_tests {
 
         let pump = sink.send_all(events);
 
-        rt.block_on(pump).unwrap();
+        let _ = rt.block_on(pump).unwrap();
 
         let mut found_all = false;
         for _ in 0..20 {

src/sinks/splunk_hec.rs

@@ -230,7 +230,7 @@ mod test {
 
         rt.block_on(req).unwrap();
 
-        rt.shutdown_now();
+        let _ = rt.shutdown_now();
 
         let (body, _rest) = rx.into_future().wait().unwrap();
         assert_eq!(body.unwrap().unwrap(), "hello");