Misc S3BlobStoreRepositoryTests improvements

Author: DaveCTurner

modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java

@@ -10,6 +10,7 @@
 
 import fixture.s3.S3HttpHandler;
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
+import software.amazon.awssdk.core.internal.http.pipeline.stages.ApplyTransactionIdStage;
 import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
 import software.amazon.awssdk.services.s3.model.ListMultipartUploadsRequest;
 import software.amazon.awssdk.services.s3.model.MultipartUpload;
@@ -121,9 +122,9 @@ public void setUp() throws Exception {
             region = "test-region";
         }
         if (region != null && randomBoolean()) {
-            signerOverride = randomFrom("AWS3SignerType", "AWS4SignerType");
+            signerOverride = randomFrom("SDKV2_AWS_V4_SIGNER_TYPE", "SDKV2_AWS_S3_V4_SIGNER_TYPE");
         } else if (randomBoolean()) {
-            signerOverride = "AWS3SignerType";
+            signerOverride = "SDKV2_AWS_S3_V4_SIGNER_TYPE";
         }
         shouldFailCompleteMultipartUploadRequest.set(false);
         super.setUp();
@@ -683,8 +684,7 @@ protected static class S3ErroneousHttpHandler extends ErroneousHttpHandler {
         @Override
         protected String requestUniqueId(final HttpExchange exchange) {
             // Amazon SDK client provides a unique ID per request
-            // TODO NOMERGE: make "x-amz-request-id" into a constant someplace.
-            return exchange.getRequestHeaders().getFirst("x-amz-request-id");
+            return exchange.getRequestHeaders().getFirst(ApplyTransactionIdStage.HEADER_SDK_TRANSACTION_ID);
         }
     }