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.

Sign up for GitHub

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

Jump to bottom

upgrade tokio to address tokio panic bug [DEVINFRA-645] #429

Merged
merged 3 commits into from
Jan 3, 2023
Merged

upgrade tokio to address tokio panic bug [DEVINFRA-645] #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc97982
upgrade tokio version
gborough Jan 3, 2023
a53bb2b
update readme
gborough Jan 3, 2023
65b05ef
Merge branch 'master' into gborough/upgrade-tokio
gborough Jan 3, 2023
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
82 changes: 69 additions & 13 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ CREDENTIAL_PROVIDER=profile esthri s3 sync s3://esthri-test/myfiles/ mynewdirect
`ESTHRI_CREDENTIAL_PROVIDER=profile` ---> fetched from default credential file
`ESTHRI_CREDENTIAL_PROVIDER=container` ---> fetched from task's IAM role in ECS
`ESTHRI_CREDENTIAL_PROVIDER=instance_metadata` ---> fetched from instance metadata service
`ESTHRI_CREDENTIAL_PROVIDER=k8s` ---> fetched from kubernetes auth service
`ESTHRI_CREDENTIAL_PROVIDER=` ---> explicitly using default credential provider if empty

If not set the program will fall back to default credential provider in which the
Expand Down
2 changes: 1 addition & 1 deletion crates/esthri-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ once_cell = "1.7"
sanitize-filename = "0.4"
serde = "1"
clap = { version = "3.2.22", features = ["derive", "env"] }
tokio = { version = "1.6", features = ["rt-multi-thread", "signal", "sync"] }
tokio = { version = "1.23.0", features = ["rt-multi-thread", "signal", "sync"] }
tokio-util = { version = "0.7.4", features = ["compat", "codec"] }
warp = "0.3"

Expand Down
6 changes: 3 additions & 3 deletions crates/esthri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ regex = "1"
serde = { version = "1", features = ["derive"] }
tempfile = "3"
thiserror = "1"
tokio = { version = "1", features = ["fs", "io-util", "sync", "parking_lot"] }
tokio = { version = "1.23.0", features = ["fs", "io-util", "sync", "parking_lot"] }
tokio-retry = "0.3"
tokio-stream = "0.1"
tokio-util = { version = "0.7", features = ["io"] }
tokio-stream = "0.1.11"
tokio-util = { version = "0.7.4", features = ["io"] }
walkdir = "2"
strum = "0.24.1"
strum_macros = "0.24.3"
Expand Down