Skip to content

Commit 9a95e00

Browse files
authored
Merge branch 'aniravk/ReEncrypt-feature' into aniravk/enforceRotationFunctionality
2 parents 3bc3775 + 675256f commit 9a95e00

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

src/main/java/software/amazon/encryption/s3/S3EncryptionClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ public ReEncryptInstructionFileResponse reEncryptInstructionFile(ReEncryptInstru
262262
if (reEncryptInstructionFileRequest.enforceRotation()) {
263263
enforceRotation(encryptedMaterials, request);
264264
}
265-
265+
266266
//Create or update instruction file with the re-encrypted metadata while preserving IV
267267
ContentMetadataEncodingStrategy encodeStrategy = new ContentMetadataEncodingStrategy(_instructionFileConfig);
268268
encodeStrategy.encodeMetadata(encryptedMaterials, iv, PutObjectRequest.builder()

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ private ReEncryptInstructionFileRequest(Builder builder) {
2727
newKeyring = builder.newKeyring;
2828
instructionFileSuffix = builder.instructionFileSuffix;
2929
enforceRotation = builder.enforceRotation;
30-
3130
}
3231

3332
/**

src/test/java/software/amazon/encryption/s3/S3EncryptionClientReEncryptInstructionFileTest.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3356,12 +3356,5 @@ public void testAesKeyringReEncryptInstructionFileV1ToV3UpgradeEnforceRotationWi
33563356

33573357
deleteObject(BUCKET, objectKey, v3RotatedClient);
33583358
}
3359-
3360-
3361-
3362-
3363-
3364-
3365-
3366-
3359+
33673360
}

0 commit comments

Comments
 (0)