octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-01-22 21:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change in ibm iam endpoint

Browse Source
This commit is contained in:
Ambika Nair 2021-04-20 22:26:26 -07:00 committed by Andrew Gaul
parent 7f3e423bbe
commit 77581eda59
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/man/s3fs.1
View File

@ -275,7 +275,7 @@ retrieval and usage of the API token when retrieving IAM credentials.
\fB\-o\fR ibm_iam_auth (default is not using IBM IAM authentication)
This option instructs s3fs to use IBM IAM authentication. In this mode, the AWSAccessKey and AWSSecretKey will be used as IBM's Service-Instance-ID and APIKey, respectively.
.TP
\fB\-o\fR ibm_iam_endpoint (default is https://iam.bluemix.net)
\fB\-o\fR ibm_iam_endpoint (default is https://iam.cloud.ibm.com)
Sets the URL to use for IBM IAM authentication.
.TP
\fB\-o\fR use_xattr (default is not handling the extended attribute)

4
src/s3fs.cpp
View File

@ -4378,7 +4378,7 @@ static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_ar
}
if(0 == strcmp(arg, "ibm_iam_auth")){
S3fsCurl::SetIsIBMIAMAuth(true);
S3fsCurl::SetIAMCredentialsURL("https://iam.bluemix.net/oidc/token");
S3fsCurl::SetIAMCredentialsURL("https://iam.cloud.ibm.com/identity/token");
S3fsCurl::SetIAMTokenField("\"access_token\"");
S3fsCurl::SetIAMExpiryField("\"expiration\"");
S3fsCurl::SetIAMFieldCount(2);
@ -4398,7 +4398,7 @@ static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_ar
S3FS_PRN_EXIT("option ibm_iam_endpoint has invalid format, missing http / https protocol");
return -1;
}
endpoint_url = std::string(iam_endpoint) + "/oidc/token";
endpoint_url = std::string(iam_endpoint) + "/identity/token";
S3fsCurl::SetIAMCredentialsURL(endpoint_url.c_str());
return 0;
}

2
src/s3fs_help.cpp
View File

@ -337,7 +337,7 @@ static const char help_string[] =
" In this mode, the AWSAccessKey and AWSSecretKey will be used as\n"
" IBM's Service-Instance-ID and APIKey, respectively.\n"
"\n"
" ibm_iam_endpoint (default is https://iam.bluemix.net)\n"
" ibm_iam_endpoint (default is https://iam.cloud.ibm.com)\n"
" - sets the URL to use for IBM IAM authentication.\n"
"\n"
" use_xattr (default is not handling the extended attribute)\n"