Skip to content

Add a builder API for constructing KMS MKPs #40

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.

Sign up for GitHub

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 4 commits into from
Nov 10, 2017
Merged

Add a builder API for constructing KMS MKPs #40

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3db992c
Add a builder API for constructing KMS MKPs
Oct 27, 2017
f9834f3
Don't attempt to automatically set the default region
Nov 8, 2017
45b4c1b
Add Builder.clone() and KMSMKP.withGrantTokens()
Nov 10, 2017
77cb424
Whitespace tweak
Nov 10, 2017
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
21 changes: 12 additions & 9 deletions src/main/java/com/amazonaws/encryptionsdk/kms/KmsMasterKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@

package com.amazonaws.encryptionsdk.kms;

import javax.crypto.SecretKey;
Copy link
Member

@mattsb42-aws mattsb42-aws Nov 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these new imports used anywhere?

import javax.crypto.spec.SecretKeySpec;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;

import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;

import com.amazonaws.AmazonServiceException;
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.AWSCredentialsProvider;
Expand Down Expand Up @@ -52,10 +51,20 @@ public final class KmsMasterKey extends MasterKey<KmsMasterKey> implements KmsMe
private final String id_;
private final List<String> grantTokens_ = new ArrayList<>();

/**
*
* @deprecated Use a {@link KmsMasterKeyProvider} to obtain {@link KmsMasterKey}s.
*/
@Deprecated
public static KmsMasterKey getInstance(final AWSCredentials creds, final String keyId) {
return new KmsMasterKeyProvider(creds, keyId).getMasterKey(keyId);
}

/**
*
* @deprecated Use a {@link KmsMasterKeyProvider} to obtain {@link KmsMasterKey}s.
*/
@Deprecated
public static KmsMasterKey getInstance(final AWSCredentialsProvider creds, final String keyId) {
return new KmsMasterKeyProvider(creds, keyId).getMasterKey(keyId);
}
Expand All @@ -65,12 +74,6 @@ static KmsMasterKey getInstance(final AWSKMS kms, final String id,
return new KmsMasterKey(kms, id, provider);
}

private KmsMasterKey(final AWSKMS kms, final String id) {
kms_ = kms;
id_ = id;
sourceProvider_ = this;
}

private KmsMasterKey(final AWSKMS kms, final String id, final MasterKeyProvider<KmsMasterKey> provider) {
kms_ = kms;
id_ = id;
Expand Down
Loading