diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 586659cca4..33655df0b9 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -746,9 +746,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-config" -version = "1.8.2" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd9b83179adf8998576317ce47785948bcff399ec5b15f4dfbdedd44ddf5b92" +checksum = "c0baa720ebadea158c5bda642ac444a2af0cdf7bb66b46d1e4533de5d1f449d0" dependencies = [ "aws-credential-types", "aws-runtime", @@ -835,9 +835,9 @@ dependencies = [ [[package]] name = "aws-sdk-sqs" -version = "1.78.0" +version = "1.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "010fe18815b43842c4c04657e6a22387a760382c71099e984887e0cffc6d325c" +checksum = "32a6dcd63dffae1f7872df42ce9f1f0f785f8c9a3d3e880ef6c171d0415439df" dependencies = [ "aws-credential-types", "aws-runtime", @@ -857,9 +857,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.78.0" +version = "1.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd7bc4bd34303733bded362c4c997a39130eac4310257c79aae8484b1c4b724" +checksum = "18f2f37fea82468fe3f5a059542c05392ef680c4f7f00e0db02df8b6e5c7d0c6" dependencies = [ "aws-credential-types", "aws-runtime", @@ -879,9 +879,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.79.0" +version = "1.78.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77358d25f781bb106c1a69531231d4fd12c6be904edb0c47198c604df5a2dbca" +checksum = "ecb4f6eada20e0193450cd48b12ed05e1e66baac86f39160191651b932f2b7d9" dependencies = [ "aws-credential-types", "aws-runtime", @@ -901,9 +901,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.78.0" +version = "1.79.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37f7766d2344f56d10d12f3c32993da36d78217f32594fe4fb8e57a538c1cdea" +checksum = "317377afba3498fca4948c5d32b399ef9a5ad35561a1e8a6f2ac7273dabf802d" dependencies = [ "aws-credential-types", "aws-runtime", @@ -996,7 +996,7 @@ dependencies = [ "hyper-util", "pin-project-lite", "rustls 0.21.12", - "rustls 0.23.30", + "rustls 0.23.29", "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", @@ -4144,7 +4144,7 @@ dependencies = [ "deno_core", "deno_error", "deno_native_certs", - "rustls 0.23.30", + "rustls 0.23.29", "rustls-pemfile 2.2.0", "rustls-tokio-stream", "rustls-webpki 0.102.8", @@ -6445,7 +6445,7 @@ dependencies = [ "http 1.3.1", "hyper 1.6.0", "hyper-util", - "rustls 0.23.30", + "rustls 0.23.29", "rustls-native-certs 0.8.1", "rustls-pki-types", "tokio", @@ -7547,7 +7547,7 @@ dependencies = [ "base64 0.22.1", "gethostname", "mail-builder", - "rustls 0.23.30", + "rustls 0.23.29", "rustls-pki-types", "smtp-proto", "tokio", @@ -9863,7 +9863,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.1.1", - "rustls 0.23.30", + "rustls 0.23.29", "socket2 0.5.10", "thiserror 2.0.12", "tokio", @@ -9883,7 +9883,7 @@ dependencies = [ "rand 0.9.0", "ring 0.17.14", "rustc-hash 2.1.1", - "rustls 0.23.30", + "rustls 0.23.29", "rustls-pki-types", "slab", "thiserror 2.0.12", @@ -10339,7 +10339,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.30", + "rustls 0.23.29", "rustls-native-certs 0.8.1", "rustls-pki-types", "serde", @@ -10760,9 +10760,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.30" +version = "0.23.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069a8df149a16b1a12dcc31497c3396a173844be3cac4bd40c9e7671fef96671" +checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1" dependencies = [ "aws-lc-rs", "log", @@ -10846,7 +10846,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22557157d7395bc30727745b365d923f1ecc230c4c80b176545f3f4f08c46e33" dependencies = [ "futures", - "rustls 0.23.30", + "rustls 0.23.29", "socket2 0.5.10", "tokio", ] @@ -11876,7 +11876,7 @@ dependencies = [ "memchr", "once_cell", "percent-encoding", - "rustls 0.23.30", + "rustls 0.23.29", "serde", "serde_json", "sha2 0.10.9", @@ -13353,7 +13353,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" dependencies = [ - "rustls 0.23.30", + "rustls 0.23.29", "tokio", ] @@ -14141,7 +14141,7 @@ dependencies = [ "log", "native-tls", "once_cell", - "rustls 0.23.30", + "rustls 0.23.29", "rustls-pki-types", "serde", "serde_json", @@ -14706,7 +14706,7 @@ dependencies = [ "quote", "rand 0.9.0", "reqwest 0.12.22", - "rustls 0.23.30", + "rustls 0.23.29", "serde", "serde_json", "serde_yml", @@ -14748,6 +14748,8 @@ dependencies = [ "async_zip", "aws-config", "aws-sdk-sqs", + "aws-sdk-sso", + "aws-sdk-ssooidc", "aws-sdk-sts", "axum", "backon", @@ -14804,6 +14806,7 @@ dependencies = [ "rumqttc", "rust-embed", "rust_decimal", + "rustls 0.23.29", "samael", "serde", "serde_json", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 249772a449..b1e281ac3f 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -190,7 +190,6 @@ windmill-api-client = { path = "./windmill-api-client" } reqwest-retry = "^0" reqwest-middleware = { version = "^0", features = ["json"] } -rustls = "0.23.0" memchr = "2.7.4" axum = { version = "^0.7", features = ["multipart"] } headers = "^0" @@ -354,8 +353,11 @@ datafusion = "47.0.0" object_store = { git = "https://github.com/apache/arrow-rs-object-store", rev = "36752c975d4f29e20b57c91f81a10872dcd48ae7", features = ["aws", "azure", "gcp"] } openidconnect = { version = "4.0.0-rc.1" } aws-config = "^1" -aws-sdk-sqs = "=1.78.0" -aws-sdk-sts = "=1.78.0" +aws-sdk-sqs = "=1.77.0" +aws-sdk-sts = "=1.79.0" +aws-sdk-sso = "=1.77.0" +aws-sdk-ssooidc = "=1.78.0" +rustls = "=0.23.29" diff --git a/backend/windmill-api/Cargo.toml b/backend/windmill-api/Cargo.toml index 6da7e9e411..99449b0327 100644 --- a/backend/windmill-api/Cargo.toml +++ b/backend/windmill-api/Cargo.toml @@ -32,7 +32,7 @@ http_trigger = ["dep:matchit", "dep:thiserror", "dep:sha1", "dep:constant_time_e static_frontend = ["dep:rust-embed"] postgres_trigger = ["dep:rust-postgres", "dep:pg_escape", "dep:byteorder", "dep:thiserror", "dep:rust_decimal", "dep:rust-postgres-native-tls"] mqtt_trigger = ["dep:thiserror", "dep:rumqttc"] -sqs_trigger = ["dep:aws-sdk-sqs", "dep:aws-sdk-sts", "dep:thiserror", "dep:aws-config", "dep:backon"] +sqs_trigger = ["dep:aws-sdk-sqs", "dep:aws-sdk-sts", "dep:aws-sdk-sso", "dep:aws-sdk-ssooidc", "dep:thiserror", "dep:aws-config", "dep:backon"] deno_core = ["dep:deno_core", "dep:deno_error"] gcp_trigger = ["dep:thiserror", "dep:google-cloud-pubsub", "dep:google-cloud-googleapis", "dep:tonic"] cloud = ["windmill-common/cloud"] @@ -138,8 +138,12 @@ rust_decimal = { workspace = true, optional = true } rust-postgres-native-tls = { workspace = true, optional = true} rumqttc = { workspace = true, optional = true } aws-sdk-sqs = { workspace = true, optional = true } -aws-config = { workspace = true, optional = true } +aws-sdk-sso = { workspace = true, optional = true } +aws-sdk-ssooidc = { workspace = true, optional = true } aws-sdk-sts = { workspace = true, optional = true } +rustls = { workspace = true } + +aws-config = { workspace = true, optional = true } google-cloud-pubsub = { workspace = true, optional = true } google-cloud-googleapis = { workspace = true , optional = true } tonic = { workspace = true, optional = true } diff --git a/backend/windmill-common/Cargo.toml b/backend/windmill-common/Cargo.toml index 67c4466b17..35b6572b51 100644 --- a/backend/windmill-common/Cargo.toml +++ b/backend/windmill-common/Cargo.toml @@ -63,6 +63,7 @@ object_store = { workspace = true, optional = true } prometheus = { workspace = true, optional = true } aws-config = { workspace = true, optional = true } aws-sdk-sts = { workspace = true, optional = true } + aws-smithy-types-convert = { workspace = true, optional = true } indexmap.workspace = true bytes.workspace = true