-
Notifications
You must be signed in to change notification settings - Fork 916
Refactors credential identity with separate implementing classes #4024
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
cenedhryn
merged 2 commits into
feature/master/sra-identity-auth
from
salande/add-default-credential-identity-classes
May 19, 2023
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
...main/java/software/amazon/awssdk/identity/spi/internal/DefaultAwsCredentialsIdentity.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package software.amazon.awssdk.identity.spi.internal; | ||
|
|
||
| import java.util.Objects; | ||
| import software.amazon.awssdk.annotations.SdkInternalApi; | ||
| import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity; | ||
| import software.amazon.awssdk.utils.ToString; | ||
| import software.amazon.awssdk.utils.Validate; | ||
|
|
||
| @SdkInternalApi | ||
| public final class DefaultAwsCredentialsIdentity implements AwsCredentialsIdentity { | ||
|
|
||
| private final String accessKeyId; | ||
| private final String secretAccessKey; | ||
|
|
||
| private DefaultAwsCredentialsIdentity(Builder builder) { | ||
| this.accessKeyId = builder.accessKeyId; | ||
| this.secretAccessKey = builder.secretAccessKey; | ||
|
|
||
| Validate.paramNotNull(accessKeyId, "accessKeyId"); | ||
| Validate.paramNotNull(secretAccessKey, "secretAccessKey"); | ||
| } | ||
|
|
||
| public static AwsCredentialsIdentity.Builder builder() { | ||
| return new Builder(); | ||
| } | ||
|
|
||
| @Override | ||
| public String accessKeyId() { | ||
| return accessKeyId; | ||
| } | ||
|
|
||
| @Override | ||
| public String secretAccessKey() { | ||
| return secretAccessKey; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return ToString.builder("AwsCredentialsIdentity") | ||
| .add("accessKeyId", accessKeyId) | ||
| .build(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| AwsCredentialsIdentity that = (AwsCredentialsIdentity) o; | ||
| return Objects.equals(accessKeyId, that.accessKeyId()) && | ||
| Objects.equals(secretAccessKey, that.secretAccessKey()); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| int hashCode = 1; | ||
| hashCode = 31 * hashCode + Objects.hashCode(accessKeyId); | ||
| hashCode = 31 * hashCode + Objects.hashCode(secretAccessKey); | ||
| return hashCode; | ||
| } | ||
|
|
||
| private static final class Builder implements AwsCredentialsIdentity.Builder { | ||
| private String accessKeyId; | ||
| private String secretAccessKey; | ||
|
|
||
| private Builder() { | ||
| } | ||
|
|
||
| @Override | ||
| public Builder accessKeyId(String accessKeyId) { | ||
| this.accessKeyId = accessKeyId; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public Builder secretAccessKey(String secretAccessKey) { | ||
| this.secretAccessKey = secretAccessKey; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public AwsCredentialsIdentity build() { | ||
| return new DefaultAwsCredentialsIdentity(this); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
extends CopyableBuilder?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't think it was necessarily needed, but we can add it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I played around with different versions of CopyableBuilder, but it doesn't work for the subtypes. If
AwsCredentialsIdentityimplementsToCopyableBuilderthe returned builder will be of typeAwsCredentialsIdentity.BuilderforAwsSessionCredentialsIdentitytoo and you'll lose the specific information in the subtype.