[S3] Add IntelligentTiering storage class (#755)

Karthikeyan · scb01 · commit 759f1229b40f · 2019-02-28T17:07:57.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log - AWS SDK for Android
 
+## [Release 2.12.2](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.12.2)
+
+### Misc. Updates
+
+* Model updates for the following services
+  * Amazon S3
+
 ## [Release 2.12.1](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.12.1)
 
 ### Bug Fixes
diff --git a/aws-android-sdk-s3-test/src/androidTest/java/com/amazonaws/services/s3/MultiThreadedDownloadIntegrationTest.java b/aws-android-sdk-s3-test/src/androidTest/java/com/amazonaws/services/s3/MultiThreadedDownloadIntegrationTest.java
@@ -15,11 +15,15 @@
 
 package com.amazonaws.services.s3;
 
+import android.util.Log;
+
 import static org.junit.Assert.assertTrue;
 
 import com.amazonaws.services.s3.model.S3Object;
 import com.amazonaws.testutils.util.RandomTempFile;
 
+import junit.framework.Assert;
+
 import org.junit.After;
 import org.junit.Test;
 
@@ -43,6 +47,8 @@
  */
 public class MultiThreadedDownloadIntegrationTest extends S3IntegrationTestBase {
 
+    private static final String TAG = MultiThreadedDownloadIntegrationTest.class.getSimpleName();
+
     /** The total number of GET object requests made to Amazon S3 */
     private static final int TOTAL_REQUESTS = 1000;
 
@@ -63,10 +69,14 @@ public void tearDown() {
         try {
             s3.deleteObject(bucketName, key);
         } catch (Exception e) {
+            Log.e(TAG, "Error in deleting the object: " + key);
+            Assert.assertTrue("Error in deleting the object: " + key, false);
         }
         try {
             s3.deleteBucket(bucketName);
         } catch (Exception e) {
+            Log.e(TAG, "Error in deleting the bucket: " + bucketName);
+            Assert.assertTrue("Error in deleting the bucket: " + bucketName, false);
         }
     }
 
diff --git a/aws-android-sdk-s3-test/src/androidTest/java/com/amazonaws/services/s3/StorageClassIntegrationTest.java b/aws-android-sdk-s3-test/src/androidTest/java/com/amazonaws/services/s3/StorageClassIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,9 @@
 
 package com.amazonaws.services.s3;
 
+import android.util.Log;
+
+import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
@@ -27,65 +30,122 @@
 import com.amazonaws.services.s3.model.VersionListing;
 import com.amazonaws.testutils.util.RandomInputStream;
 
-import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
  * Integration test for S3 storage class related operations.
  */
 public class StorageClassIntegrationTest extends S3IntegrationTestBase {
 
-    private String bucketName = "java-storage-class-integ-test-" + System.currentTimeMillis();
+    private static final String BUCKET_NAME = "java-storage-class-integ-test-" + System.currentTimeMillis();
+
+    private static final String TAG = StorageClassIntegrationTest.class.getSimpleName();
+
+    @BeforeClass
+    public static void setUp() {
+        try {
+            S3IntegrationTestBase.setUp();
+            s3.createBucket(BUCKET_NAME);
+            waitForBucketCreation(BUCKET_NAME);
+        } catch (Exception ex) {
+            Log.e(TAG, "Error in creating the bucket: " + BUCKET_NAME);
+            assertTrue("Error in creating the bucket: " + BUCKET_NAME, false);
+        }
+    }
 
     /**
      * Releases all resources allocated by this test.
      */
-    @After
-    public void tearDown() throws Exception {
-        deleteBucketAndAllVersionedContents(bucketName);
+    @AfterClass
+    public static void tearDown() {
+        try {
+            deleteBucketAndAllVersionedContents(BUCKET_NAME);
+        } catch (Exception ex) {
+            Log.e(TAG, "Error in deleting the bucket: " + BUCKET_NAME);
+        }
     }
 
     /**
      * Tests that we can change an object's storage class, upload objects in a
-     * specific storage class, and retrive an object's storage class, both for
-     * versioned and unversioned objects.
+     * specific storage class, and retrieve an object's storage class, both for
+     * versioned and non-versioned objects.
      */
     @Test
     public void testStorageClasses() throws Exception {
-        s3.createBucket(bucketName);
-
         // Upload an object with standard storage
-        putObject(bucketName, "key", StorageClass.Standard.toString());
-        assertStorageClass(bucketName, "key", StorageClass.Standard);
+        putObject(BUCKET_NAME, "key", StorageClass.Standard.toString());
+        assertStorageClass(BUCKET_NAME, "key", StorageClass.Standard);
 
         // Upload an object with reduced redundancy storage
-        putObject(bucketName, "key", StorageClass.ReducedRedundancy.toString());
-        assertStorageClass(bucketName, "key", StorageClass.ReducedRedundancy);
+        putObject(BUCKET_NAME, "key", StorageClass.ReducedRedundancy.toString());
+        assertStorageClass(BUCKET_NAME, "key", StorageClass.ReducedRedundancy);
 
-        // Move to regular storage
-        s3.changeObjectStorageClass(bucketName, "key", StorageClass.Standard);
-        assertStorageClass(bucketName, "key", StorageClass.Standard);
+        // Move to Standard storage
+        s3.changeObjectStorageClass(BUCKET_NAME, "key", StorageClass.Standard);
+        assertStorageClass(BUCKET_NAME, "key", StorageClass.Standard);
 
         // Move back to reduced redundancy storage
-        s3.changeObjectStorageClass(bucketName, "key", StorageClass.ReducedRedundancy);
-        assertStorageClass(bucketName, "key", StorageClass.ReducedRedundancy);
+        s3.changeObjectStorageClass(BUCKET_NAME, "key", StorageClass.ReducedRedundancy);
+        assertStorageClass(BUCKET_NAME, "key", StorageClass.ReducedRedundancy);
 
         // Turn on versioning
         s3.setBucketVersioningConfiguration(new SetBucketVersioningConfigurationRequest(
-                bucketName,
+                BUCKET_NAME,
                 new BucketVersioningConfiguration(BucketVersioningConfiguration.ENABLED)));
 
         // Upload a new version with standard storage
-        putObject(bucketName, "key", StorageClass.Standard.toString());
-        assertStorageClass(bucketName, "key", StorageClass.Standard);
+        putObject(BUCKET_NAME, "key", StorageClass.Standard.toString());
+        assertStorageClass(BUCKET_NAME, "key", StorageClass.Standard);
 
         // Move to reduced redundancy storage
-        s3.changeObjectStorageClass(bucketName, "key", StorageClass.ReducedRedundancy);
-        assertStorageClass(bucketName, "key", StorageClass.ReducedRedundancy);
+        s3.changeObjectStorageClass(BUCKET_NAME, "key", StorageClass.ReducedRedundancy);
+        assertStorageClass(BUCKET_NAME, "key", StorageClass.ReducedRedundancy);
 
         // And move back to standard storage
-        s3.changeObjectStorageClass(bucketName, "key", StorageClass.Standard);
-        assertStorageClass(bucketName, "key", StorageClass.Standard);
+        s3.changeObjectStorageClass(BUCKET_NAME, "key", StorageClass.Standard);
+        assertStorageClass(BUCKET_NAME, "key", StorageClass.Standard);
+    }
+
+    /**
+     * Tests that we can change an object's storage class, upload objects in a
+     * specific storage class, and retrive an object's storage class.
+     */
+    @Test
+    public void testStorageClasseIntelligentTiering() throws Exception {
+        // Upload an object with IntelligentTiering storage
+        putObject(BUCKET_NAME, "key", StorageClass.IntelligentTiering.toString());
+        assertStorageClass(BUCKET_NAME, "key", StorageClass.IntelligentTiering);
+
+        // Upload an object with reduced redundancy storage
+        putObject(BUCKET_NAME, "key", StorageClass.ReducedRedundancy.toString());
+        assertStorageClass(BUCKET_NAME, "key", StorageClass.ReducedRedundancy);
+
+        // Move to Standard storage
+        s3.changeObjectStorageClass(BUCKET_NAME, "key", StorageClass.Standard);
+        assertStorageClass(BUCKET_NAME, "key", StorageClass.Standard);
+
+        // Move back to IntelligentTiering storage
+        s3.changeObjectStorageClass(BUCKET_NAME, "key", StorageClass.IntelligentTiering);
+        assertStorageClass(BUCKET_NAME, "key", StorageClass.IntelligentTiering);
+
+        // Turn on versioning
+        s3.setBucketVersioningConfiguration(new SetBucketVersioningConfigurationRequest(
+                BUCKET_NAME,
+                new BucketVersioningConfiguration(BucketVersioningConfiguration.ENABLED)));
+
+        // Upload a new version with IntelligentTiering storage
+        putObject(BUCKET_NAME, "key", StorageClass.IntelligentTiering.toString());
+        assertStorageClass(BUCKET_NAME, "key", StorageClass.IntelligentTiering);
+
+        // Move to reduced redundancy storage
+        s3.changeObjectStorageClass(BUCKET_NAME, "key", StorageClass.ReducedRedundancy);
+        assertStorageClass(BUCKET_NAME, "key", StorageClass.ReducedRedundancy);
+
+        // And move back to IntelligentTiering storage
+        s3.changeObjectStorageClass(BUCKET_NAME, "key", StorageClass.IntelligentTiering);
+        assertStorageClass(BUCKET_NAME, "key", StorageClass.IntelligentTiering);
     }
 
     /*
@@ -96,7 +156,9 @@ public void testStorageClasses() throws Exception {
      * Uploads some random test data to the object stored in the specified
      * bucket and key, and uses the specified storage class.
      */
-    private void putObject(String bucketName, String key, String storageClass) {
+    private void putObject(String bucketName,
+                           String key,
+                           String storageClass) {
         ObjectMetadata metadata = new ObjectMetadata();
         metadata.setContentLength(1230);
         PutObjectRequest request = new PutObjectRequest(bucketName, key,
@@ -109,7 +171,9 @@ private void putObject(String bucketName, String key, String storageClass) {
      * Asserts that the latest version for the specified object is stored in the
      * expected storage class, otherwise this method fails the current test.
      */
-    private void assertStorageClass(String bucketName, String key, StorageClass expectedStorageClass)
+    private void assertStorageClass(String bucketName,
+                                    String key,
+                                    StorageClass expectedStorageClass)
             throws Exception {
         // Short pause for eventual consistency
         Thread.sleep(1000 * 3);
diff --git a/aws-android-sdk-s3/src/main/java/com/amazonaws/services/s3/model/StorageClass.java b/aws-android-sdk-s3/src/main/java/com/amazonaws/services/s3/model/StorageClass.java
@@ -66,7 +66,17 @@ public enum StorageClass {
      * One Zone Infrequent Access storage class stores object data in only one Availability Zone at a lower price than
      * STANDARD_IA.
      */
-    OneZoneInfrequentAccess("ONEZONE_IA")
+    OneZoneInfrequentAccess("ONEZONE_IA"),
+
+    /**
+     * IntelligentTiering makes it easy to lower your overall cost of storage by automatically placing data in the storage
+     * class that best matches the access patterns for the storage. With IntelligentTiering, you don’t need to define
+     * and manage individual policies for lifecycle data management or write code to transition objects
+     * between storage classes. Instead, you can use IntelligentTiering to manage transitions between Standard and
+     * S-IA without writing any application code. IntelligentTiering also manages transitions automatically to
+     * Glacier for long term archive in addition to S3 storage classes.
+     */
+    IntelligentTiering("INTELLIGENT_TIERING")
     ;
 
     /**
