Merge pull request #53 from duzinkie/s3express-support

support for s3 express one zone
androidx · Apr 24, 2024 · 24d137f · 24d137f
2 parents bdcb982 + d5713da
commit 24d137f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/s3buildcache/src/main/kotlin/androidx/build/gradle/s3buildcache/S3BuildCache.kt b/s3buildcache/src/main/kotlin/androidx/build/gradle/s3buildcache/S3BuildCache.kt
@@ -31,6 +31,7 @@ abstract class S3BuildCache : RemoteGradleBuildCache() {
 
     /**
      * Whether to use reduced redundancy.
+     * When using S3 Express One Zone, set to false
      * @see <a href="https://aws.amazon.com/s3/reduced-redundancy/">Reduced Redundancy</a>
      * */
     var reducedRedundancy: Boolean = true

diff --git a/s3buildcache/src/main/kotlin/androidx/build/gradle/s3buildcache/S3StorageService.kt b/s3buildcache/src/main/kotlin/androidx/build/gradle/s3buildcache/S3StorageService.kt
@@ -21,13 +21,17 @@ import androidx.build.gradle.core.FileHandleInputStream
 import androidx.build.gradle.core.FileHandleInputStream.Companion.handleInputStream
 import androidx.build.gradle.core.StorageService
 import org.gradle.api.logging.Logging
+import software.amazon.awssdk.core.exception.SdkClientException
+import software.amazon.awssdk.core.exception.SdkException
+import software.amazon.awssdk.core.exception.SdkServiceException
 import software.amazon.awssdk.core.sync.RequestBody
 import software.amazon.awssdk.services.s3.S3Client
 import software.amazon.awssdk.services.s3.model.DeleteObjectRequest
 import software.amazon.awssdk.services.s3.model.GetObjectRequest
+import software.amazon.awssdk.services.s3.model.HeadBucketRequest
+import software.amazon.awssdk.services.s3.model.NoSuchBucketException
 import software.amazon.awssdk.services.s3.model.PutObjectRequest
 import software.amazon.awssdk.services.s3.model.StorageClass.REDUCED_REDUNDANCY
-import software.amazon.awssdk.services.s3.model.StorageClass.STANDARD
 import java.io.InputStream
 import kotlin.io.path.outputStream
 
@@ -74,7 +78,11 @@ class S3StorageService(
         val request = PutObjectRequest.builder()
             .bucket(bucketName)
             .key(cacheKey)
-            .storageClass(if (reducedRedundancy) REDUCED_REDUNDANCY else STANDARD)
+            .apply {
+                if (reducedRedundancy) {
+                    storageClass(REDUCED_REDUNDANCY)
+                }
+            }
             .build()
         logger.info("Storing $cacheKey via $request")
         return store(client, request, contents)
@@ -101,11 +109,13 @@ class S3StorageService(
 
     override fun validateConfiguration() {
         try {
-            val buckets = client.listBuckets().buckets()
-            if (buckets.none { bucket -> bucket.name() == bucketName }) {
-                throw Exception("Bucket $bucketName under project $region cannot be found or is not accessible using the provided credentials")
-            }
-        } catch (e: Exception) {
+            client.headBucket(HeadBucketRequest.builder().bucket(bucketName).build())
+        }  catch(e: NoSuchBucketException) {
+            throw Exception("Bucket $bucketName in $region cannot be found: ${e.message}")
+        } catch  (e: SdkServiceException ) {
+            throw Exception("AWS SDK exception on validating access to $bucketName in $region: ${e::class.simpleName} - ${e.message}")
+        }
+        catch (e: Exception) {
             logger.warn("Couldn't validate S3 client config: ${e.message}")
         }
     }