chore(Examples): Update attribute names for some examples (#212)

Author: lucasmcdonald3

.github/workflows/ci_examples_java.yml

@@ -109,6 +109,5 @@ jobs:
           # Run simple examples
           gradle -p runtimes/java/DynamoDbEncryption test 
           # Run migration examples
-          gradle -p runtimes/java/Migration/AWSDBE test
-          gradle -p runtimes/java/Migration/DDBEC test
+          gradle -p runtimes/java/Migration/DDBECToAWSDBE test
 

Examples/runtimes/java/DynamoDbEncryption/src/main/java/software/amazon/cryptography/examples/BasicPutGetExample.java

@@ -53,9 +53,9 @@ public static void PutItemGetItem(String kmsKeyId, String ddbTableName) {
         final Map<String, CryptoAction> attributeActionsOnEncrypt = new HashMap<>();
         attributeActionsOnEncrypt.put("partition_key", CryptoAction.SIGN_ONLY); // Our partition attribute must be SIGN_ONLY
         attributeActionsOnEncrypt.put("sort_key", CryptoAction.SIGN_ONLY); // Our sort attribute must be SIGN_ONLY
-        attributeActionsOnEncrypt.put("data_to_encrypt", CryptoAction.ENCRYPT_AND_SIGN);
-        attributeActionsOnEncrypt.put("data_to_sign", CryptoAction.SIGN_ONLY);
-        attributeActionsOnEncrypt.put(":data_to_ignore", CryptoAction.DO_NOTHING);
+        attributeActionsOnEncrypt.put("attribute1", CryptoAction.ENCRYPT_AND_SIGN);
+        attributeActionsOnEncrypt.put("attribute2", CryptoAction.SIGN_ONLY);
+        attributeActionsOnEncrypt.put(":attribute3", CryptoAction.DO_NOTHING);
 
         // 3. Configure which attributes we expect to be included in the signature
         //    when reading items. There are two options for configuring this:
@@ -132,9 +132,9 @@ public static void PutItemGetItem(String kmsKeyId, String ddbTableName) {
         final HashMap<String, AttributeValue> item = new HashMap<>();
         item.put("partition_key", AttributeValue.builder().s("BasicPutGetExample").build());
         item.put("sort_key", AttributeValue.builder().n("0").build());
-        item.put("data_to_encrypt", AttributeValue.builder().s("encrypt and sign me!").build());
-        item.put("data_to_sign", AttributeValue.builder().s("sign me!").build());
-        item.put(":data_to_ignore", AttributeValue.builder().s("ignore me!").build());
+        item.put("attribute1", AttributeValue.builder().s("encrypt and sign me!").build());
+        item.put("attribute2", AttributeValue.builder().s("sign me!").build());
+        item.put(":attribute3", AttributeValue.builder().s("ignore me!").build());
 
         final PutItemRequest putRequest = PutItemRequest.builder()
                 .tableName(ddbTableName)
@@ -163,7 +163,7 @@ public static void PutItemGetItem(String kmsKeyId, String ddbTableName) {
         // Demonstrate that GetItem succeeded and returned the decrypted item
         assert 200 == getResponse.sdkHttpResponse().statusCode();
         final Map<String, AttributeValue> returnedItem = getResponse.item();
-        assert returnedItem.get("data_to_encrypt").s().equals("encrypt and sign me!");
+        assert returnedItem.get("attribute1").s().equals("encrypt and sign me!");
 
     }
 

Examples/runtimes/java/DynamoDbEncryption/src/main/java/software/amazon/cryptography/examples/enhanced/EnhancedPutGetExample.java

@@ -137,9 +137,9 @@ public static void PutItemGetItem(String kmsKeyId, String ddbTableName) {
         final SimpleClass item = new SimpleClass();
         item.setPartitionKey("EnhancedPutGetExample");
         item.setSortKey(0);
-        item.setEncryptAndSign("encrypt and sign me!");
-        item.setSignOnly("sign me!");
-        item.setDoNothing("ignore me!");
+        item.setAttribute1("encrypt and sign me!");
+        item.setAttribute2("sign me!");
+        item.setAttribute3("ignore me!");
 
         table.putItem(item);
 
@@ -154,7 +154,7 @@ public static void PutItemGetItem(String kmsKeyId, String ddbTableName) {
                 (GetItemEnhancedRequest.Builder requestBuilder) -> requestBuilder.key(key));
 
         // Demonstrate we get the original item back
-        assert result.getEncryptAndSign().equals("encrypt and sign me!");
+        assert result.getAttribute1().equals("encrypt and sign me!");
     }
 
     public static void main(final String[] args) {

Examples/runtimes/java/DynamoDbEncryption/src/main/java/software/amazon/cryptography/examples/enhanced/SimpleClass.java

@@ -16,9 +16,9 @@ public class SimpleClass {
 
     private String partitionKey;
     private int sortKey;
-    private String encryptAndSign;
-    private String doNothing;
-    private String signOnly;
+    private String attribute1;
+    private String attribute2;
+    private String attribute3;
 
     @DynamoDbPartitionKey
     @DynamoDbAttribute(value = "partition_key")
@@ -40,31 +40,31 @@ public void setSortKey(int sortKey) {
         this.sortKey = sortKey;
     }
 
-    public String getEncryptAndSign() {
-        return this.encryptAndSign;
+    public String getAttribute1() {
+        return this.attribute1;
     }
 
-    public void setEncryptAndSign(String encryptAndSign) {
-        this.encryptAndSign = encryptAndSign;
+    public void setAttribute1(String attribute1) {
+        this.attribute1 = attribute1;
     }
 
     @DynamoDbEncryptionSignOnly
-    public String getSignOnly() {
-        return this.signOnly;
+    public String getAttribute2() {
+        return this.attribute2;
     }
 
-    public void setSignOnly(String signOnly) {
-        this.signOnly = signOnly;
+    public void setAttribute2(String attribute2) {
+        this.attribute2 = attribute2;
     }
 
     @DynamoDbEncryptionDoNothing
-    public String getDoNothing() {
-        return this.doNothing;
+    public String getAttribute3() {
+        return this.attribute3;
     }
 
-    @DynamoDbAttribute(value = ":do_nothing")
-    public void setDoNothing(String doNothing) {
-        this.doNothing = doNothing;
+    @DynamoDbAttribute(value = ":attribute3")
+    public void setAttribute3(String attribute3) {
+        this.attribute3 = attribute3;
     }
 }
 

Examples/runtimes/java/DynamoDbEncryption/src/main/java/software/amazon/cryptography/examples/itemencryptor/ItemEncryptDecryptExample.java

@@ -57,9 +57,9 @@ public static void PutItemGetItem(String kmsKeyId, String ddbTableName) {
         final Map<String, CryptoAction> attributeActionsOnEncrypt = new HashMap<>();
         attributeActionsOnEncrypt.put("partition_key", CryptoAction.SIGN_ONLY); // Our partition attribute must be SIGN_ONLY
         attributeActionsOnEncrypt.put("sort_key", CryptoAction.SIGN_ONLY); // Our sort attribute must be SIGN_ONLY
-        attributeActionsOnEncrypt.put("data_to_encrypt", CryptoAction.ENCRYPT_AND_SIGN);
-        attributeActionsOnEncrypt.put("data_to_sign", CryptoAction.SIGN_ONLY);
-        attributeActionsOnEncrypt.put(":data_to_ignore", CryptoAction.DO_NOTHING);
+        attributeActionsOnEncrypt.put("attribute1", CryptoAction.ENCRYPT_AND_SIGN);
+        attributeActionsOnEncrypt.put("attribute2", CryptoAction.SIGN_ONLY);
+        attributeActionsOnEncrypt.put(":attribute3", CryptoAction.DO_NOTHING);
 
         // 3. Configure which attributes we expect to be included in the signature
         //    when reading items. There are two options for configuring this:
@@ -122,9 +122,9 @@ public static void PutItemGetItem(String kmsKeyId, String ddbTableName) {
         final Map<String, AttributeValue> originalItem = new HashMap<>();
         originalItem.put("partition_key", AttributeValue.builder().s("ItemEncryptDecryptExample").build());
         originalItem.put("sort_key", AttributeValue.builder().n("0").build());
-        originalItem.put("data_to_encrypt", AttributeValue.builder().s("encrypt and sign me!").build());
-        originalItem.put("data_to_sign", AttributeValue.builder().s("sign me!").build());
-        originalItem.put(":data_to_ignore", AttributeValue.builder().s("ignore me!").build());
+        originalItem.put("attribute1", AttributeValue.builder().s("encrypt and sign me!").build());
+        originalItem.put("attribute2", AttributeValue.builder().s("sign me!").build());
+        originalItem.put(":attribute3", AttributeValue.builder().s("ignore me!").build());
 
         final Map<String, AttributeValue> encryptedItem = itemEncryptor.EncryptItem(
                 EncryptItemInput.builder()
@@ -135,7 +135,7 @@ public static void PutItemGetItem(String kmsKeyId, String ddbTableName) {
         // Demonstrate that the item has been encrypted
         assert encryptedItem.get("partition_key").s().equals("ItemEncryptDecryptExample");
         assert encryptedItem.get("sort_key").n().equals("0");
-        assert encryptedItem.get("data_to_encrypt").b() != null;
+        assert encryptedItem.get("attribute1").b() != null;
 
         // 6. Directly decrypt the encrypted item using the DynamoDb Item Encryptor
         final Map<String, AttributeValue> decryptedItem = itemEncryptor.DecryptItem(
@@ -147,7 +147,7 @@ public static void PutItemGetItem(String kmsKeyId, String ddbTableName) {
         // Demonstrate that GetItem succeeded and returned the decrypted item
         assert decryptedItem.get("partition_key").s().equals("ItemEncryptDecryptExample");
         assert decryptedItem.get("sort_key").n().equals("0");
-        assert decryptedItem.get("data_to_encrypt").s().equals("encrypt and sign me!");
+        assert decryptedItem.get("attribute1").s().equals("encrypt and sign me!");
     }
 
     public static void main(final String[] args) {