diff --git a/Cargo.lock b/Cargo.lock index 439493159..5d60e6faa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -160,23 +160,23 @@ version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcdcf0d683fe9c23d32cf5b53c9918ea0a500375a9fb20109802552658e576c9" dependencies = [ - "aws-credential-types", - "aws-http", - "aws-sdk-sso", - "aws-sdk-sts", - "aws-smithy-async", + "aws-credential-types 0.55.3", + "aws-http 0.55.3", + "aws-sdk-sso 0.28.0", + "aws-sdk-sts 0.28.0", + "aws-smithy-async 0.55.3", "aws-smithy-client", - "aws-smithy-http", + "aws-smithy-http 0.55.3", "aws-smithy-http-tower", - "aws-smithy-json", - "aws-smithy-types", - "aws-types", + "aws-smithy-json 0.55.3", + "aws-smithy-types 0.55.3", + "aws-types 0.55.3", "bytes", "fastrand 1.9.0", "hex", "http", "hyper", - "ring", + "ring 0.16.20", "time", "tokio", "tower", @@ -184,29 +184,72 @@ dependencies = [ "zeroize", ] +[[package]] +name = "aws-config" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2bf00cb9416daab4ce4927c54ebe63c08b9caf4d7b9314b6d7a4a2c5a1afb09" +dependencies = [ + "aws-credential-types 0.57.2", + "aws-http 0.57.2", + "aws-runtime", + "aws-sdk-sso 0.36.0", + "aws-sdk-ssooidc", + "aws-sdk-sts 0.36.0", + "aws-smithy-async 0.57.2", + "aws-smithy-http 0.57.2", + "aws-smithy-json 0.57.2", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types 0.57.2", + "aws-types 0.57.2", + "bytes", + "fastrand 2.0.1", + "hex", + "http", + "hyper", + "ring 0.17.7", + "time", + "tokio", + "tracing", + "zeroize", +] + [[package]] name = "aws-credential-types" version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fcdb2f7acbc076ff5ad05e7864bdb191ca70a6fd07668dc3a1a8bcd051de5ae" dependencies = [ - "aws-smithy-async", - "aws-smithy-types", + "aws-smithy-async 0.55.3", + "aws-smithy-types 0.55.3", "fastrand 1.9.0", "tokio", "tracing", "zeroize", ] +[[package]] +name = "aws-credential-types" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9073c88dbf12f68ce7d0e149f989627a1d1ae3d2b680459f04ccc29d1cbd0f" +dependencies = [ + "aws-smithy-async 0.57.2", + "aws-smithy-runtime-api", + "aws-smithy-types 0.57.2", + "zeroize", +] + [[package]] name = "aws-endpoint" version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cce1c41a6cfaa726adee9ebb9a56fcd2bbfd8be49fd8a04c5e20fd968330b04" dependencies = [ - "aws-smithy-http", - "aws-smithy-types", - "aws-types", + "aws-smithy-http 0.55.3", + "aws-smithy-types 0.55.3", + "aws-types 0.55.3", "http", "regex", "tracing", @@ -218,10 +261,10 @@ version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aadbc44e7a8f3e71c8b374e03ecd972869eb91dd2bc89ed018954a52ba84bc44" dependencies = [ - "aws-credential-types", - "aws-smithy-http", - "aws-smithy-types", - "aws-types", + "aws-credential-types 0.55.3", + "aws-smithy-http 0.55.3", + "aws-smithy-types 0.55.3", + "aws-types 0.55.3", "bytes", "http", "http-body", @@ -231,23 +274,61 @@ dependencies = [ "tracing", ] +[[package]] +name = "aws-http" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24067106d09620cf02d088166cdaedeaca7146d4d499c41b37accecbea11b246" +dependencies = [ + "aws-smithy-http 0.57.2", + "aws-smithy-runtime-api", + "aws-smithy-types 0.57.2", + "aws-types 0.57.2", + "bytes", + "http", + "http-body", + "pin-project-lite", + "tracing", +] + +[[package]] +name = "aws-runtime" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6ee0152c06d073602236a4e94a8c52a327d310c1ecd596570ce795af8777ff" +dependencies = [ + "aws-credential-types 0.57.2", + "aws-http 0.57.2", + "aws-sigv4 0.57.2", + "aws-smithy-async 0.57.2", + "aws-smithy-http 0.57.2", + "aws-smithy-runtime-api", + "aws-smithy-types 0.57.2", + "aws-types 0.57.2", + "fastrand 2.0.1", + "http", + "percent-encoding", + "tracing", + "uuid", +] + [[package]] name = "aws-sdk-ebs" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c44666651c93b43b78bc3d0bc280efffa64ab6c23ecb3370ed0760d6e69d417" dependencies = [ - "aws-credential-types", + "aws-credential-types 0.55.3", "aws-endpoint", - "aws-http", + "aws-http 0.55.3", "aws-sig-auth", - "aws-smithy-async", + "aws-smithy-async 0.55.3", "aws-smithy-client", - "aws-smithy-http", + "aws-smithy-http 0.55.3", "aws-smithy-http-tower", - "aws-smithy-json", - "aws-smithy-types", - "aws-types", + "aws-smithy-json 0.55.3", + "aws-smithy-types 0.55.3", + "aws-types 0.55.3", "bytes", "fastrand 1.9.0", "http", @@ -263,19 +344,19 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eab2493c5857725eeafe12ec66ba4ce6feb3355e3af6828d9ef28d6152972a27" dependencies = [ - "aws-credential-types", + "aws-credential-types 0.55.3", "aws-endpoint", - "aws-http", + "aws-http 0.55.3", "aws-sig-auth", - "aws-smithy-async", + "aws-smithy-async 0.55.3", "aws-smithy-client", - "aws-smithy-http", + "aws-smithy-http 0.55.3", "aws-smithy-http-tower", - "aws-smithy-json", - "aws-smithy-query", - "aws-smithy-types", - "aws-smithy-xml", - "aws-types", + "aws-smithy-json 0.55.3", + "aws-smithy-query 0.55.3", + "aws-smithy-types 0.55.3", + "aws-smithy-xml 0.55.3", + "aws-types 0.55.3", "bytes", "fastrand 1.9.0", "http", @@ -291,17 +372,17 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "545335abd7c6ef7285d2972a67b9f8279ff5fec8bbb3ffc637fa436ba1e6e434" dependencies = [ - "aws-credential-types", + "aws-credential-types 0.55.3", "aws-endpoint", - "aws-http", + "aws-http 0.55.3", "aws-sig-auth", - "aws-smithy-async", + "aws-smithy-async 0.55.3", "aws-smithy-client", - "aws-smithy-http", + "aws-smithy-http 0.55.3", "aws-smithy-http-tower", - "aws-smithy-json", - "aws-smithy-types", - "aws-types", + "aws-smithy-json 0.55.3", + "aws-smithy-types 0.55.3", + "aws-types 0.55.3", "bytes", "http", "regex", @@ -310,23 +391,45 @@ dependencies = [ "tracing", ] +[[package]] +name = "aws-sdk-kms" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674c06944cbef8df0c5ab43226f85ac28a15e6f4498d74aa200e00588b9b75e4" +dependencies = [ + "aws-credential-types 0.57.2", + "aws-http 0.57.2", + "aws-runtime", + "aws-smithy-async 0.57.2", + "aws-smithy-http 0.57.2", + "aws-smithy-json 0.57.2", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types 0.57.2", + "aws-types 0.57.2", + "bytes", + "http", + "regex", + "tracing", +] + [[package]] name = "aws-sdk-ssm" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "014a095ed73c1f789699dfeb45a2b1debb03119910392bd7fcda4a07a72b3af4" dependencies = [ - "aws-credential-types", + "aws-credential-types 0.55.3", "aws-endpoint", - "aws-http", + "aws-http 0.55.3", "aws-sig-auth", - "aws-smithy-async", + "aws-smithy-async 0.55.3", "aws-smithy-client", - "aws-smithy-http", + "aws-smithy-http 0.55.3", "aws-smithy-http-tower", - "aws-smithy-json", - "aws-smithy-types", - "aws-types", + "aws-smithy-json 0.55.3", + "aws-smithy-types 0.55.3", + "aws-types 0.55.3", "bytes", "fastrand 1.9.0", "http", @@ -336,23 +439,46 @@ dependencies = [ "tracing", ] +[[package]] +name = "aws-sdk-ssm" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8347c5e30ef76557fa42e38654c84e0dea389f3aacbb107092abbf35b67abd5" +dependencies = [ + "aws-credential-types 0.57.2", + "aws-http 0.57.2", + "aws-runtime", + "aws-smithy-async 0.57.2", + "aws-smithy-http 0.57.2", + "aws-smithy-json 0.57.2", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types 0.57.2", + "aws-types 0.57.2", + "bytes", + "fastrand 2.0.1", + "http", + "regex", + "tracing", +] + [[package]] name = "aws-sdk-sso" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8b812340d86d4a766b2ca73f740dfd47a97c2dff0c06c8517a16d88241957e4" dependencies = [ - "aws-credential-types", + "aws-credential-types 0.55.3", "aws-endpoint", - "aws-http", + "aws-http 0.55.3", "aws-sig-auth", - "aws-smithy-async", + "aws-smithy-async 0.55.3", "aws-smithy-client", - "aws-smithy-http", + "aws-smithy-http 0.55.3", "aws-smithy-http-tower", - "aws-smithy-json", - "aws-smithy-types", - "aws-types", + "aws-smithy-json 0.55.3", + "aws-smithy-types 0.55.3", + "aws-types 0.55.3", "bytes", "http", "regex", @@ -361,25 +487,69 @@ dependencies = [ "tracing", ] +[[package]] +name = "aws-sdk-sso" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb8158015232b4596ccef74a205600398e152d704b40b7ec9f486092474d7fa" +dependencies = [ + "aws-credential-types 0.57.2", + "aws-http 0.57.2", + "aws-runtime", + "aws-smithy-async 0.57.2", + "aws-smithy-http 0.57.2", + "aws-smithy-json 0.57.2", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types 0.57.2", + "aws-types 0.57.2", + "bytes", + "http", + "regex", + "tracing", +] + +[[package]] +name = "aws-sdk-ssooidc" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36a1493e1c57f173e53621935bfb5b6217376168dbdb4cd459aebcf645924a48" +dependencies = [ + "aws-credential-types 0.57.2", + "aws-http 0.57.2", + "aws-runtime", + "aws-smithy-async 0.57.2", + "aws-smithy-http 0.57.2", + "aws-smithy-json 0.57.2", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types 0.57.2", + "aws-types 0.57.2", + "bytes", + "http", + "regex", + "tracing", +] + [[package]] name = "aws-sdk-sts" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "265fac131fbfc188e5c3d96652ea90ecc676a934e3174eaaee523c6cec040b3b" dependencies = [ - "aws-credential-types", + "aws-credential-types 0.55.3", "aws-endpoint", - "aws-http", + "aws-http 0.55.3", "aws-sig-auth", - "aws-smithy-async", + "aws-smithy-async 0.55.3", "aws-smithy-client", - "aws-smithy-http", + "aws-smithy-http 0.55.3", "aws-smithy-http-tower", - "aws-smithy-json", - "aws-smithy-query", - "aws-smithy-types", - "aws-smithy-xml", - "aws-types", + "aws-smithy-json 0.55.3", + "aws-smithy-query 0.55.3", + "aws-smithy-types 0.55.3", + "aws-smithy-xml 0.55.3", + "aws-types 0.55.3", "bytes", "http", "regex", @@ -387,16 +557,39 @@ dependencies = [ "tracing", ] +[[package]] +name = "aws-sdk-sts" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e032b77f5cd1dd3669d777a38ac08cbf8ec68e29460d4ef5d3e50cffa74ec75a" +dependencies = [ + "aws-credential-types 0.57.2", + "aws-http 0.57.2", + "aws-runtime", + "aws-smithy-async 0.57.2", + "aws-smithy-http 0.57.2", + "aws-smithy-json 0.57.2", + "aws-smithy-query 0.57.2", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types 0.57.2", + "aws-smithy-xml 0.57.2", + "aws-types 0.57.2", + "http", + "regex", + "tracing", +] + [[package]] name = "aws-sig-auth" version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b94acb10af0c879ecd5c7bdf51cda6679a0a4f4643ce630905a77673bfa3c61" dependencies = [ - "aws-credential-types", - "aws-sigv4", - "aws-smithy-http", - "aws-types", + "aws-credential-types 0.55.3", + "aws-sigv4 0.55.3", + "aws-smithy-http 0.55.3", + "aws-types 0.55.3", "http", "tracing", ] @@ -407,7 +600,29 @@ version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d2ce6f507be68e968a33485ced670111d1cbad161ddbbab1e313c03d37d8f4c" dependencies = [ - "aws-smithy-http", + "aws-smithy-http 0.55.3", + "form_urlencoded", + "hex", + "hmac", + "http", + "once_cell", + "percent-encoding", + "regex", + "sha2", + "time", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64f81a6abc4daab06b53cabf27c54189928893283093e37164ca53aa47488a5b" +dependencies = [ + "aws-credential-types 0.57.2", + "aws-smithy-http 0.57.2", + "aws-smithy-runtime-api", + "bytes", "form_urlencoded", "hex", "hmac", @@ -432,16 +647,27 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "aws-smithy-async" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe53fccd3b10414b9cae63767a15a2789b34e6c6727b6e32b33e8c7998a3e80" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", +] + [[package]] name = "aws-smithy-client" version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a86aa6e21e86c4252ad6a0e3e74da9617295d8d6e374d552be7d3059c41cedd" dependencies = [ - "aws-smithy-async", - "aws-smithy-http", + "aws-smithy-async 0.55.3", + "aws-smithy-http 0.55.3", "aws-smithy-http-tower", - "aws-smithy-types", + "aws-smithy-types 0.55.3", "bytes", "fastrand 1.9.0", "http", @@ -462,7 +688,7 @@ version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b3b693869133551f135e1f2c77cb0b8277d9e3e17feaf2213f735857c4f0d28" dependencies = [ - "aws-smithy-types", + "aws-smithy-types 0.55.3", "bytes", "bytes-utils", "futures-core", @@ -478,14 +704,34 @@ dependencies = [ "tracing", ] +[[package]] +name = "aws-smithy-http" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7972373213d1d6e619c0edc9dda2d6634154e4ed75c5e0b2bf065cd5ec9f0d1" +dependencies = [ + "aws-smithy-runtime-api", + "aws-smithy-types 0.57.2", + "bytes", + "bytes-utils", + "futures-core", + "http", + "http-body", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + [[package]] name = "aws-smithy-http-tower" version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ae4f6c5798a247fac98a867698197d9ac22643596dc3777f0c76b91917616b9" dependencies = [ - "aws-smithy-http", - "aws-smithy-types", + "aws-smithy-http 0.55.3", + "aws-smithy-types 0.55.3", "bytes", "http", "http-body", @@ -500,7 +746,16 @@ version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23f9f42fbfa96d095194a632fbac19f60077748eba536eb0b9fecc28659807f8" dependencies = [ - "aws-smithy-types", + "aws-smithy-types 0.55.3", +] + +[[package]] +name = "aws-smithy-json" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d64d5af16dd585de9ff6c606423c1aaad47c6baa38de41c2beb32ef21c6645" +dependencies = [ + "aws-smithy-types 0.57.2", ] [[package]] @@ -509,10 +764,60 @@ version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98819eb0b04020a1c791903533b638534ae6c12e2aceda3e6e6fba015608d51d" dependencies = [ - "aws-smithy-types", + "aws-smithy-types 0.55.3", "urlencoding", ] +[[package]] +name = "aws-smithy-query" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7527bf5335154ba1b285479c50b630e44e93d1b4a759eaceb8d0bf9fbc82caa5" +dependencies = [ + "aws-smithy-types 0.57.2", + "urlencoding", +] + +[[package]] +name = "aws-smithy-runtime" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "839b363adf3b2bdab2742a1f540fec23039ea8bc9ec0f9f61df48470cfe5527b" +dependencies = [ + "aws-smithy-async 0.57.2", + "aws-smithy-http 0.57.2", + "aws-smithy-runtime-api", + "aws-smithy-types 0.57.2", + "bytes", + "fastrand 2.0.1", + "http", + "http-body", + "hyper", + "hyper-rustls 0.24.1", + "once_cell", + "pin-project-lite", + "pin-utils", + "rustls 0.21.9", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f24ecc446e62c3924539e7c18dec8038dba4fdf8718d5c2de62f9d2fecca8ba9" +dependencies = [ + "aws-smithy-async 0.57.2", + "aws-smithy-types 0.57.2", + "bytes", + "http", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", +] + [[package]] name = "aws-smithy-types" version = "0.55.3" @@ -526,6 +831,29 @@ dependencies = [ "time", ] +[[package]] +name = "aws-smithy-types" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051de910296522a21178a2ea402ea59027eef4b63f1cef04a0be2bb5e25dea03" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http", + "http-body", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", + "tokio", + "tokio-util", +] + [[package]] name = "aws-smithy-xml" version = "0.55.3" @@ -535,17 +863,41 @@ dependencies = [ "xmlparser", ] +[[package]] +name = "aws-smithy-xml" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb1e3ac22c652662096c8e37a6f9af80c6f3520cab5610b2fe76c725bce18eac" +dependencies = [ + "xmlparser", +] + [[package]] name = "aws-types" version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dd209616cc8d7bfb82f87811a5c655dc97537f592689b18743bddf5dc5c4829" dependencies = [ - "aws-credential-types", - "aws-smithy-async", + "aws-credential-types 0.55.3", + "aws-smithy-async 0.55.3", "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-types", + "aws-smithy-http 0.55.3", + "aws-smithy-types 0.55.3", + "http", + "rustc_version", + "tracing", +] + +[[package]] +name = "aws-types" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048bbf1c24cdf4eb1efcdc243388a93a90ebf63979e25fc1c7b8cbd9cb6beb38" +dependencies = [ + "aws-credential-types 0.57.2", + "aws-smithy-async 0.57.2", + "aws-smithy-runtime-api", + "aws-smithy-types 0.57.2", "http", "rustc_version", "tracing", @@ -789,11 +1141,11 @@ checksum = "faa54b44a1a199e3f37ba30ffb7391ed2fe1e4deb15cc55232786b2ca228cb33" dependencies = [ "argh", "async-trait", - "aws-config", + "aws-config 0.55.3", "aws-sdk-ebs", "aws-sdk-ec2", - "aws-smithy-http", - "aws-types", + "aws-smithy-http 0.55.3", + "aws-types 0.55.3", "base64 0.13.1", "bytes", "env_logger", @@ -1475,7 +1827,7 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.21.7", + "rustls 0.21.9", "rustls-native-certs", "tokio", "tokio-rustls 0.24.1", @@ -1678,7 +2030,7 @@ dependencies = [ "pem 1.1.1", "pin-project", "rand", - "rustls 0.21.7", + "rustls 0.21.9", "rustls-pemfile", "secrecy", "serde", @@ -2147,15 +2499,15 @@ dependencies = [ name = "pubsys" version = "0.1.0" dependencies = [ - "aws-config", - "aws-credential-types", + "aws-config 0.55.3", + "aws-credential-types 0.55.3", "aws-sdk-ebs", "aws-sdk-ec2", - "aws-sdk-kms", - "aws-sdk-ssm", - "aws-sdk-sts", - "aws-smithy-types", - "aws-types", + "aws-sdk-kms 0.28.0", + "aws-sdk-ssm 0.28.0", + "aws-sdk-sts 0.28.0", + "aws-smithy-types 0.55.3", + "aws-types 0.55.3", "buildsys", "bytes", "chrono", @@ -2184,9 +2536,9 @@ dependencies = [ "tokio", "tokio-stream", "toml", - "tough", - "tough-kms", - "tough-ssm", + "tough 0.15.0", + "tough-kms 0.7.0", + "tough-ssm 0.10.0", "update-metadata", "url", ] @@ -2389,7 +2741,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.7", + "rustls 0.21.9", "rustls-pemfile", "serde", "serde_json", @@ -2417,12 +2769,26 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -2458,19 +2824,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" dependencies = [ "log", - "ring", + "ring 0.17.7", "rustls-webpki", "sct", ] @@ -2498,12 +2864,12 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.6" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -2566,8 +2932,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -2844,6 +3210,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "strsim" version = "0.10.0" @@ -2971,7 +3343,7 @@ name = "testsys" version = "0.1.0" dependencies = [ "async-trait", - "aws-config", + "aws-config 0.55.3", "aws-sdk-ec2", "base64 0.21.4", "bottlerocket-types", @@ -3177,7 +3549,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.7", + "rustls 0.21.9", "tokio", ] @@ -3278,7 +3650,41 @@ dependencies = [ "pem 3.0.2", "percent-encoding", "reqwest", - "ring", + "ring 0.16.20", + "serde", + "serde_json", + "serde_plain", + "snafu", + "tempfile", + "tokio", + "tokio-util", + "typed-path 0.6.0", + "untrusted 0.7.1", + "url", + "walkdir", +] + +[[package]] +name = "tough" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49455926f64001de53ef047c2053e2f17440e412b8b1e958d4ad8a6008db7128" +dependencies = [ + "async-recursion", + "async-trait", + "bytes", + "chrono", + "dyn-clone", + "futures", + "futures-core", + "globset", + "hex", + "log", + "olpc-cjson", + "pem 3.0.2", + "percent-encoding", + "reqwest", + "ring 0.17.7", "serde", "serde_json", "serde_plain", @@ -3286,8 +3692,8 @@ dependencies = [ "tempfile", "tokio", "tokio-util", - "typed-path", - "untrusted", + "typed-path 0.7.0", + "untrusted 0.9.0", "url", "walkdir", ] @@ -3298,13 +3704,28 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99a56a6fa02de987070fdf751b7d761af8f750ed51b269ee0bb8c9f0d98db4c1" dependencies = [ - "aws-config", - "aws-sdk-kms", + "aws-config 0.55.3", + "aws-sdk-kms 0.28.0", "pem 3.0.2", - "ring", + "ring 0.16.20", "snafu", "tokio", - "tough", + "tough 0.15.0", +] + +[[package]] +name = "tough-kms" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36dbf700ca9746b53dc54a514742b09e554a248be0a2568ca59a239c8a8e1eff" +dependencies = [ + "aws-config 0.57.2", + "aws-sdk-kms 0.36.0", + "pem 3.0.2", + "ring 0.17.7", + "snafu", + "tokio", + "tough 0.16.0", ] [[package]] @@ -3313,11 +3734,24 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "211fc74d544db304d19d4c9030a5e2dd189ce82496b16f1627ad201062351d30" dependencies = [ - "aws-config", - "aws-sdk-ssm", + "aws-config 0.55.3", + "aws-sdk-ssm 0.28.0", + "snafu", + "tokio", + "tough 0.15.0", +] + +[[package]] +name = "tough-ssm" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eb7a0ac2f7164ef55fc863d098ac5474c49dc4839992852c91ceab33037ce69" +dependencies = [ + "aws-config 0.57.2", + "aws-sdk-ssm 0.36.0", "snafu", "tokio", - "tough", + "tough 0.16.0", ] [[package]] @@ -3420,13 +3854,13 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tuftool" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd87a609b3ea68aba986684805e99fa2a901e4c0d4bec6705f1bfb0b5b60c7d" +checksum = "a8c7583283f06d2f3bf80984868e83d73f5527ab63fffb4bc1ef9869eff8c57b" dependencies = [ - "aws-config", - "aws-sdk-kms", - "aws-sdk-ssm", + "aws-config 0.57.2", + "aws-sdk-kms 0.36.0", + "aws-sdk-ssm 0.36.0", "chrono", "clap", "futures", @@ -3434,19 +3868,18 @@ dependencies = [ "log", "maplit", "olpc-cjson", - "pem 3.0.2", "rayon", "reqwest", - "ring", + "ring 0.17.7", "serde", "serde_json", "simplelog", "snafu", "tempfile", "tokio", - "tough", - "tough-kms", - "tough-ssm", + "tough 0.16.0", + "tough-kms 0.8.0", + "tough-ssm 0.11.0", "url", "walkdir", ] @@ -3503,6 +3936,12 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb9d13b8242894ff21f9990082b90a6410a43dcc6029ac4227a1467853ba781" +[[package]] +name = "typed-path" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a90726108dab678edab76459751e1cc7c597c3484a6384d6423191255fa641b" + [[package]] name = "typenum" version = "1.17.0" @@ -3560,6 +3999,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "update-metadata" version = "0.1.0" @@ -3746,8 +4191,8 @@ version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] diff --git a/deny.toml b/deny.toml index ba9df0464..656141588 100644 --- a/deny.toml +++ b/deny.toml @@ -98,6 +98,19 @@ skip-tree = [ # dependency tree because windows-sys has many sub-crates # that differ in major version. { name = "windows-sys" }, + + # We needed a fix in tuftool 0.10.2, but it also included AWS Rust SDK updates. We cannot update + # tough, tough-kms and tough-ssm at the same time, though, because of these issues: + # - https://github.com/awslabs/tough/issues/733 + # - https://github.com/awslabs/coldsnap/issues/301 + # - https://github.com/awslabs/coldsnap/issues/302 + # + # For the time being, this means that we are building multiple versions of the AWS Rust SDK + # which increases build times and needs to be addressed as soon as possible. + # - https://github.com/bottlerocket-os/twoliter/issues/124 + { name = "tough", version = "0.15" }, + { name = "tough-kms", version = "0.7" }, + { name = "tough-ssm", version = "0.10" }, ] [sources]