Skip to content
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.

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

[Backport 2.x] Update sysinfo requirement from 0.30.5 to 0.31.2 #262

Merged
merged 1 commit into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
OPENSEARCH_URL: ${{ steps.opensearch.outputs.opensearch_url }}

- name: Upload Coverage Data
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
files: ./test_results/opensearch.lcov
flags: unit
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
env:
OPENSEARCH_URL: ${{ steps.opensearch.outputs.opensearch_url }}

- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
with:
files: ./client/test_results/opensearch.lcov
flags: integration
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
env:
OPENSEARCH_URL: ${{ steps.opensearch.outputs.url }}

- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
with:
files: ./client/test_results/opensearch.lcov
flags: integration
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Bumps `aws-*` dependencies to `1` ([#219](https://github.com/opensearch-project/opensearch-rs/pull/219))
- Bumps `itertools` from 0.11.0 to 0.13.0
- Bumps `hyper` from 0.14 to 1 in tests ([#221](https://github.com/opensearch-project/opensearch-rs/pull/221))
- Bumps `sysinfo` from 0.29.0 to 0.30.5
- Bumps `sysinfo` from 0.29.0 to 0.31.2
- Bumps `base64` from 0.21 to 0.22
- Bumps `reqwest` from 0.11 to 0.12
- Bumps `simple_logger` from 4.0.0 to 5.0.0
Expand Down
2 changes: 1 addition & 1 deletion opensearch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ futures = "0.3.1"
http-body-util = "0.1.0"
hyper = { version = "1", features = ["full"] }
hyper-util = { version = "0.1", features = ["full"] }
sysinfo = "0.30.5"
sysinfo = "0.31.2"
test-case = "3"
textwrap = "0.16"
tokio = { version = "1", features = ["full"] }
Expand Down
4 changes: 3 additions & 1 deletion opensearch/examples/cat_indices.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
* GitHub history for details.
*/

use std::ffi::OsStr;

#[cfg(any(feature = "native-tls", feature = "rustls-tls"))]
use opensearch::cert::CertificateValidation;
use opensearch::{
Expand Down Expand Up @@ -68,7 +70,7 @@ fn create_client() -> Result<OpenSearch, Error> {
let system = System::new_with_specifics(
RefreshKind::new().with_processes(ProcessRefreshKind::default()),
);
let has_fiddler = system.processes_by_name("Fiddler").next().is_some();
let has_fiddler = system.processes_by_name(OsStr::new("Fiddler")).next().is_some();
has_fiddler
}

Expand Down
4 changes: 3 additions & 1 deletion opensearch/src/root/bulk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,9 @@ mod tests {
.routing("routing"),
)?;
ops.push(BulkOperation::create("2", CreateDoc { bar: "create" }))?;
ops.push(BulkOperation::create_without_id(CreateDoc { bar: "create" }))?;
ops.push(BulkOperation::create_without_id(CreateDoc {
bar: "create",
}))?;
ops.push(BulkOperation::update("3", UpdateDoc { baz: "update" }))?;
ops.push(BulkOperation::<()>::delete("4"))?;

Expand Down
7 changes: 6 additions & 1 deletion opensearch/tests/common/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
* GitHub history for details.
*/

use std::ffi::OsStr;

#[cfg(any(feature = "native-tls", feature = "rustls-tls"))]
use opensearch::cert::CertificateValidation;
use opensearch::{
Expand Down Expand Up @@ -59,7 +61,10 @@ fn running_proxy() -> bool {
let system = System::new_with_specifics(
RefreshKind::new().with_processes(ProcessRefreshKind::default()),
);
let has_fiddler = system.processes_by_name("Fiddler").next().is_some();
let has_fiddler = system
.processes_by_name(OsStr::new("Fiddler"))
.next()
.is_some();
has_fiddler
}

Expand Down
2 changes: 1 addition & 1 deletion yaml_test_runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ serde_yaml = "0.9"
serde_json = { version = "1", features = ["arbitrary_precision"] }
simple_logger = "5.0.0"
syn = { version = "2.0", features = ["full"] }
sysinfo = "0.30"
sysinfo = "0.31"
url = "2.1.1"
tar = "0.4"
flate2 = "1"
Expand Down
6 changes: 3 additions & 3 deletions yaml_test_runner/tests/common/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ use opensearch::{
Error, OpenSearch, DEFAULT_ADDRESS,
};
use serde_json::Value;
use std::ops::Deref;
use std::{ffi::OsStr, ops::Deref};
use url::Url;

use crate::assert_response_success;
Expand All @@ -61,8 +61,8 @@ fn cluster_addr() -> String {
/// Determines if Fiddler.exe proxy process is running
fn running_proxy() -> bool {
let mut system = sysinfo::System::new();
system.refresh_processes();
let running = system.processes_by_name("Fiddler").next().is_some();
system.refresh_processes(sysinfo::ProcessesToUpdate::All);
let running = system.processes_by_name(OsStr::new("Fiddler")).next().is_some();
running
}

Expand Down
Loading