cdh & image-rs: add debug patch

Signed-off-by: Xynnn007 <[email protected]>
Xynnn007 · Jul 11, 2024 · 429002c · 429002c
1 parent 26056ba
commit 429002c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/confidential-data-hub/hub/src/bin/ttrpc_server/mod.rs b/confidential-data-hub/hub/src/bin/ttrpc_server/mod.rs
@@ -92,7 +92,9 @@ impl GetResourceService for Server {
             error!("[ttRPC CDH] GetResource :\n{detailed_error}");
             let mut status = Status::new();
             status.set_code(Code::INTERNAL);
-            status.set_message("[CDH] [ERROR]: Get Resource failed".into());
+            status.set_message(format!(
+                "[CDH] [ERROR]: Get Resource failed, err: {detailed_error}"
+            ));
             Error::RpcStatus(status)
         })?;
 
@@ -136,7 +138,9 @@ impl KeyProviderService for Server {
             error!("[ttRPC CDH] UnWrapKey :\n{detailed_error}");
             let mut status = Status::new();
             status.set_code(Code::INTERNAL);
-            status.set_message("[CDH] [ERROR]: UnwrapKey failed".to_string());
+            status.set_message(format!(
+                "[CDH] [ERROR]: UnwrapKey failed, err: {detailed_error}"
+            ));
             Error::RpcStatus(status)
         })?;
 

diff --git a/image-rs/src/image.rs b/image-rs/src/image.rs
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::{anyhow, bail, Result};
-use log::warn;
 use oci_distribution::manifest::{OciDescriptor, OciImageManifest};
 use oci_distribution::secrets::RegistryAuth;
 use oci_distribution::Reference;
@@ -229,11 +228,7 @@ impl ImageClient {
                 {
                     Ok(cred) => cred,
                     Err(e) => {
-                        warn!(
-                            "get credential failed, use Anonymous auth instead: {}",
-                            e.to_string()
-                        );
-                        RegistryAuth::Anonymous
+                        bail!("Failed to get registry auth: {:?}", e)
                     }
                 }
             }