Skip to content

Add the ability to provide a Supplier<AssumeRoleRequest> to StsAssume… #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/next-release/feature-AWSSTS-54034ec.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"category": "AWS STS",
"type": "feature",
"description": "Add the ability to provide a Supplier<AssumeRoleRequest> to StsAssumeRoleCredentialsProvider"
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
package software.amazon.awssdk.services.sts.auth;

import java.util.function.Consumer;
import java.util.function.Supplier;

import software.amazon.awssdk.annotations.NotThreadSafe;
import software.amazon.awssdk.annotations.ThreadSafe;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
Expand All @@ -38,16 +40,16 @@
*/
@ThreadSafe
public class StsAssumeRoleCredentialsProvider extends StsCredentialsProvider {
private final AssumeRoleRequest assumeRoleRequest;
private Supplier<AssumeRoleRequest> assumeRoleRequestSupplier;

/**
* @see #builder()
*/
private StsAssumeRoleCredentialsProvider(Builder builder) {
super(builder, "sts-assume-role-credentials-provider");
Validate.notNull(builder.assumeRoleRequest, "Assume role request must not be null.");
Validate.notNull(builder.assumeRoleRequestSupplier, "Assume role request must not be null.");

this.assumeRoleRequest = builder.assumeRoleRequest;
this.assumeRoleRequestSupplier = builder.assumeRoleRequestSupplier;
}

/**
Expand All @@ -59,13 +61,15 @@ public static Builder builder() {

@Override
protected Credentials getUpdatedCredentials(StsClient stsClient) {
AssumeRoleRequest assumeRoleRequest = assumeRoleRequestSupplier.get();
Validate.notNull(assumeRoleRequest, "Assume role request must not be null.");
return stsClient.assumeRole(assumeRoleRequest).credentials();
}

@Override
public String toString() {
return ToString.builder("StsAssumeRoleCredentialsProvider")
.add("refreshRequest", assumeRoleRequest)
.add("refreshRequest", assumeRoleRequestSupplier)
.build();
}

Expand All @@ -75,7 +79,7 @@ public String toString() {
*/
@NotThreadSafe
public static final class Builder extends BaseBuilder<Builder, StsAssumeRoleCredentialsProvider> {
private AssumeRoleRequest assumeRoleRequest;
private Supplier<AssumeRoleRequest> assumeRoleRequestSupplier;

private Builder() {
super(StsAssumeRoleCredentialsProvider::new);
Expand All @@ -89,7 +93,18 @@ private Builder() {
* @return This object for chained calls.
*/
public Builder refreshRequest(AssumeRoleRequest assumeRoleRequest) {
this.assumeRoleRequest = assumeRoleRequest;
return refreshRequest(() -> assumeRoleRequest);
}

/**
* Similar to {@link #refreshRequest(AssumeRoleRequest)}, but takes a {@link Supplier} to supply the request to
* STS.
*
* @param assumeRoleRequestSupplier A supplier
* @return This object for chained calls.
*/
public Builder refreshRequest(Supplier<AssumeRoleRequest> assumeRoleRequestSupplier) {
this.assumeRoleRequestSupplier = assumeRoleRequestSupplier;
return this;
}

Expand Down