Skip to content

Commit ee494d8

Browse files
nipunn1313Convex, Inc.
authored and
Convex, Inc.
committed
Vendor native tls and link statically. (#28505)
Statically link across the board. GitOrigin-RevId: 39e17da49f706cae673003aeced85c4f32007443
1 parent fd2185a commit ee494d8

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ rand = "0.8"
9999
rand_chacha = "0.3.1"
100100
ref-cast = "1.0.20"
101101
regex = "1"
102-
reqwest = { version = "0.11.24", features = [ "json", "stream", "gzip" ] }
102+
reqwest = { version = "0.11.24", features = [ "json", "stream", "gzip", "native-tls-vendored" ] }
103103
reqwest-middleware = "0.2.0"
104104
ring = "0.17.8"
105105
rsa = "0.9.6"
@@ -128,7 +128,7 @@ tokio = { version = "1", features = [ "full" ] }
128128
tokio-metrics-collector = { version = "0.2.1" }
129129
tokio-process-stream = { version = "0.4.0" }
130130
tokio-stream = { version = "0.1", features = [ "io-util", "sync", "signal" ] }
131-
tokio-tungstenite = "0.20.0"
131+
tokio-tungstenite = { version = "0.20.0", features = [ "native-tls-vendored" ] }
132132
tonic = { version = "0.10.2", features = [ "gzip" ] }
133133
tonic-build = "0.10.0"
134134
tonic-health = "0.10.0"
@@ -139,7 +139,7 @@ tracing = "0.1"
139139
tracing-appender = { version = "0.2" }
140140
tracing-subscriber = { version = "0.3.17", features = [ "env-filter", "json" ] }
141141
tracy-client = { version = "0.17.0", default-features = false, features = [ "fibers" ] }
142-
tungstenite = "0.20.0"
142+
tungstenite = { version = "0.20.0", features = [ "native-tls-vendored" ] }
143143
url = "2"
144144
uuid = { version = "1.6", features = [ "serde", "v4" ] }
145145
walkdir = "2"

crates/convex/Cargo.oss.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ proptest-derive = { version = "0.4.0" }
4343
tracing-subscriber = { features = [ "env-filter" ], version = "0.3.17" }
4444

4545
[features]
46-
default = [ "native-tls" ]
46+
default = [ "native-tls-vendored" ]
4747
native-tls = [ "tokio-tungstenite/native-tls" ]
4848
native-tls-vendored = [ "tokio-tungstenite/native-tls-vendored" ]
4949
rustls-tls-native-roots = [ "tokio-tungstenite/rustls-tls-native-roots" ]

crates/convex/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ proptest-derive = { workspace = true }
4848
tracing-subscriber = { workspace = true, features = ["env-filter"] }
4949

5050
[features]
51-
default = ["native-tls"]
51+
default = ["native-tls-vendored"]
5252
native-tls = ["tokio-tungstenite/native-tls"]
5353
native-tls-vendored = ["tokio-tungstenite/native-tls-vendored"]
5454
rustls-tls-native-roots = ["tokio-tungstenite/rustls-tls-native-roots"]

crates/fivetran_common/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ anyhow = { workspace = true }
1818
proptest = { workspace = true, optional = true }
1919
prost = { workspace = true }
2020
prost-types = { workspace = true }
21-
reqwest = { workspace = true, features = ["json", "native-tls-vendored"] }
22-
tonic = { workspace = true, features = ["gzip"] }
21+
reqwest = { workspace = true }
22+
tonic = { workspace = true }
2323
url = { workspace = true }
2424

2525
[build-dependencies]
2626
anyhow = { workspace = true }
2727
bytes = { workspace = true }
2828
cfg-if = { workspace = true }
2929
futures-util = { workspace = true }
30-
reqwest = { workspace = true, features = ["native-tls-vendored"] }
30+
reqwest = { workspace = true }
3131
tokio = { workspace = true }
3232
tonic-build = { workspace = true }
3333

crates/fivetran_destination/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ async-trait = { workspace = true }
2121
base64 = { workspace = true }
2222
cbc = { workspace = true }
2323
chrono = { workspace = true }
24-
clap = { workspace = true, features = ["derive"] }
24+
clap = { workspace = true }
2525
common = { path = "../common" }
2626
convex_fivetran_common = { path = "../fivetran_common" }
2727
csv-async = { workspace = true }
@@ -31,12 +31,12 @@ futures-async-stream = { workspace = true }
3131
maplit = { workspace = true }
3232
prost = { workspace = true }
3333
prost-types = { workspace = true }
34-
reqwest = { workspace = true, features = ["json", "native-tls-vendored"] }
35-
serde = { workspace = true, features = ["derive"] }
34+
reqwest = { workspace = true }
35+
serde = { workspace = true }
3636
serde_json = { workspace = true }
3737
thiserror = { workspace = true }
3838
tokio = { workspace = true }
39-
tonic = { workspace = true, features = ["gzip"] }
39+
tonic = { workspace = true }
4040

4141
[dev-dependencies]
4242
cmd_util = { path = "../cmd_util" }

crates/fivetran_source/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@ homepage = "https://www.convex.dev/"
1212
[dependencies]
1313
anyhow = { workspace = true }
1414
async-trait = { workspace = true }
15-
clap = { workspace = true, features = ["derive"] }
16-
convex = { path = "../convex", features = ["native-tls-vendored"] }
15+
clap = { workspace = true }
16+
convex = { path = "../convex" }
1717
convex_fivetran_common = { path = "../fivetran_common" }
1818
derive_more = { workspace = true }
1919
futures = { workspace = true }
2020
futures-async-stream = { workspace = true }
2121
maplit = { workspace = true }
2222
prost = { workspace = true }
2323
prost-types = { workspace = true }
24-
reqwest = { workspace = true, features = ["json", "native-tls-vendored"] }
25-
serde = { workspace = true, features = ["derive"] }
24+
reqwest = { workspace = true }
25+
serde = { workspace = true }
2626
serde_json = { workspace = true }
2727
tokio = { workspace = true }
28-
tonic = { workspace = true, features = ["gzip"] }
28+
tonic = { workspace = true }
2929

3030
[build-dependencies]
3131
bytes = { workspace = true }
3232
cfg-if = { workspace = true }
3333
futures-util = { workspace = true }
34-
reqwest = { workspace = true, features = ["native-tls-vendored"] }
34+
reqwest = { workspace = true }
3535
tokio = { workspace = true }
3636
tonic-build = { workspace = true }
3737

0 commit comments

Comments
 (0)