From 475af41e19b3b0c841c0292a75881233fd7d38e6 Mon Sep 17 00:00:00 2001
From: Geoffrey Borough <105998328+gborough@users.noreply.github.com>
Date: Tue, 3 Jan 2023 12:34:36 +1100
Subject: [PATCH] upgrade tokio to address tokio panic bug [DEVINFRA-645]
 (#429)

This is part 1 of trying to fix SITL panic bug and it's best effort only
as few smaller crates still sit on lower version of tokio

The plan is to upgrade Esthri first and cut a new release, the update
all dependencies in SITL

related bug fix: https://github.com/tokio-rs/tokio/pull/4897
---
 Cargo.lock                   | 82 ++++++++++++++++++++++++++++++------
 README.md                    |  1 +
 crates/esthri-cli/Cargo.toml |  2 +-
 crates/esthri/Cargo.toml     |  6 +--
 4 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5e68a12b..50b7abd9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -733,7 +733,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
- "windows-sys",
+ "windows-sys 0.36.1",
 ]
 
 [[package]]
@@ -1346,7 +1346,7 @@ dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "windows-sys 0.36.1",
 ]
 
 [[package]]
@@ -1515,7 +1515,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-sys",
+ "windows-sys 0.36.1",
 ]
 
 [[package]]
@@ -2042,7 +2042,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
 dependencies = [
  "lazy_static",
- "windows-sys",
+ "windows-sys 0.36.1",
 ]
 
 [[package]]
@@ -2410,9 +2410,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.21.0"
+version = "1.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42"
+checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
 dependencies = [
  "autocfg",
  "bytes",
@@ -2420,13 +2420,12 @@ dependencies = [
  "memchr",
  "mio",
  "num_cpus",
- "once_cell",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "winapi",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -2857,43 +2856,100 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
 dependencies = [
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_msvc",
+ "windows_aarch64_msvc 0.36.1",
+ "windows_i686_gnu 0.36.1",
+ "windows_i686_msvc 0.36.1",
+ "windows_x86_64_gnu 0.36.1",
+ "windows_x86_64_msvc 0.36.1",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc 0.42.0",
+ "windows_i686_gnu 0.42.0",
+ "windows_i686_msvc 0.42.0",
+ "windows_x86_64_gnu 0.42.0",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc 0.42.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+
 [[package]]
 name = "winreg"
 version = "0.10.1"
diff --git a/README.md b/README.md
index 2719e0de..afaea2ea 100644
--- a/README.md
+++ b/README.md
@@ -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
diff --git a/crates/esthri-cli/Cargo.toml b/crates/esthri-cli/Cargo.toml
index 61249675..ef979500 100644
--- a/crates/esthri-cli/Cargo.toml
+++ b/crates/esthri-cli/Cargo.toml
@@ -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"
 
diff --git a/crates/esthri/Cargo.toml b/crates/esthri/Cargo.toml
index e78af443..fa063901 100644
--- a/crates/esthri/Cargo.toml
+++ b/crates/esthri/Cargo.toml
@@ -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"