openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-03 14:59:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

cloud-config: make managed layer handling explicit

Browse Source
This commit is contained in:
hefuc-oai
2026-07-06 22:09:07 +00:00
parent d88e24b358
commit 5a5cc28fb3
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
codex-rs/cloud-config/src/backend.rs
View File

@@ -4,8 +4,10 @@ use codex_backend_client::DeliveredTomlFragment;
use codex_config::CloudConfigBundle;
use codex_config::CloudConfigFragment;
use codex_config::CloudConfigTomlBundle;
use codex_config::CloudConfigTomlManagedLayers;
use codex_config::CloudRequirementsFragment;
use codex_config::CloudRequirementsTomlBundle;
use codex_config::CloudRequirementsTomlManagedLayers;
use codex_login::CodexAuth;
use std::future::Future;
@@ -110,11 +112,11 @@ pub(crate) fn bundle_from_response(response: ConfigBundleResponse) -> CloudConfi
CloudConfigBundle {
config_toml: CloudConfigTomlBundle {
enterprise_managed: config_toml,
..Default::default()
managed_layers: CloudConfigTomlManagedLayers::default(),
},
requirements_toml: CloudRequirementsTomlBundle {
enterprise_managed: requirements_toml,
..Default::default()
managed_layers: CloudRequirementsTomlManagedLayers::default(),
},
}
}

6
codex-rs/cloud-config/src/cache_tests.rs
View File

@@ -2,8 +2,10 @@ use super::*;
use codex_config::AbsolutePathBuf;
use codex_config::CloudConfigFragment;
use codex_config::CloudConfigTomlBundle;
use codex_config::CloudConfigTomlManagedLayers;
use codex_config::CloudRequirementsFragment;
use codex_config::CloudRequirementsTomlBundle;
use codex_config::CloudRequirementsTomlManagedLayers;
use pretty_assertions::assert_eq;
use std::path::Path;
use tempfile::tempdir;
@@ -16,7 +18,7 @@ fn test_bundle() -> CloudConfigBundle {
name: "Base config".to_string(),
contents: "model = \"gpt-5\"".to_string(),
}],
..Default::default()
managed_layers: CloudConfigTomlManagedLayers::default(),
},
requirements_toml: CloudRequirementsTomlBundle {
enterprise_managed: vec![CloudRequirementsFragment {
@@ -24,7 +26,7 @@ fn test_bundle() -> CloudConfigBundle {
name: "Base requirements".to_string(),
contents: "allowed_approval_policies = [\"never\"]".to_string(),
}],
..Default::default()
managed_layers: CloudRequirementsTomlManagedLayers::default(),
},
}
}

6
codex-rs/cloud-config/src/service_tests.rs
View File

@@ -13,8 +13,10 @@ use codex_backend_client::DeliveredTomlFragment;
use codex_config::AbsolutePathBuf;
use codex_config::CloudConfigFragment;
use codex_config::CloudConfigTomlBundle;
use codex_config::CloudConfigTomlManagedLayers;
use codex_config::CloudRequirementsFragment;
use codex_config::CloudRequirementsTomlBundle;
use codex_config::CloudRequirementsTomlManagedLayers;
use codex_config::types::AuthCredentialsStoreMode;
use codex_login::AuthKeyringBackendKind;
use codex_login::auth::AgentIdentityAuth;
@@ -197,11 +199,11 @@ fn test_bundle() -> CloudConfigBundle {
CloudConfigBundle {
config_toml: CloudConfigTomlBundle {
enterprise_managed: vec![test_config_fragment()],
..Default::default()
managed_layers: CloudConfigTomlManagedLayers::default(),
},
requirements_toml: CloudRequirementsTomlBundle {
enterprise_managed: vec![test_requirements_fragment()],
..Default::default()
managed_layers: CloudRequirementsTomlManagedLayers::default(),
},
}
}

5
codex-rs/cloud-config/src/validation.rs
View File

@@ -18,9 +18,12 @@ pub(crate) fn validate_bundle(
)
})?;
let CloudConfigBundleLayers {
baseline_config: _,
system_overlay_config: _,
enterprise_managed_config: _,
baseline_requirements: _,
system_overlay_requirements: _,
enterprise_managed_requirements,
..
} = bundle_layers;
compose_requirements(enterprise_managed_requirements).map_err(|err| {