From 5d83daf9b56ff8895a8b6b5db8f7ac7c73c811af Mon Sep 17 00:00:00 2001 From: Brian Balser Date: Wed, 28 Jun 2023 09:10:31 -0400 Subject: [PATCH] Revert "Update aws and tempfile libs (#550)" This reverts commit 962cf8bbf1aecff62072c9e91dbc1050c38aa5c6. --- Cargo.lock | 454 ++++++++++++++++++++-------------- db_store/src/error.rs | 4 +- db_store/src/iam_auth_pool.rs | 2 +- file_store/Cargo.toml | 8 +- file_store/src/error.rs | 8 +- file_store/src/file_info.rs | 4 +- file_store/src/file_store.rs | 19 +- 7 files changed, 290 insertions(+), 209 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a318e1c49..49994e7cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -531,23 +531,21 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "aws-config" -version = "0.55.3" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdcf0d683fe9c23d32cf5b53c9918ea0a500375a9fb20109802552658e576c9" +checksum = "56a636c44c77fa18bdba56126a34d30cfe5538fe88f7d34988fa731fee143ddd" dependencies = [ - "aws-credential-types", "aws-http", "aws-sdk-sso", "aws-sdk-sts", - "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-http-tower", + "aws-smithy-async 0.51.0", + "aws-smithy-client 0.51.0", + "aws-smithy-http 0.51.0", + "aws-smithy-http-tower 0.51.0", "aws-smithy-json", - "aws-smithy-types", - "aws-types", + "aws-smithy-types 0.51.0", + "aws-types 0.51.0", "bytes", - "fastrand", "hex", "http", "hyper", @@ -561,13 +559,12 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "0.55.3" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fcdb2f7acbc076ff5ad05e7864bdb191ca70a6fd07668dc3a1a8bcd051de5ae" +checksum = "bb0696a0523a39a19087747e4dafda0362dc867531e3d72a3f195564c84e5e08" dependencies = [ - "aws-smithy-async", - "aws-smithy-types", - "fastrand", + "aws-smithy-async 0.54.4", + "aws-smithy-types 0.54.4", "tokio", "tracing", "zeroize", @@ -575,13 +572,13 @@ dependencies = [ [[package]] name = "aws-endpoint" -version = "0.55.3" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cce1c41a6cfaa726adee9ebb9a56fcd2bbfd8be49fd8a04c5e20fd968330b04" +checksum = "6ca8f374874f6459aaa88dc861d7f5d834ca1ff97668eae190e97266b5f6c3fb" dependencies = [ - "aws-smithy-http", - "aws-smithy-types", - "aws-types", + "aws-smithy-http 0.51.0", + "aws-smithy-types 0.51.0", + "aws-types 0.51.0", "http", "regex", "tracing", @@ -589,14 +586,13 @@ dependencies = [ [[package]] name = "aws-http" -version = "0.55.3" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aadbc44e7a8f3e71c8b374e03ecd972869eb91dd2bc89ed018954a52ba84bc44" +checksum = "78d41e19e779b73463f5f0c21b3aacc995f4ba783ab13a7ae9f5dfb159a551b4" dependencies = [ - "aws-credential-types", - "aws-smithy-http", - "aws-smithy-types", - "aws-types", + "aws-smithy-http 0.51.0", + "aws-smithy-types 0.51.0", + "aws-types 0.51.0", "bytes", "http", "http-body", @@ -608,114 +604,133 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "0.28.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba197193cbb4bcb6aad8d99796b2291f36fa89562ded5d4501363055b0de89f" +checksum = "a9f08665c8e03aca8cb092ef01e617436ebfa977fddc1240e1b062488ab5d48a" dependencies = [ - "aws-credential-types", "aws-endpoint", "aws-http", - "aws-sig-auth", - "aws-sigv4", - "aws-smithy-async", + "aws-sig-auth 0.51.0", + "aws-sigv4 0.51.0", + "aws-smithy-async 0.51.0", "aws-smithy-checksums", - "aws-smithy-client", + "aws-smithy-client 0.51.0", "aws-smithy-eventstream", - "aws-smithy-http", - "aws-smithy-http-tower", - "aws-smithy-json", - "aws-smithy-types", + "aws-smithy-http 0.51.0", + "aws-smithy-http-tower 0.51.0", + "aws-smithy-types 0.51.0", "aws-smithy-xml", - "aws-types", + "aws-types 0.51.0", "bytes", + "bytes-utils", "http", "http-body", - "once_cell", - "percent-encoding", - "regex", "tokio-stream", "tower", "tracing", - "url", ] [[package]] name = "aws-sdk-sso" -version = "0.28.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b812340d86d4a766b2ca73f740dfd47a97c2dff0c06c8517a16d88241957e4" +checksum = "86dcb1cb71aa8763b327542ead410424515cff0cde5b753eedd2917e09c63734" dependencies = [ - "aws-credential-types", "aws-endpoint", "aws-http", - "aws-sig-auth", - "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-http-tower", + "aws-sig-auth 0.51.0", + "aws-smithy-async 0.51.0", + "aws-smithy-client 0.51.0", + "aws-smithy-http 0.51.0", + "aws-smithy-http-tower 0.51.0", "aws-smithy-json", - "aws-smithy-types", - "aws-types", + "aws-smithy-types 0.51.0", + "aws-types 0.51.0", "bytes", "http", - "regex", "tokio-stream", "tower", - "tracing", ] [[package]] name = "aws-sdk-sts" -version = "0.28.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265fac131fbfc188e5c3d96652ea90ecc676a934e3174eaaee523c6cec040b3b" +checksum = "fdfcf584297c666f6b472d5368a78de3bc714b6e0a53d7fbf76c3e347c292ab1" dependencies = [ - "aws-credential-types", "aws-endpoint", "aws-http", - "aws-sig-auth", - "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-http-tower", - "aws-smithy-json", + "aws-sig-auth 0.51.0", + "aws-smithy-async 0.51.0", + "aws-smithy-client 0.51.0", + "aws-smithy-http 0.51.0", + "aws-smithy-http-tower 0.51.0", "aws-smithy-query", - "aws-smithy-types", + "aws-smithy-types 0.51.0", "aws-smithy-xml", - "aws-types", + "aws-types 0.51.0", "bytes", "http", - "regex", "tower", +] + +[[package]] +name = "aws-sig-auth" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cbe7b2be9e185c1fbce27fc9c41c66b195b32d89aa099f98768d9544221308" +dependencies = [ + "aws-sigv4 0.51.0", + "aws-smithy-eventstream", + "aws-smithy-http 0.51.0", + "aws-types 0.51.0", + "http", "tracing", ] [[package]] name = "aws-sig-auth" -version = "0.55.3" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b94acb10af0c879ecd5c7bdf51cda6679a0a4f4643ce630905a77673bfa3c61" +checksum = "660a02a98ab1af83bd8d714afbab2d502ba9b18c49e7e4cddd6bf8837ff778cb" dependencies = [ "aws-credential-types", - "aws-sigv4", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-types", + "aws-sigv4 0.54.1", + "aws-smithy-http 0.54.4", + "aws-types 0.54.1", "http", "tracing", ] [[package]] name = "aws-sigv4" -version = "0.55.3" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2ce6f507be68e968a33485ced670111d1cbad161ddbbab1e313c03d37d8f4c" +checksum = "03ff4cff8c4a101962d593ba94e72cd83891aecd423f0c6e3146bff6fb92c9e3" dependencies = [ "aws-smithy-eventstream", - "aws-smithy-http", + "aws-smithy-http 0.51.0", "bytes", "form_urlencoded", "hex", + "http", + "once_cell", + "percent-encoding", + "regex", + "ring", + "time 0.3.17", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "0.54.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdaf11005b7444e6cd66f600d09861a3aeb6eb89a0f003c7c9820dbab2d15297" +dependencies = [ + "aws-smithy-http 0.54.4", + "form_urlencoded", + "hex", "hmac 0.12.1", "http", "once_cell", @@ -728,9 +743,21 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "0.55.3" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bda3996044c202d75b91afeb11a9afae9db9a721c6a7a427410018e286b880" +checksum = "7b3442b4c5d3fc39891a2e5e625735fba6b24694887d49c6518460fde98247a9" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", + "tokio-stream", +] + +[[package]] +name = "aws-smithy-async" +version = "0.54.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63c712a28a4f2f2139759235c08bf98aca99d4fdf1b13c78c5f95613df0a5db9" dependencies = [ "futures-util", "pin-project-lite", @@ -740,12 +767,12 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.55.3" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ed8b96d95402f3f6b8b57eb4e0e45ee365f78b1a924faf20ff6e97abf1eae6" +checksum = "cc227e36e346f45298288359f37123e1a92628d1cec6b11b5eb335553278bd9e" dependencies = [ - "aws-smithy-http", - "aws-smithy-types", + "aws-smithy-http 0.51.0", + "aws-smithy-types 0.51.0", "bytes", "crc32c", "crc32fast", @@ -761,14 +788,14 @@ dependencies = [ [[package]] name = "aws-smithy-client" -version = "0.55.3" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a86aa6e21e86c4252ad6a0e3e74da9617295d8d6e374d552be7d3059c41cedd" +checksum = "ff28d553714f8f54cd921227934fc13a536a1c03f106e56b362fd57e16d450ad" dependencies = [ - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-http-tower", - "aws-smithy-types", + "aws-smithy-async 0.51.0", + "aws-smithy-http 0.51.0", + "aws-smithy-http-tower 0.51.0", + "aws-smithy-types 0.51.0", "bytes", "fastrand", "http", @@ -777,7 +804,26 @@ dependencies = [ "hyper-rustls", "lazy_static", "pin-project-lite", - "rustls", + "tokio", + "tower", + "tracing", +] + +[[package]] +name = "aws-smithy-client" +version = "0.54.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "104ca17f56cde00a10207169697dfe9c6810db339d52fb352707e64875b30a44" +dependencies = [ + "aws-smithy-async 0.54.4", + "aws-smithy-http 0.54.4", + "aws-smithy-http-tower 0.54.4", + "aws-smithy-types 0.54.4", + "bytes", + "fastrand", + "http", + "http-body", + "pin-project-lite", "tokio", "tower", "tracing", @@ -785,23 +831,23 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.55.3" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "460c8da5110835e3d9a717c61f5556b20d03c32a1dec57f8fc559b360f733bb8" +checksum = "d7ea0df7161ce65b5c8ca6eb709a1a907376fa18226976e41c748ce02ccccf24" dependencies = [ - "aws-smithy-types", + "aws-smithy-types 0.51.0", "bytes", "crc32fast", ] [[package]] name = "aws-smithy-http" -version = "0.55.3" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3b693869133551f135e1f2c77cb0b8277d9e3e17feaf2213f735857c4f0d28" +checksum = "bf58ed4fefa61dbf038e5421a521cbc2c448ef69deff0ab1d915d8a10eda5664" dependencies = [ "aws-smithy-eventstream", - "aws-smithy-types", + "aws-smithy-types 0.51.0", "bytes", "bytes-utils", "futures-core", @@ -817,14 +863,49 @@ dependencies = [ "tracing", ] +[[package]] +name = "aws-smithy-http" +version = "0.54.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "873f316f1833add0d3aa54ed1b0cd252ddd88c792a0cf839886400099971e844" +dependencies = [ + "aws-smithy-types 0.54.4", + "bytes", + "bytes-utils", + "futures-core", + "http", + "http-body", + "hyper", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-http-tower" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20c96d7bd35e7cf96aca1134b2f81b1b59ffe493f7c6539c051791cbbf7a42d3" +dependencies = [ + "aws-smithy-http 0.51.0", + "bytes", + "http", + "http-body", + "pin-project-lite", + "tower", + "tracing", +] + [[package]] name = "aws-smithy-http-tower" -version = "0.55.3" +version = "0.54.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae4f6c5798a247fac98a867698197d9ac22643596dc3777f0c76b91917616b9" +checksum = "4f38231d3f5dac9ac7976f44e12803add1385119ffca9e5f050d8e980733d164" dependencies = [ - "aws-smithy-http", - "aws-smithy-types", + "aws-smithy-http 0.54.4", + "aws-smithy-types 0.54.4", "bytes", "http", "http-body", @@ -835,28 +916,40 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.55.3" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f9f42fbfa96d095194a632fbac19f60077748eba536eb0b9fecc28659807f8" +checksum = "d8324ba98c8a94187723cc16c37aefa09504646ee65c3d2c3af495bab5ea701b" dependencies = [ - "aws-smithy-types", + "aws-smithy-types 0.51.0", ] [[package]] name = "aws-smithy-query" -version = "0.55.3" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98819eb0b04020a1c791903533b638534ae6c12e2aceda3e6e6fba015608d51d" +checksum = "83834ed2ff69ea6f6657baf205267dc2c0abe940703503a3e5d60ce23be3d306" dependencies = [ - "aws-smithy-types", + "aws-smithy-types 0.51.0", "urlencoding", ] [[package]] name = "aws-smithy-types" -version = "0.55.3" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b02e06ea63498c43bc0217ea4d16605d4e58d85c12fc23f6572ff6d0a840c61" +dependencies = [ + "itoa 1.0.4", + "num-integer", + "ryu", + "time 0.3.17", +] + +[[package]] +name = "aws-smithy-types" +version = "0.54.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a3d0bf4f324f4ef9793b86a1701d9700fbcdbd12a846da45eed104c634c6e8" +checksum = "8161232eda10290f5136610a1eb9de56aceaccd70c963a26a260af20ac24794f" dependencies = [ "base64-simd", "itoa 1.0.4", @@ -867,24 +960,40 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.55.3" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b9d12875731bd07e767be7baad95700c3137b56730ec9ddeedb52a5e5ca63b" +checksum = "246e9f83dd1fdf5d347fa30ae4ad30a9d1d42ce4cd74a93d94afa874646f94cd" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "0.55.3" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd209616cc8d7bfb82f87811a5c655dc97537f592689b18743bddf5dc5c4829" +checksum = "05701d32da168b44f7ee63147781aed8723e792cc131cb9b18363b5393f17f70" +dependencies = [ + "aws-smithy-async 0.51.0", + "aws-smithy-client 0.51.0", + "aws-smithy-http 0.51.0", + "aws-smithy-types 0.51.0", + "http", + "rustc_version 0.4.0", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-types" +version = "0.54.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f15b34253b68cde08e39b0627cc6101bcca64351229484b4743392c035d057" dependencies = [ "aws-credential-types", - "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-types", + "aws-smithy-async 0.54.4", + "aws-smithy-client 0.54.4", + "aws-smithy-http 0.54.4", + "aws-smithy-types 0.54.4", "http", "rustc_version 0.4.0", "tracing", @@ -1019,7 +1128,7 @@ dependencies = [ "rand_chacha 0.3.0", "rust_decimal", "serde", - "sha2 0.9.9", + "sha2 0.10.6", "thiserror", ] @@ -1928,9 +2037,9 @@ dependencies = [ "aws-config", "aws-credential-types", "aws-sdk-sts", - "aws-sig-auth", - "aws-smithy-http", - "aws-types", + "aws-sig-auth 0.54.1", + "aws-smithy-http 0.54.4", + "aws-types 0.54.1", "futures", "http", "http-serde", @@ -1957,7 +2066,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "sha2 0.9.9", + "sha2 0.10.6", "structopt", "thiserror", "tracing", @@ -2313,17 +2422,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -2372,8 +2470,8 @@ dependencies = [ "async-compression", "async-trait", "aws-config", - "aws-credential-types", "aws-sdk-s3", + "aws-types 0.51.0", "base64 0.21.0", "beacon", "blake3", @@ -2399,7 +2497,7 @@ dependencies = [ "rust_decimal_macros", "serde", "serde_json", - "sha2 0.9.9", + "sha2 0.10.6", "sqlx", "strum", "strum_macros", @@ -2703,9 +2801,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.19" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" dependencies = [ "bytes", "fnv", @@ -2817,7 +2915,7 @@ dependencies = [ "p256", "rand_core 0.6.4", "serde", - "sha2 0.9.9", + "sha2 0.10.6", "signature", "solana-sdk", "sqlx", @@ -2958,9 +3056,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes", "fnv", @@ -3014,9 +3112,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" dependencies = [ "bytes", "futures-channel", @@ -3163,7 +3261,7 @@ dependencies = [ "prost", "serde", "serde_json", - "sha2 0.9.9", + "sha2 0.10.6", "thiserror", "tokio", "tonic", @@ -3309,7 +3407,7 @@ dependencies = [ "rust_decimal_macros", "serde", "serde_json", - "sha2 0.9.9", + "sha2 0.10.6", "sqlx", "thiserror", "tokio", @@ -3335,7 +3433,7 @@ checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" dependencies = [ "hermit-abi 0.2.6", "io-lifetimes", - "rustix 0.36.7", + "rustix", "windows-sys 0.42.0", ] @@ -3521,9 +3619,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "libflate" @@ -3630,12 +3728,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "lock_api" version = "0.4.9" @@ -3923,7 +4015,7 @@ dependencies = [ "poc-metrics", "prost", "serde", - "sha2 0.9.9", + "sha2 0.10.6", "solana", "sqlx", "thiserror", @@ -3967,7 +4059,7 @@ dependencies = [ "rust_decimal_macros", "serde", "serde_json", - "sha2 0.9.9", + "sha2 0.10.6", "sqlx", "thiserror", "tokio", @@ -4397,7 +4489,7 @@ dependencies = [ "cfg-if", "instant", "libc", - "redox_syscall 0.2.16", + "redox_syscall", "smallvec", "winapi", ] @@ -4410,7 +4502,7 @@ checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall", "smallvec", "windows-sys 0.42.0", ] @@ -5032,15 +5124,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_users" version = "0.4.3" @@ -5048,7 +5131,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom 0.2.8", - "redox_syscall 0.2.16", + "redox_syscall", "thiserror", ] @@ -5078,6 +5161,15 @@ version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + [[package]] name = "reqwest" version = "0.11.14" @@ -5159,7 +5251,7 @@ dependencies = [ "rust_decimal_macros", "serde", "serde_json", - "sha2 0.9.9", + "sha2 0.10.6", "sqlx", "thiserror", "tokio", @@ -5348,27 +5440,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" dependencies = [ "bitflags 1.3.2", - "errno 0.2.8", + "errno", "io-lifetimes", "libc", - "linux-raw-sys 0.1.4", + "linux-raw-sys", "windows-sys 0.42.0", ] -[[package]] -name = "rustix" -version = "0.37.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" -dependencies = [ - "bitflags 1.3.2", - "errno 0.3.1", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - [[package]] name = "rustls" version = "0.20.7" @@ -5814,7 +5892,7 @@ dependencies = [ "helium-sub-daos", "metrics", "serde", - "sha2 0.9.9", + "sha2 0.10.6", "solana-client", "solana-program", "solana-sdk", @@ -6888,16 +6966,16 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "autocfg", "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.20", - "windows-sys 0.48.0", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", ] [[package]] diff --git a/db_store/src/error.rs b/db_store/src/error.rs index 52ad13b3e..0277f0439 100644 --- a/db_store/src/error.rs +++ b/db_store/src/error.rs @@ -13,9 +13,7 @@ pub enum Error { #[error("invalid configuration: {0}")] InvalidConfiguration(String), #[error("Aws Assume Role Error")] - AwsStsError( - #[from] aws_sdk_sts::error::SdkError, - ), + AwsStsError(#[from] aws_sdk_sts::types::SdkError), #[error("Assumed Credentials were invalid: {0}")] InvalidAssumedCredentials(String), #[error("Aws Signing Error")] diff --git a/db_store/src/iam_auth_pool.rs b/db_store/src/iam_auth_pool.rs index 67d27a3df..2e912008b 100644 --- a/db_store/src/iam_auth_pool.rs +++ b/db_store/src/iam_auth_pool.rs @@ -166,7 +166,7 @@ impl ConnectParameters { async fn assume_role( &self, client: &aws_sdk_sts::Client, - ) -> Result { + ) -> Result { client .assume_role() .role_arn(self.iam_role_arn.clone()) diff --git a/file_store/Cargo.toml b/file_store/Cargo.toml index 9bdafbbeb..5d0d6d1ae 100644 --- a/file_store/Cargo.toml +++ b/file_store/Cargo.toml @@ -29,9 +29,9 @@ helium-proto = {workspace = true} helium-crypto = {workspace = true} csv = "*" http = {workspace = true} -aws-config = "0" -aws-sdk-s3 = "0" -aws-credential-types = { version = "0", features = ["hardcoded-credentials"], optional = true} +aws-config = "0.51" +aws-sdk-s3 = "0.21" +aws-types = { version = "0.51", features = ["hardcoded-credentials"], optional = true} strum = {version = "0", features = ["derive"]} strum_macros = "0" sha2 = {workspace = true} @@ -52,4 +52,4 @@ hex-literal = "0" tempfile = "3" [features] -local = ["aws-credential-types"] +local = ["aws-types"] diff --git a/file_store/src/error.rs b/file_store/src/error.rs index ace422583..9aae093be 100644 --- a/file_store/src/error.rs +++ b/file_store/src/error.rs @@ -17,7 +17,7 @@ pub enum Error { #[error("csv error")] Csv(#[from] csv::Error), #[error("aws error")] - Aws(Box), + Aws(#[from] aws_sdk_s3::Error), #[error("config error")] Config(#[from] config::ConfigError), #[error("mpsc channel error")] @@ -134,9 +134,3 @@ impl From for Error { Self::Crypto(Box::new(err)) } } - -impl From for Error { - fn from(err: aws_sdk_s3::Error) -> Self { - Self::Aws(Box::new(err)) - } -} diff --git a/file_store/src/file_info.rs b/file_store/src/file_info.rs index 312d10164..57f9d6143 100644 --- a/file_store/src/file_info.rs +++ b/file_store/src/file_info.rs @@ -66,9 +66,9 @@ impl From<(FileType, DateTime)> for FileInfo { } } -impl TryFrom<&aws_sdk_s3::types::Object> for FileInfo { +impl TryFrom<&aws_sdk_s3::model::Object> for FileInfo { type Error = Error; - fn try_from(value: &aws_sdk_s3::types::Object) -> Result { + fn try_from(value: &aws_sdk_s3::model::Object) -> Result { let size = value.size() as usize; let key = value .key diff --git a/file_store/src/file_store.rs b/file_store/src/file_store.rs index 2b38e387c..64a04c837 100644 --- a/file_store/src/file_store.rs +++ b/file_store/src/file_store.rs @@ -1,10 +1,14 @@ -use crate::{BytesMutStream, Error, FileInfo, FileInfoStream, FileType, Result, Settings}; +use crate::{ + error::DecodeError, BytesMutStream, Error, FileInfo, FileInfoStream, FileType, Result, Settings, +}; use aws_config::meta::region::RegionProviderChain; -use aws_sdk_s3::{config::Region, primitives::ByteStream, Client}; +use aws_sdk_s3::{types::ByteStream, Client, Endpoint, Region}; use chrono::{DateTime, Utc}; use futures::FutureExt; use futures::{stream, StreamExt, TryFutureExt, TryStreamExt}; +use http::Uri; use std::path::Path; +use std::str::FromStr; #[derive(Debug, Clone)] pub struct FileStore { @@ -19,12 +23,19 @@ pub struct FileData { impl FileStore { pub async fn from_settings(settings: &Settings) -> Result { + let endpoint: Option = match &settings.endpoint { + Some(endpoint) => Uri::from_str(endpoint) + .map(Endpoint::immutable) + .map(Some) + .map_err(DecodeError::from)?, + _ => None, + }; let region = Region::new(settings.region.clone()); let region_provider = RegionProviderChain::first_try(region).or_default_provider(); let mut config = aws_config::from_env().region(region_provider); - if let Some(endpoint) = &settings.endpoint { - config = config.endpoint_url(endpoint); + if let Some(endpoint) = endpoint { + config = config.endpoint_resolver(endpoint); } #[cfg(feature = "local")]