Do not create CredentialManager in server.cc if not injected. Google-Bug-Id:527528182 PiperOrigin-RevId: 975243535 Change-Id: I3ebb142ef629acf8759ce293100452f036b20629
diff --git a/g3/server.cc b/g3/server.cc index 2c3cf84..d994db4 100644 --- a/g3/server.cc +++ b/g3/server.cc
@@ -100,7 +100,6 @@ #include "tlbmc/collector/gpio_collector.h" #include "tlbmc/configs/proto_config_parser.h" #include "tlbmc/configs/rate_limiter_config.h" -#include "tlbmc/credentials/credential_manager_impl.h" #include "tlbmc/deterministic_bmc/offline_config_parser/offline_config_parser.h" #include "tlbmc/deterministic_bmc/offline_config_parser/proto_reader.h" #include "tlbmc/hal/fake_fru_scanner_fram.h" @@ -1491,36 +1490,7 @@ config.periodic_deterministic_fru_scan_interval_ms; options.system_registry = config.system_registry; options.enable_hft_test_sensor = config.enable_hft_test_sensor; - if (config.credential_manager != nullptr) { - options.credential_manager = config.credential_manager; - } else { - milotic_tlbmc::CredentialManagerImpl::CredentialManagerParams cm_params{ - .private_key_path = config.private_key_path, - .cert_path = config.own_cert_path, - .owner_verification_cert_path = config.owner_verification_cert_path, - .owner_verification_config_path = config.owner_verification_config_path, - .bmc_ssh_trusted_user_ca_keys_path = - config.bmc_ssh_trusted_user_ca_keys_path, - .trust_bundle_path = config.trust_bundle_path, - .trust_bundle_signature_path = config.trust_bundle_signature_path, - .os_verification_cert_path = config.os_verification_cert_path, - .os_verification_key_path = config.os_verification_key_path, - .serial_console_trusted_user_ca_keys_path = - config.serial_console_trusted_user_ca_keys_path, - .serial_console_detatched_signature_path = - config.serial_console_detatched_signature_path, - .serial_console_access_level_dir = - config.serial_console_access_level_dir, - .syslog_client_conf_override_path = - config.syslog_client_conf_override_path, - .syslog_root_cert_path = config.syslog_root_cert_path, - }; - if (absl::StatusOr<std::unique_ptr<milotic_tlbmc::CredentialManager>> cm = - milotic_tlbmc::CredentialManagerImpl::Create(cm_params); - cm.ok()) { - options.credential_manager = std::move(*cm); - } - } + options.credential_manager = config.credential_manager; if (config.nic_accessor_factory != nullptr) { options.nic_accessor_factory =