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

Update dependencies #122

Merged
merged 1 commit into from
Jun 17, 2022
Merged

Update dependencies #122

merged 1 commit into from
Jun 17, 2022

Conversation

dalance
Copy link
Contributor

@dalance dalance commented Jun 15, 2022

This PR updates dependencies to resolve vulnerabilities.

@dalance dalance force-pushed the update_dependencies branch 2 times, most recently from 01fa555 to d09e5f2 Compare June 15, 2022 02:42
@dalance
Copy link
Contributor Author

dalance commented Jun 15, 2022

This will resolve #75, #119, #96

Copy link
Collaborator

@eldesh eldesh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you separate PR from this for updating deprecated API (Docker::containers)?

@@ -140,7 +138,7 @@ pub struct HyperClient {

fn join_uri(uri: &Uri, path: &str) -> Result<Uri> {
let joined = format!("{}{}", uri.to_string(), path);
Ok(Uri::from_str(&joined).context(ErrorKind::InvalidUri { var: joined })?)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The value var of InvalidUri is required.
This is because we need to know what string caused the parsing error when we tried to parse it.

@@ -276,7 +273,7 @@ impl HyperClient {
builder.add_root_certificate(ca);
// This ensures that using docker-machine-esque addresses work with Hyper.
let addr_https = addr.clone().replacen("tcp://", "https://", 1);
let url = Uri::from_str(&addr_https).context(ErrorKind::InvalidUri { var: addr_https })?;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same above

@@ -287,7 +284,7 @@ impl HyperClient {
pub fn connect_with_http(addr: &str) -> result::Result<Self, Error> {
// This ensures that using docker-machine-esque addresses work with Hyper.
let addr_https = addr.clone().replace("tcp://", "http://");
let url = Uri::from_str(&addr_https).context(ErrorKind::InvalidUri { var: addr_https })?;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same above

@dalance dalance force-pushed the update_dependencies branch from 4769d25 to 65a05fd Compare June 15, 2022 15:02
@dalance dalance force-pushed the update_dependencies branch from 65a05fd to 2eaa13b Compare June 15, 2022 15:10
@dalance
Copy link
Contributor Author

dalance commented Jun 15, 2022

I fixed InvalidUri and reverted Docker::containers.

@eldesh
Copy link
Collaborator

eldesh commented Jun 17, 2022

Looks good 👍
Thank you for your contribution!

@eldesh eldesh merged commit f2d1f8e into Idein:master Jun 17, 2022
@dalance dalance mentioned this pull request Jul 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants