Added a note to the javadoc comment for the setter for instructionFileSuffix to mention that the . prefix is automatically added to the suffix + in reEncryptInstructionFileResponse, the . prefix will be removed from the suffix and return what the user requested the suffix be

Author: Anirav Kareddy

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

@@ -110,6 +110,7 @@ public Builder newKeyring(RawKeyring newKeyring) {
      * Sets a custom instruction file suffix for the re-encrypted instruction file.
      * For AES keyrings, only the default instruction file suffix is allowed.
      * For RSA keyrings, both the default and custom instruction file suffixes are allowed.
+     * Note: The "." prefix is automatically added to the suffix
      *
      * @param instructionFileSuffix the instruction file suffix
      * @return a reference to this object so that method calls can be chained together.

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

@@ -21,7 +21,7 @@ public class ReEncryptInstructionFileResponse {
   public ReEncryptInstructionFileResponse(String bucket, String key, String instructionFileSuffix) {
     this.bucket = bucket;
     this.key = key;
-    this.instructionFileSuffix = instructionFileSuffix;
+    this.instructionFileSuffix = instructionFileSuffix.substring(1);
   }
 
   /**

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

@@ -286,7 +286,7 @@ public void testAesKeyringReEncryptInstructionFile() {
 
     assertEquals(BUCKET, response.bucket());
     assertEquals(objectKey, response.key());
-    assertEquals(".instruction", response.instructionFileSuffix());
+    assertEquals("instruction", response.instructionFileSuffix());
 
     S3Client rotatedWrappedClient = S3Client.create();
 
@@ -410,7 +410,7 @@ public void testRsaKeyringReEncryptInstructionFile() {
 
     assertEquals(BUCKET, response.bucket());
     assertEquals(objectKey, response.key());
-    assertEquals(".instruction", response.instructionFileSuffix());
+    assertEquals("instruction", response.instructionFileSuffix());
 
     S3Client rotatedWrappedClient = S3Client.create();
 
@@ -530,7 +530,7 @@ public void testRsaKeyringReEncryptInstructionFileWithCustomSuffix() {
 
     assertEquals(BUCKET, reEncryptInstructionFileResponse.bucket());
     assertEquals(objectKey, reEncryptInstructionFileResponse.key());
-    assertEquals(".third-party-access-instruction-file", reEncryptInstructionFileResponse.instructionFileSuffix());
+    assertEquals("third-party-access-instruction-file", reEncryptInstructionFileResponse.instructionFileSuffix());
 
     ResponseBytes<GetObjectResponse> clientInstructionFile= wrappedClient.getObjectAsBytes(builder -> builder
       .bucket(BUCKET)
@@ -1671,7 +1671,4 @@ public void testReEncryptInstructionFileUpgradesV1RsaEncryptionOnlyToV3() throws
     deleteObject(BUCKET, objectKey, v3OriginalClient);
   }
 
-
-
-
 }