Add api names / user-agent to the KMS calls.

Author: smswz

src/main/java/software/amazon/encryption/s3/internal/ApiNameVersion.java

@@ -0,0 +1,24 @@
+package software.amazon.encryption.s3.internal;
+
+import software.amazon.awssdk.core.ApiName;
+
+/**
+ * Provides the information for the ApiName APIs for the AWS SDK
+ */
+public class ApiNameVersion {
+    public static final String API_NAME = "AwsS3Encrypt";
+
+    public static final String API_VERSION_UNKNOWN = "unknown";
+
+    public static ApiName apiNameWithVersion() {
+        return ApiName.builder()
+                .name(API_NAME)
+                .version(apiVersion())
+                .build();
+    }
+
+    private static String apiVersion() {
+        // TODO: Use a resources file akin to ESDK to populate this
+        return API_VERSION_UNKNOWN;
+    }
+}

src/main/java/software/amazon/encryption/s3/materials/KMSContextKeyring.java

@@ -4,13 +4,15 @@
 import java.util.List;
 import java.util.TreeMap;
 import javax.crypto.SecretKey;
+import software.amazon.awssdk.core.ApiName;
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.services.kms.KmsClient;
 import software.amazon.awssdk.services.kms.model.DecryptRequest;
 import software.amazon.awssdk.services.kms.model.DecryptResponse;
 import software.amazon.awssdk.services.kms.model.EncryptRequest;
 import software.amazon.awssdk.services.kms.model.EncryptResponse;
 import software.amazon.encryption.s3.S3EncryptionClientException;
+import software.amazon.encryption.s3.internal.ApiNameVersion;
 
 /**
  * AESKeyring will call to KMS to wrap the data key used to encrypt content.
@@ -21,6 +23,8 @@ public class KMSContextKeyring implements Keyring {
 
     private static final String ENCRYPTION_CONTEXT_ALGORITHM_KEY = "aws:x-amz-cek-alg";
 
+    private static final ApiName API_NAME = ApiNameVersion.apiNameWithVersion();
+
     private final KmsClient _kmsClient;
     private final String _wrappingKeyId;
     private final DataKeyGenerator _dataKeyGenerator;
@@ -56,6 +60,7 @@ public EncryptionMaterials onEncrypt(EncryptionMaterials materials) {
                     .keyId(_wrappingKeyId)
                     .encryptionContext(encryptionContext)
                     .plaintext(SdkBytes.fromByteArray(materials.plaintextDataKey()))
+                    .overrideConfiguration(builder -> builder.addApiName(API_NAME))
                     .build();
 
             EncryptResponse response = _kmsClient.encrypt(request);
@@ -94,6 +99,7 @@ public DecryptionMaterials onDecrypt(final DecryptionMaterials materials, List<E
                         .keyId(_wrappingKeyId)
                         .encryptionContext(materials.encryptionContext())
                         .ciphertextBlob(SdkBytes.fromByteArray(encryptedDataKey.ciphertext()))
+                        .overrideConfiguration(builder -> builder.addApiName(API_NAME))
                         .build();
 
                 DecryptResponse response = _kmsClient.decrypt(request);