Fix up some S3BlobStoreContainerTests

Author: DaveCTurner

modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobStore.java

@@ -498,21 +498,25 @@ public TimeValue getGetRegisterRetryDelay() {
         return getRegisterRetryDelay;
     }
 
-    public static StorageClass initStorageClass(String storageClass) {
-        if ((storageClass == null) || storageClass.equals("")) {
+    public static StorageClass initStorageClass(String storageClassName) {
+        if ((storageClassName == null) || storageClassName.equals("")) {
             return StorageClass.STANDARD;
         }
 
+        final StorageClass storageClass;
         try {
-            final StorageClass _storageClass = StorageClass.fromValue(storageClass.toUpperCase(Locale.ENGLISH));
-            if (_storageClass.equals(StorageClass.GLACIER)) {
-                throw new BlobStoreException("Glacier storage class is not supported");
-            }
-
-            return _storageClass;
-        } catch (final IllegalArgumentException illegalArgumentException) {
-            throw new BlobStoreException("`" + storageClass + "` is not a valid S3 Storage Class.");
+            storageClass = StorageClass.fromValue(storageClassName.toUpperCase(Locale.ENGLISH));
+        } catch (final Exception e) {
+            throw new BlobStoreException("`" + storageClassName + "` is not a valid S3 Storage Class.", e);
+        }
+        if (storageClass.equals(StorageClass.GLACIER)) {
+            throw new BlobStoreException("Glacier storage class is not supported");
         }
+        if (storageClass.equals(StorageClass.UNKNOWN_TO_SDK_VERSION)) {
+            throw new BlobStoreException("`" + storageClassName + "` is not a known S3 Storage Class.");
+        }
+
+        return storageClass;
     }
 
     /**

modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobStoreContainerTests.java

@@ -384,7 +384,7 @@ public void testExecuteMultipartUploadAborted() {
 
     private static S3Client configureMockClient(S3BlobStore blobStore) {
         final S3Client client = mock(S3Client.class);
-        final SdkHttpClient httpClient = mock(ApacheHttpClient.class);
+        final SdkHttpClient httpClient = mock(SdkHttpClient.class);
         try (AmazonS3Reference clientReference = new AmazonS3Reference(client, httpClient)) {
             clientReference.mustIncRef(); // held by the mock, ultimately released in closeMockClient
             when(blobStore.clientReference()).then(invocation -> {
@@ -436,7 +436,7 @@ public void testInitCannedACL() {
             "public-read",
             "public-read-write",
             "authenticated-read",
-            "log-delivery-write",
+            // "log-delivery-write", TODO NOMERGE this isn't supported in SDKv2
             "bucket-owner-read",
             "bucket-owner-full-control" };
 
@@ -485,7 +485,7 @@ public void testCaseInsensitiveStorageClass() {
 
     public void testInvalidStorageClass() {
         BlobStoreException ex = expectThrows(BlobStoreException.class, () -> S3BlobStore.initStorageClass("whatever"));
-        assertThat(ex.getMessage(), equalTo("`whatever` is not a valid S3 Storage Class."));
+        assertThat(ex.getMessage(), equalTo("`whatever` is not a known S3 Storage Class."));
     }
 
     public void testRejectGlacierStorageClass() {