Switch to supported ClientConfiguration.withUserAgentSuffix

Author: SalusaSecondus

.gitignore

@@ -3,3 +3,4 @@ target/
 .settings/
 .project
 .classpath
+/bin/

src/main/java/com/amazonaws/encryptionsdk/kms/KmsMasterKey.java

@@ -24,7 +24,6 @@
 import javax.crypto.spec.SecretKeySpec;
 
 import com.amazonaws.AmazonServiceException;
-import com.amazonaws.AmazonWebServiceRequest;
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.encryptionsdk.AwsCrypto;
@@ -35,7 +34,6 @@
 import com.amazonaws.encryptionsdk.MasterKeyProvider;
 import com.amazonaws.encryptionsdk.exception.AwsCryptoException;
 import com.amazonaws.encryptionsdk.exception.UnsupportedProviderException;
-import com.amazonaws.encryptionsdk.internal.VersionInfo;
 import com.amazonaws.services.kms.AWSKMS;
 import com.amazonaws.services.kms.model.DecryptRequest;
 import com.amazonaws.services.kms.model.DecryptResult;
@@ -92,12 +90,12 @@ public String getKeyId() {
     @Override
     public DataKey<KmsMasterKey> generateDataKey(final CryptoAlgorithm algorithm,
             final Map<String, String> encryptionContext) {
-        final GenerateDataKeyResult gdkResult = kms_.generateDataKey(appendUserAgent(
+        final GenerateDataKeyResult gdkResult = kms_.generateDataKey(
                 new GenerateDataKeyRequest()
                         .withKeyId(getKeyId())
                         .withNumberOfBytes(algorithm.getDataKeyLength())
                         .withEncryptionContext(encryptionContext)
-                        .withGrantTokens(grantTokens_))
+                        .withGrantTokens(grantTokens_)
                 );
         final byte[] rawKey = new byte[algorithm.getDataKeyLength()];
         gdkResult.getPlaintext().get(rawKey);
@@ -136,12 +134,12 @@ public DataKey<KmsMasterKey> encryptDataKey(final CryptoAlgorithm algorithm,
             throw new IllegalArgumentException("Only RAW encoded keys are supported");
         }
         try {
-            final EncryptResult encryptResult = kms_.encrypt(appendUserAgent(
+            final EncryptResult encryptResult = kms_.encrypt(
                     new EncryptRequest()
                             .withKeyId(id_)
                             .withPlaintext(ByteBuffer.wrap(key.getEncoded()))
                             .withEncryptionContext(encryptionContext)
-                            .withGrantTokens(grantTokens_)));
+                            .withGrantTokens(grantTokens_));
             final byte[] edk = new byte[encryptResult.getCiphertextBlob().remaining()];
             encryptResult.getCiphertextBlob().get(edk);
             return new DataKey<>(dataKey.getKey(), edk, encryptResult.getKeyId().getBytes(StandardCharsets.UTF_8), this);
@@ -158,11 +156,11 @@ public DataKey<KmsMasterKey> decryptDataKey(final CryptoAlgorithm algorithm,
         final List<Exception> exceptions = new ArrayList<>();
         for (final EncryptedDataKey edk : encryptedDataKeys) {
             try {
-                final DecryptResult decryptResult = kms_.decrypt(appendUserAgent(
+                final DecryptResult decryptResult = kms_.decrypt(
                         new DecryptRequest()
                                 .withCiphertextBlob(ByteBuffer.wrap(edk.getEncryptedDataKey()))
                                 .withEncryptionContext(encryptionContext)
-                                .withGrantTokens(grantTokens_)));
+                                .withGrantTokens(grantTokens_));
                 if (decryptResult.getKeyId().equals(id_)) {
                     final byte[] rawKey = new byte[algorithm.getDataKeyLength()];
                     decryptResult.getPlaintext().get(rawKey);
@@ -181,9 +179,4 @@ public DataKey<KmsMasterKey> decryptDataKey(final CryptoAlgorithm algorithm,
 
         throw buildCannotDecryptDksException(exceptions);
     }
-
-    private static <R extends AmazonWebServiceRequest> R appendUserAgent(final R request) {
-        request.getRequestClientOptions().appendUserAgent(VersionInfo.USER_AGENT);
-        return request;
-    }
 }

src/main/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProvider.java

@@ -32,6 +32,7 @@
 import com.amazonaws.encryptionsdk.exception.AwsCryptoException;
 import com.amazonaws.encryptionsdk.exception.NoSuchMasterKeyException;
 import com.amazonaws.encryptionsdk.exception.UnsupportedProviderException;
+import com.amazonaws.encryptionsdk.internal.VersionInfo;
 import com.amazonaws.internal.StaticCredentialsProvider;
 import com.amazonaws.regions.Region;
 import com.amazonaws.regions.Regions;
@@ -43,6 +44,8 @@
  * if you want to use keys from multiple regions, you'll need multiple copies of this object.
  */
 public class KmsMasterKeyProvider extends MasterKeyProvider<KmsMasterKey> implements KmsMethods {
+	private static final ClientConfiguration DEFAULT_CLIENT_CONFIG =
+			new ClientConfiguration().withUserAgentSuffix(VersionInfo.USER_AGENT);
     private static final String PROVIDER_NAME = "aws-kms";
     private final AWSKMS kms_;
     private final List<String> keyIds_;
@@ -55,7 +58,7 @@ public class KmsMasterKeyProvider extends MasterKeyProvider<KmsMasterKey> implem
      * to talk to the {@link Regions#DEFAULT_REGION}.
      */
     public KmsMasterKeyProvider() {
-        this(new AWSKMSClient(), Region.getRegion(Regions.DEFAULT_REGION), Collections.<String> emptyList());
+        this(new AWSKMSClient(DEFAULT_CLIENT_CONFIG), Region.getRegion(Regions.DEFAULT_REGION), Collections.<String> emptyList());
     }
 
     /**
@@ -64,7 +67,7 @@ public KmsMasterKeyProvider() {
      * {@code keyId} as appropriate.
      */
     public KmsMasterKeyProvider(final String keyId) {
-        this(new AWSKMSClient(), getStartingRegion(keyId), Collections.singletonList(keyId));
+        this(new AWSKMSClient(DEFAULT_CLIENT_CONFIG), getStartingRegion(keyId), Collections.singletonList(keyId));
     }
 
     /**
@@ -110,7 +113,10 @@ public KmsMasterKeyProvider(final AWSCredentialsProvider creds) {
      */
     public KmsMasterKeyProvider(final AWSCredentialsProvider creds, final Region region,
             final ClientConfiguration clientConfiguration, final String keyId) {
-        this(new AWSKMSClient(creds, clientConfiguration), region, Collections.singletonList(keyId));
+        this(
+            new AWSKMSClient(creds, clientConfiguration.withUserAgentSuffix(VersionInfo.USER_AGENT)),
+            region,
+            Collections.singletonList(keyId));
     }
 
     /**
@@ -119,7 +125,10 @@ public KmsMasterKeyProvider(final AWSCredentialsProvider creds, final Region reg
      */
     public KmsMasterKeyProvider(final AWSCredentialsProvider creds, final Region region,
             final ClientConfiguration clientConfiguration, final List<String> keyIds) {
-        this(new AWSKMSClient(creds, clientConfiguration), region, keyIds);
+        this(
+            new AWSKMSClient(creds, clientConfiguration.withUserAgentSuffix(VersionInfo.USER_AGENT)),
+            region,
+            keyIds);
     }
 
     /**