From 0be0e5c5dacdaf754c02ad467094721a83be02cd Mon Sep 17 00:00:00 2001 From: Takeshi Nakatani Date: Sat, 18 Jan 2025 15:30:22 +0000 Subject: [PATCH] Fixed refactoring mistakes about loading IAM credentials --- src/s3fs_cred.cpp | 7 +++++-- src/s3fs_cred.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/s3fs_cred.cpp b/src/s3fs_cred.cpp index d9a6e26670..0e7c7973d2 100644 --- a/src/s3fs_cred.cpp +++ b/src/s3fs_cred.cpp @@ -452,6 +452,11 @@ bool S3fsCred::LoadIAMCredentials() S3FS_PRN_ERR("Something error occurred, could not set IAM credentials."); return false; } + + if(!SetIAMCredentials(cred.c_str())){ + S3FS_PRN_ERR("Something error occurred, could not set IAM role name."); + return false; + } return true; } @@ -497,8 +502,6 @@ bool S3fsCred::LoadIAMRoleFromMetaData() bool S3fsCred::SetIAMCredentials(const char* response) { - const std::lock_guard lock(token_lock); - S3FS_PRN_INFO3("IAM credential response = \"%s\"", response); iamcredmap_t keyval; diff --git a/src/s3fs_cred.h b/src/s3fs_cred.h index b70fd71c65..adcab2b9e6 100644 --- a/src/s3fs_cred.h +++ b/src/s3fs_cred.h @@ -152,7 +152,7 @@ class S3fsCred bool GetIAMCredentialsURL(std::string& url, bool check_iam_role) REQUIRES(S3fsCred::token_lock); bool LoadIAMCredentials() REQUIRES(S3fsCred::token_lock); - bool SetIAMCredentials(const char* response); + bool SetIAMCredentials(const char* response) REQUIRES(S3fsCred::token_lock); bool SetIAMRoleFromMetaData(const char* response); bool SetExtCredLib(const char* arg);