Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
JENKINS-14470: S3 Plugin switches credential profiles (#88)
* JENKINS-14470: S3 Plugin switches credential profiles
  • Loading branch information
Jimilian committed May 20, 2016
1 parent d4da5b1 commit 4bcdbf3
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/main/java/hudson/plugins/s3/callable/S3Callable.java
Expand Up @@ -33,16 +33,21 @@ abstract class S3Callable<T> implements FileCallable<T>

protected synchronized TransferManager getTransferManager()
{
if (transferManagers.get(region) == null) {
final String uniqueKey = getUniqueKey();
if (transferManagers.get(uniqueKey) == null) {
final AmazonS3 client = ClientHelper.createClient(accessKey, Secret.toString(secretKey), useRole, region, proxy);
transferManagers.put(region, new TransferManager(client));
transferManagers.put(uniqueKey, new TransferManager(client));
}

return transferManagers.get(region);
return transferManagers.get(uniqueKey);
}

@Override
public void checkRoles(RoleChecker roleChecker) throws SecurityException {

}

private String getUniqueKey() {
return region + '_' + secretKey + '_' + accessKey + '_' + useRole;
}
}

0 comments on commit 4bcdbf3

Please sign in to comment.