Skip to content

Commit cc88693

Browse files
committed
fix: isolate Bedrock test config (fixes #1952)
1 parent a95b03a commit cc88693

1 file changed

Lines changed: 55 additions & 33 deletions

File tree

  • crates/jcode-provider-bedrock/src

‎crates/jcode-provider-bedrock/src/tests.rs‎

Lines changed: 55 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ use super::*;
33
#[test]
44
fn opus_low_effort_default_and_explicit_overrides() {
55
let _guard = lock_test_env();
6-
let temp = tempfile::tempdir().unwrap();
7-
let _xdg = EnvVarGuard::set("XDG_CONFIG_HOME", temp.path().as_os_str());
86
let _model = EnvVarGuard::remove("JCODE_BEDROCK_MODEL");
97
let _effort = EnvVarGuard::remove("JCODE_BEDROCK_EFFORT");
108
let p = BedrockProvider::new();
@@ -121,8 +119,6 @@ fn opus_explicit_routes_and_metadata() {
121119
#[test]
122120
fn opus_default_ignores_cached_global_routes_and_preserves_explicit_choice() {
123121
let _guard = lock_test_env();
124-
let temp = tempfile::tempdir().unwrap();
125-
let _xdg = EnvVarGuard::set("XDG_CONFIG_HOME", temp.path().as_os_str());
126122
let _model = EnvVarGuard::remove("JCODE_BEDROCK_MODEL");
127123
let p = BedrockProvider::new();
128124
assert_eq!(p.model(), DEFAULT_MODEL);
@@ -232,12 +228,26 @@ fn bedrock_tool_schema_removes_top_level_combinators() {
232228
assert_eq!(normalized["required"], json!(["category"]));
233229
}
234230

235-
fn lock_test_env() -> MutexGuard<'static, ()> {
231+
// Drop the environment override before the temporary directory, and unlock last.
232+
struct TestEnvGuard {
233+
_home: EnvVarGuard,
234+
root: tempfile::TempDir,
235+
_lock: MutexGuard<'static, ()>,
236+
}
237+
238+
fn lock_test_env() -> TestEnvGuard {
236239
static ENV_LOCK: OnceLock<Mutex<()>> = OnceLock::new();
237-
ENV_LOCK
240+
let lock = ENV_LOCK
238241
.get_or_init(|| Mutex::new(()))
239242
.lock()
240-
.unwrap_or_else(|poisoned| poisoned.into_inner())
243+
.unwrap_or_else(|poisoned| poisoned.into_inner());
244+
let root = tempfile::tempdir().unwrap();
245+
let home = EnvVarGuard::set("JCODE_HOME", root.path().as_os_str());
246+
TestEnvGuard {
247+
_home: home,
248+
root,
249+
_lock: lock,
250+
}
241251
}
242252

243253
struct EnvVarGuard {
@@ -269,11 +279,39 @@ impl Drop for EnvVarGuard {
269279
}
270280
}
271281

282+
#[test]
283+
fn bedrock_env_file_is_isolated_under_jcode_home() {
284+
let guard = lock_test_env();
285+
let xdg = tempfile::tempdir().unwrap();
286+
let _xdg = EnvVarGuard::set("XDG_CONFIG_HOME", xdg.path().as_os_str());
287+
let _token = EnvVarGuard::remove(API_KEY_ENV);
288+
let config = guard.root.path().join("config/jcode");
289+
assert_eq!(jcode_storage::app_config_dir().unwrap(), config);
290+
assert_eq!(BedrockProvider::configured_bearer_token(), None);
291+
292+
jcode_provider_env::save_env_value_to_env_file(API_KEY_ENV, ENV_FILE, Some("isolated-token"))
293+
.unwrap();
294+
jcode_core::env::remove_var(API_KEY_ENV);
295+
assert!(
296+
std::fs::read_to_string(config.join(ENV_FILE))
297+
.unwrap()
298+
.contains("isolated-token")
299+
);
300+
assert_eq!(
301+
BedrockProvider::configured_bearer_token().as_deref(),
302+
Some("isolated-token")
303+
);
304+
assert!(std::fs::read_dir(xdg.path()).unwrap().next().is_none());
305+
306+
// Switching to another sandbox must not read the previous test's fixture.
307+
let next = tempfile::tempdir().unwrap();
308+
let _home = EnvVarGuard::set("JCODE_HOME", next.path().as_os_str());
309+
assert_eq!(BedrockProvider::configured_bearer_token(), None);
310+
}
311+
272312
#[test]
273313
fn detects_env_credentials_requires_region_and_credential_hint() {
274314
let _guard = lock_test_env();
275-
let temp = tempfile::tempdir().unwrap();
276-
let _xdg = EnvVarGuard::set("XDG_CONFIG_HOME", temp.path().as_os_str());
277315
let _removed = [
278316
"JCODE_BEDROCK_ENABLE",
279317
API_KEY_ENV,
@@ -297,17 +335,14 @@ fn detects_env_credentials_requires_region_and_credential_hint() {
297335
#[test]
298336
fn explicit_enable_marks_configured_for_instance_metadata_credentials() {
299337
let _guard = lock_test_env();
300-
jcode_core::env::set_var("JCODE_BEDROCK_ENABLE", "1");
338+
let _enabled = EnvVarGuard::set("JCODE_BEDROCK_ENABLE", "1");
301339
assert!(BedrockProvider::has_credentials());
302-
jcode_core::env::remove_var("JCODE_BEDROCK_ENABLE");
303340
}
304341

305342
#[test]
306343
fn detects_bedrock_login_env_file_credentials() {
307344
let _guard = lock_test_env();
308-
let temp = tempfile::tempdir().unwrap();
309-
let _xdg = EnvVarGuard::set("XDG_CONFIG_HOME", temp.path().as_os_str());
310-
for key in [
345+
let _removed = [
311346
"JCODE_BEDROCK_ENABLE",
312347
API_KEY_ENV,
313348
REGION_ENV,
@@ -316,9 +351,8 @@ fn detects_bedrock_login_env_file_credentials() {
316351
"AWS_PROFILE",
317352
"JCODE_BEDROCK_PROFILE",
318353
"AWS_ACCESS_KEY_ID",
319-
] {
320-
jcode_core::env::remove_var(key);
321-
}
354+
]
355+
.map(EnvVarGuard::remove);
322356

323357
assert!(!BedrockProvider::has_credentials());
324358
jcode_provider_env::save_env_value_to_env_file(API_KEY_ENV, ENV_FILE, Some("test-key"))
@@ -344,8 +378,6 @@ fn detects_bedrock_login_env_file_credentials() {
344378
#[test]
345379
fn configured_profile_from_bedrock_env_overrides_stale_bearer_token() {
346380
let _guard = lock_test_env();
347-
let temp = tempfile::tempdir().unwrap();
348-
let _xdg = EnvVarGuard::set("XDG_CONFIG_HOME", temp.path().as_os_str());
349381
let _removed = [
350382
"JCODE_BEDROCK_ENABLE",
351383
API_KEY_ENV,
@@ -390,6 +422,7 @@ fn configured_profile_from_bedrock_env_overrides_stale_bearer_token() {
390422

391423
#[test]
392424
fn switches_arbitrary_model_ids() {
425+
let _guard = lock_test_env();
393426
let p = BedrockProvider::new();
394427
p.set_model("us.anthropic.claude-3-5-sonnet-20241022-v2:0")
395428
.unwrap();
@@ -399,8 +432,6 @@ fn switches_arbitrary_model_ids() {
399432
#[test]
400433
fn maps_profile_required_foundation_model_to_inference_profile() {
401434
let _guard = lock_test_env();
402-
let temp = tempfile::tempdir().unwrap();
403-
let _xdg = EnvVarGuard::set("XDG_CONFIG_HOME", temp.path().as_os_str());
404435
let p = BedrockProvider::new();
405436
p.profile_required_models
406437
.write()
@@ -419,8 +450,6 @@ fn maps_profile_required_foundation_model_to_inference_profile() {
419450
#[test]
420451
fn maps_foundation_model_from_stale_cached_profile_list() {
421452
let _guard = lock_test_env();
422-
let temp = tempfile::tempdir().unwrap();
423-
let _xdg = EnvVarGuard::set("XDG_CONFIG_HOME", temp.path().as_os_str());
424453
let p = BedrockProvider::new();
425454
*p.fetched_inference_profiles.write().unwrap() = vec![
426455
"global.amazon.nova-2-lite-v1:0".to_string(),
@@ -435,8 +464,6 @@ fn maps_foundation_model_from_stale_cached_profile_list() {
435464
#[test]
436465
fn hides_profile_required_foundation_model_when_profile_route_exists() {
437466
let _guard = lock_test_env();
438-
let temp = tempfile::tempdir().unwrap();
439-
let _xdg = EnvVarGuard::set("XDG_CONFIG_HOME", temp.path().as_os_str());
440467
let p = BedrockProvider::new();
441468
*p.fetched_models.write().unwrap() = vec!["amazon.nova-2-lite-v1:0".to_string()];
442469
*p.fetched_inference_profiles.write().unwrap() = vec!["us.amazon.nova-2-lite-v1:0".to_string()];
@@ -466,8 +493,6 @@ fn hides_profile_required_foundation_model_when_profile_route_exists() {
466493
#[test]
467494
fn hides_foundation_model_when_profile_route_exists() {
468495
let _guard = lock_test_env();
469-
let temp = tempfile::tempdir().unwrap();
470-
let _xdg = EnvVarGuard::set("XDG_CONFIG_HOME", temp.path().as_os_str());
471496
let p = BedrockProvider::new();
472497
*p.fetched_models.write().unwrap() = vec!["amazon.nova-2-lite-v1:0".to_string()];
473498
*p.fetched_inference_profiles.write().unwrap() = vec!["us.amazon.nova-2-lite-v1:0".to_string()];
@@ -493,8 +518,6 @@ fn hides_foundation_model_when_profile_route_exists() {
493518
#[test]
494519
fn profile_required_foundation_model_without_profile_route_is_disabled() {
495520
let _guard = lock_test_env();
496-
let temp = tempfile::tempdir().unwrap();
497-
let _xdg = EnvVarGuard::set("XDG_CONFIG_HOME", temp.path().as_os_str());
498521
let p = BedrockProvider::new();
499522
*p.fetched_models.write().unwrap() = vec!["amazon.nova-2-lite-v1:0".to_string()];
500523
p.profile_required_models
@@ -514,6 +537,7 @@ fn profile_required_foundation_model_without_profile_route_is_disabled() {
514537

515538
#[test]
516539
fn global_inference_profiles_use_foundation_capabilities_and_detail() {
540+
let _guard = lock_test_env();
517541
let p = BedrockProvider::new();
518542
*p.fetched_inference_profiles.write().unwrap() =
519543
vec!["global.amazon.nova-2-lite-v1:0".to_string()];
@@ -537,8 +561,6 @@ fn global_inference_profiles_use_foundation_capabilities_and_detail() {
537561
#[test]
538562
fn ignores_persisted_bedrock_catalog_from_different_region() {
539563
let _guard = lock_test_env();
540-
let temp = tempfile::tempdir().unwrap();
541-
let _xdg = EnvVarGuard::set("XDG_CONFIG_HOME", temp.path().as_os_str());
542564
{
543565
let _region = EnvVarGuard::set(REGION_ENV, "us-east-1");
544566
BedrockProvider::persist_catalog(
@@ -581,6 +603,7 @@ fn prefers_region_inference_profile_over_global_profile() {
581603

582604
#[test]
583605
fn known_context_and_vision_capabilities() {
606+
let _guard = lock_test_env();
584607
let p = BedrockProvider::new();
585608
p.set_model("anthropic.claude-3-5-sonnet-20241022-v2:0")
586609
.unwrap();
@@ -652,8 +675,6 @@ fn missing_credentials_error_omits_sdk_blob() {
652675
#[test]
653676
fn legacy_model_route_is_unavailable_with_reason() {
654677
let _guard = lock_test_env();
655-
let temp = tempfile::tempdir().unwrap();
656-
let _xdg = EnvVarGuard::set("XDG_CONFIG_HOME", temp.path().as_os_str());
657678
let p = BedrockProvider::new();
658679
*p.fetched_models.write().unwrap() = vec!["anthropic.claude-3-haiku-20240307-v1:0".to_string()];
659680
p.legacy_models
@@ -674,6 +695,7 @@ fn legacy_model_route_is_unavailable_with_reason() {
674695
#[tokio::test]
675696
#[ignore = "requires AWS credentials and enabled Bedrock model access"]
676697
async fn bedrock_live_smoke_test() {
698+
let _guard = lock_test_env();
677699
if std::env::var("JCODE_BEDROCK_LIVE_TEST").ok().as_deref() != Some("1") {
678700
return;
679701
}

0 commit comments

Comments
 (0)