general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[init] Support set kms server address by env

Browse Source
This commit is contained in:
Zheng, Qi 2023-06-30 13:30:11 +08:00 committed by volcano
parent 6e48dcce50
commit 403d960a37
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/init_aecs/src/main.rs
View File

@ -174,7 +174,10 @@ fn main() -> Result<(), Box<dyn Error>> {
ra_conf_string.clone().into_bytes(), ra_conf_string.clone().into_bytes(),
)?; )?;
let server_addr = CString::new(init_ra_conf.kms_server).unwrap(); // aecs kms server address from environment has higher priority
let server_addr =
CString::new(env::var("OCCLUM_INIT_RA_KMS_SERVER").unwrap_or(init_ra_conf.kms_server))
.unwrap();
env::set_var("UA_ENV_PCCS_URL", init_ra_conf.ua_env_pccs_url.clone()); env::set_var("UA_ENV_PCCS_URL", init_ra_conf.ua_env_pccs_url.clone());
// Get the key of FS image if needed // Get the key of FS image if needed

7
tools/init_grpc_ratls/src/main.rs
View File

@ -5,6 +5,7 @@ extern crate serde_json;
use libc::syscall; use libc::syscall;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::env;
use std::error::Error; use std::error::Error;
use std::fs; use std::fs;
use std::fs::File; use std::fs::File;
@ -130,7 +131,11 @@ fn main() -> Result<(), Box<dyn Error>> {
let ra_conf_string = serde_json::to_string_pretty(&init_ra_conf.ra_config).unwrap(); let ra_conf_string = serde_json::to_string_pretty(&init_ra_conf.ra_config).unwrap();
fs::write("ra_config.json", ra_conf_string.clone().into_bytes())?; fs::write("ra_config.json", ra_conf_string.clone().into_bytes())?;
let config_json = CString::new("ra_config.json").unwrap(); let config_json = CString::new("ra_config.json").unwrap();
let server_addr = CString::new(init_ra_conf.kms_server).unwrap();
// grpc server address from environment has higher priority
let server_addr =
CString::new(env::var("OCCLUM_INIT_RA_KMS_SERVER").unwrap_or(init_ra_conf.kms_server))
.unwrap();
// Get the key of FS image if needed // Get the key of FS image if needed
let key = match &image_config.image_type[..] { let key = match &image_config.image_type[..] {