Skip to content

Commit f7cf310

Browse files
committed
[adapters] Add host_id to tests.
Signed-off-by: Ben Pfaff <blp@feldera.com>
1 parent a1890c6 commit f7cf310

File tree

4 files changed

+7
-14
lines changed

4 files changed

+7
-14
lines changed

.github/workflows/build-rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
env:
77
CARGO_FLAGS: "--release --locked --all-targets"
8-
CARGO_FEATURES_BASE: "pubsub-emulator-test,iceberg-tests-fs,iceberg-tests-glue"
8+
CARGO_FEATURES_BASE: "fips,pubsub-emulator-test,iceberg-tests-fs,iceberg-tests-glue"
99
FELDERA_PLATFORM_VERSION_SUFFIX: ${{ github.sha }}
1010
RUSTC_WRAPPER: sccache
1111
SCCACHE_CACHE_SIZE: ${{ vars.SCCACHE_CACHE_SIZE }}

crates/adapters/Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ feldera-enterprise = []
5050
iceberg-tests-fs = []
5151
iceberg-tests-glue = []
5252
iceberg-tests-rest = []
53+
fips = ["rustls/fips"]
5354

5455
[dependencies]
5556
feldera-types = { workspace = true }
@@ -186,6 +187,7 @@ inventory = { workspace = true }
186187
backtrace = { workspace = true }
187188
itertools = { workspace = true }
188189
metrics-process = { version = "2.4.0", default-features = false }
190+
rustls = { workspace = true }
189191
serde_json_path_to_error = { workspace = true }
190192
smallstr = { workspace = true }
191193
dashmap = { workspace = true }
@@ -201,10 +203,6 @@ ignored = ["num-traits"]
201203

202204
[target.'cfg(target_os = "linux")'.dependencies]
203205
jemalloc_pprof = { workspace = true, features = ["symbolize"] }
204-
rustls = { workspace = true, features = ["fips"] }
205-
206-
[target.'cfg(not(target_os = "linux"))'.dependencies]
207-
rustls = { workspace = true, features = ["aws-lc-rs"] }
208206

209207
[target.'cfg(unix)'.dependencies]
210208
libc = { workspace = true }

crates/adapters/src/server.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2637,6 +2637,7 @@ outputs:
26372637
initial: RuntimeDesiredStatus::Paused,
26382638
bootstrap_policy: BootstrapPolicy::Allow,
26392639
deployment_id: uuid::Uuid::nil(),
2640+
host_id: None,
26402641
};
26412642

26422643
let config = parse_config(&args.config_file).unwrap();
@@ -2929,6 +2930,7 @@ outputs:
29292930
initial: RuntimeDesiredStatus::Paused,
29302931
bootstrap_policy: BootstrapPolicy::Allow,
29312932
deployment_id: Uuid::default(),
2933+
host_id: None,
29322934
};
29332935

29342936
let config = parse_config(&args.config_file).unwrap();

crates/pipeline-manager/Cargo.toml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ awc = { workspace = true, features = ["rustls-0_23", "rustls-0_23-native-roots"]
9292
reqwest = { workspace = true, features = ["json", "rustls-tls-native-roots"] }
9393
cached = { workspace = true }
9494
crossbeam = { workspace = true }
95+
rustls = { workspace = true }
9596

9697
# System interaction
9798
dirs = { workspace = true } # For: discovering home directory
@@ -105,22 +106,14 @@ tempfile = { workspace = true }
105106
compare = { workspace = true }
106107
sha2 = { workspace = true }
107108

108-
# Cryptography provider (FIPS enabled by default)
109-
# Make sure this is the same rustls version used by other crates in the dependency tree.
110-
# See the `ensure_default_crypto_provider` function at the root of this crate.
111-
[target.'cfg(target_os = "linux")'.dependencies]
112-
rustls = { workspace = true, features = ["fips"] }
113-
114-
[target.'cfg(not(target_os = "linux"))'.dependencies]
115-
rustls = { workspace = true, features = ["aws-lc-rs"] }
116-
117109
[target.'cfg(not(target_env = "msvc"))'.dependencies]
118110
tikv-jemallocator = { workspace = true, features = ["profiling", "unprefixed_malloc_on_supported_platforms"] }
119111

120112
[features]
121113
default = ["postgresql_embedded"]
122114
feldera-enterprise = []
123115
runtime-version = []
116+
fips = ["rustls/fips"]
124117

125118
[build-dependencies]
126119
change-detection = { workspace = true }

0 commit comments

Comments
 (0)