From c343c7a009d3fcb2c527fae4c6b874d700c868a6 Mon Sep 17 00:00:00 2001 From: Michael Steiner Date: Mon, 8 Apr 2024 11:21:27 -0700 Subject: [PATCH] Minor changes * Make script PDO_LOG_LEVEL aware * Remove unnecessary env check which leads to misleading ERROR messages when running no-config docker Signed-off-by: Michael Steiner --- common/crypto/verify_ias_report/fetch_ias_certificates.sh | 1 - eservice/bin/register-with-ledger.sh | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/common/crypto/verify_ias_report/fetch_ias_certificates.sh b/common/crypto/verify_ias_report/fetch_ias_certificates.sh index 3ab8e5bf..f9c51c62 100755 --- a/common/crypto/verify_ias_report/fetch_ias_certificates.sh +++ b/common/crypto/verify_ias_report/fetch_ias_certificates.sh @@ -23,7 +23,6 @@ # ----------------------------------------------------------------- # ----------------------------------------------------------------- source ${PDO_SOURCE_ROOT}/bin/lib/common.sh -check_pdo_build_env IAS_CERTIFICATE_URL=$1 diff --git a/eservice/bin/register-with-ledger.sh b/eservice/bin/register-with-ledger.sh index d2432057..431b1c6a 100755 --- a/eservice/bin/register-with-ledger.sh +++ b/eservice/bin/register-with-ledger.sh @@ -54,7 +54,7 @@ function Store { yell PDO_FORCE_IAS_PROXY is true NO_PROXY='' no_proxy='' try eservice-enclave-info \ --save ${eservice_enclave_info_file} \ - --loglevel info \ + --loglevel ${PDO_LOG_LEVEL} \ --logfile __screen__ \ --identity ${ESERVICE_IDENTITY} \ --config ${ESERVICE_TOML} \ @@ -62,7 +62,7 @@ function Store { else try eservice-enclave-info \ --save ${eservice_enclave_info_file} \ - --loglevel info \ + --loglevel ${PDO_LOG_LEVEL} \ --logfile __screen__ \ --identity ${ESERVICE_IDENTITY} \ --config ${ESERVICE_TOML} \ @@ -86,7 +86,7 @@ function Register { yell Register enclave with CCF ledger: mrenclave=${VAR_MRENCLAVE} basename=${VAR_BASENAME} source ${PDO_INSTALL_ROOT}/bin/activate try ${PDO_INSTALL_ROOT}/bin/ccf_set_expected_sgx_measurements \ - --logfile __screen__ --loglevel INFO --mrenclave ${VAR_MRENCLAVE} \ + --logfile __screen__ --loglevel ${PDO_LOG_LEVEL} --mrenclave ${VAR_MRENCLAVE} \ --basename ${VAR_BASENAME} --ias-public-key "$(cat $IAS_KEY_PEM)" else die unsupported ledger ${PDO_LEDGER_TYPE}