diff --git a/storage-manager/src/S3Storage.cpp b/storage-manager/src/S3Storage.cpp index caa998ad7..b0138c44b 100644 --- a/storage-manager/src/S3Storage.cpp +++ b/storage-manager/src/S3Storage.cpp @@ -244,7 +244,7 @@ int S3Storage::getObject(const string &_sourceKey, boost::shared_array s3err_msgs[err], bucket.c_str(), sourceKey.c_str()); if(!IAMrole.empty()) { - ms3_assumeRole(creds); + ms3_assume_role(creds); } sleep(5); } @@ -338,7 +338,7 @@ int S3Storage::putObject(const boost::shared_array data, size_t len, co " Retrying...", s3err_msgs[s3err], bucket.c_str(), destKey.c_str()); if(!IAMrole.empty()) { - ms3_assumeRole(creds); + ms3_assume_role(creds); } sleep(5); } @@ -376,7 +376,7 @@ int S3Storage::deleteObject(const string &_key) s3err_msgs[s3err], bucket.c_str(), key.c_str()); if(!IAMrole.empty()) { - ms3_assumeRole(creds); + ms3_assume_role(creds); } sleep(5); } @@ -415,7 +415,7 @@ int S3Storage::copyObject(const string &_sourceKey, const string &_destKey) " destkey = %s. Retrying...", s3err_msgs[s3err], bucket.c_str(), sourceKey.c_str(), destKey.c_str()); if(!IAMrole.empty()) { - ms3_assumeRole(creds); + ms3_assume_role(creds); } sleep(5); } @@ -468,7 +468,7 @@ int S3Storage::exists(const string &_key, bool *out) s3err_msgs[s3err], bucket.c_str(), key.c_str()); if(!IAMrole.empty()) { - ms3_assumeRole(creds); + ms3_assume_role(creds); } sleep(5); } @@ -527,7 +527,7 @@ ms3_st * S3Storage::getConnection() if (res) { // Something is wrong with the assume role so abort as if the ms3_init failed - logger->log(LOG_ERR, "S3Storage::getConnection(): ms3_init_assume_role returned error."); + logger->log(LOG_ERR, "S3Storage::getConnection(): ms3_init_assume_role returned error. Check iam_role_name = %s is correct.",IAMrole.c_str()); if (ms3_server_error(ret)) logger->log(LOG_ERR, "S3Storage::getConnection(): ms3_errror: server says '%s'. role name = %s", ms3_server_error(ret), IAMrole.c_str()); ms3_deinit(ret); diff --git a/utils/libmarias3/CMakeLists.txt b/utils/libmarias3/CMakeLists.txt index dd9a63e62..89d9eb2ed 100644 --- a/utils/libmarias3/CMakeLists.txt +++ b/utils/libmarias3/CMakeLists.txt @@ -8,7 +8,7 @@ SET(S3_SOURCES ${S3API_DIR}/src/debug.c ${S3API_DIR}/src/sha256.c ${S3API_DIR}/src/sha256-internal.c ${S3API_DIR}/src/xml.c - ${S3API_DIR}/src/assumeRole.c) + ${S3API_DIR}/src/assume_role.c) ADD_LIBRARY(marias3 SHARED ${S3_SOURCES})