v0.3.8-pre.006

crates/ksp-app-store-desk/src/bootstrap.rs

@@ -1,7 +1,7 @@
 // file: crates/ksp-app-store-desk/src/bootstrap.rs
-// version: 2
+// version: 3
 
-//! Standard Config and verbose development Logging bootstrap for Store Desk.
+//! Composite Config and verbose development Logging bootstrap for Store Desk.
 
 /// Crate-internal Logging startup state shared by the application state.
 pub(crate) struct LoggingStartup {
@@ -31,7 +31,48 @@ pub(crate) fn config_management(arguments: &[std::ffi::OsString]) -> ksp_core_li
     return std::result::Result::Ok(ksp_config_lib::ConfigManagement::new(engine));
 }
 
-/// Initializes development Logging from the standard `supertrace` profile, with a trace-level in-memory fallback.
+/// Loads the concrete Store Desk Config composite using its registered logical `file_id` and autonomous default profile.
+pub(crate) fn load_store_desk_composite(management: &ksp_config_lib::ConfigManagement) -> ksp_core_lib::Result<ksp_config_lib::ResolvedConfigComposite> {
+    let file_id = ksp_config_lib::ConfigFileId::new(ksp_config_lib::FILE_ID_COMPOSITE_KSP_APP_STORE_DESK);
+    let file_id = match file_id {
+        std::result::Result::Ok(value) => value,
+        std::result::Result::Err(error) => return std::result::Result::Err(error),
+    };
+    return management.engine().load_resolved_composite(&file_id, std::option::Option::None);
+}
+
+/// Returns one required standard profile from the Store Desk composite after validating the referenced logical `file_id`.
+pub(crate) fn required_composite_component_profile(
+    composite: &ksp_config_lib::ResolvedConfigComposite,
+    component_id: &str,
+    expected_file_id: &str,
+) -> ksp_core_lib::Result<ksp_config_lib::ResolvedConfigProfile> {
+    let component = composite.component(component_id);
+    let component = match component {
+        std::option::Option::Some(value) => value,
+        std::option::Option::None => {
+            return std::result::Result::Err(
+                ksp_core_lib::Error::new(crate::ERROR_CODE_CONFIG_COMPOSITE_INVALID, "Store Desk composite is missing a required component")
+                    .with_context("composite_file_id", composite.file_id().as_str())
+                    .with_context("composite_profile_id", composite.profile_id())
+                    .with_context("component_id", component_id),
+            );
+        },
+    };
+    if component.resolved().file_id().as_str() != expected_file_id {
+        return std::result::Result::Err(
+            ksp_core_lib::Error::new(crate::ERROR_CODE_CONFIG_COMPOSITE_INVALID, "Store Desk composite component references an unexpected Config document")
+                .with_context("composite_file_id", composite.file_id().as_str())
+                .with_context("composite_profile_id", composite.profile_id())
+                .with_context("component_id", component_id)
+                .with_context("expected_file_id", expected_file_id)
+                .with_context("actual_file_id", component.resolved().file_id().as_str()),
+        );
+    }
+    return std::result::Result::Ok(component.resolved().clone());
+}
+
+/// Initializes development Logging from the Store Desk composite, with a trace-level in-memory fallback.
 pub(crate) fn initialize_logging(
     management: &ksp_config_lib::ConfigManagement,
     runtime_identity: &ksp_logging_lib::LoggingRuntimeIdentity,
@@ -41,7 +82,29 @@ pub(crate) fn initialize_logging(
         std::result::Result::Ok(value) => value,
         std::result::Result::Err(error) => return initialize_fallback_logging(error, runtime_identity),
     };
-    let resolved = management.engine().load_resolved_logging_config(std::option::Option::Some(crate::DEVELOPMENT_LOGGING_PROFILE), &environment);
+    let composite = crate::load_store_desk_composite(management);
+    let composite = match composite {
+        std::result::Result::Ok(value) => value,
+        std::result::Result::Err(error) => return initialize_fallback_logging(error, runtime_identity),
+    };
+    let logging_profile = crate::required_composite_component_profile(&composite, crate::COMPOSITE_COMPONENT_ID_LOGGING, ksp_config_lib::FILE_ID_STD_LOGGING);
+    let logging_profile = match logging_profile {
+        std::result::Result::Ok(value) => value,
+        std::result::Result::Err(error) => return initialize_fallback_logging(error, runtime_identity),
+    };
+    let store_profile = crate::required_composite_component_profile(&composite, crate::COMPOSITE_COMPONENT_ID_STORE, ksp_config_lib::FILE_ID_STD_STORE);
+    if let std::result::Result::Err(error) = store_profile {
+        return initialize_fallback_logging(error, runtime_identity);
+    }
+    if logging_profile.profile_id() != crate::DEVELOPMENT_LOGGING_PROFILE {
+        let error =
+            ksp_core_lib::Error::new(crate::ERROR_CODE_CONFIG_COMPOSITE_INVALID, "Store Desk development composite must select the supertrace Logging profile")
+                .with_context("component_id", crate::COMPOSITE_COMPONENT_ID_LOGGING)
+                .with_context("expected_profile_id", crate::DEVELOPMENT_LOGGING_PROFILE)
+                .with_context("actual_profile_id", logging_profile.profile_id());
+        return initialize_fallback_logging(error, runtime_identity);
+    }
+    let resolved = management.engine().resolve_logging_config_profile(&logging_profile, &environment);
     let resolved = match resolved {
         std::result::Result::Ok(value) => value,
         std::result::Result::Err(error) => return initialize_fallback_logging(error, runtime_identity),
@@ -55,7 +118,8 @@ pub(crate) fn initialize_logging(
                 target: crate::TRACING_TARGET,
                 domain = crate::TRACING_DOMAIN_BOOTSTRAP,
                 active_profile = active_profile_id.as_str(),
-                "initialized Store Desk development logging from explicit supertrace Config profile"
+                composite_profile = composite.profile_id(),
+                "initialized Store Desk development logging from composite-managed supertrace configuration"
             );
             std::result::Result::Ok(crate::LoggingStartup {
                 guard,
@@ -96,7 +160,7 @@ fn initialize_fallback_logging(
         domain = crate::TRACING_DOMAIN_BOOTSTRAP,
         error_domain = diagnostic.domain.as_str(),
         error_code = diagnostic.code.as_str(),
-        "Store Desk scaffold uses transient fallback Logging"
+        "Store Desk uses transient trace-level fallback Logging"
     );
     return std::result::Result::Ok(crate::LoggingStartup {
         guard,