when auto-creating a bucket with includeVersions enabled, S3Target now checks to see if the source bucket has versioning enabled before enabling it on the new bucket

Author: twincitiesguy

src/main/java/com/emc/vipr/sync/source/S3Source.java

@@ -39,6 +39,7 @@
 import java.net.URLDecoder;
 import java.util.Arrays;
 import java.util.Iterator;
+import java.util.List;
 import java.util.ListIterator;
 
 /**
@@ -70,6 +71,7 @@ public class S3Source extends SyncSource<S3SyncObject> {
     private String rootKey;
     private boolean decodeKeys;
     private S3Target s3Target;
+    private boolean versioningEnabled = false;
 
     private AmazonS3 s3;
 
@@ -123,6 +125,15 @@ public void configure(SyncSource source, Iterator<SyncFilter> filters, SyncTarge
         if (endpoint != null)
             s3.setEndpoint(endpoint);
 
+        // TODO: generalize uri translation
+        S3Util.S3Uri s3Uri = new S3Util.S3Uri();
+        s3Uri.protocol = protocol;
+        s3Uri.endpoint = endpoint;
+        s3Uri.accessKey = accessKey;
+        s3Uri.secretKey = secretKey;
+        s3Uri.rootKey = rootKey;
+        if (sourceUri == null) sourceUri = s3Uri.toUri();
+
         if (disableVHosts) {
             l4j.info("The use of virtual hosted buckets on the s3 source has been DISABLED.  Path style buckets will be used.");
             S3ClientOptions opts = new S3ClientOptions();
@@ -139,7 +150,14 @@ public void configure(SyncSource source, Iterator<SyncFilter> filters, SyncTarge
         if (rootKey.length() > 0 && !rootKey.endsWith("/")) rootKey += "/"; // " ends with slash
 
         // for version support. TODO: genericize version support
-        if (target instanceof S3Target) s3Target = (S3Target) target;
+        if (target instanceof S3Target) {
+            s3Target = (S3Target) target;
+            if (s3Target.isIncludeVersions()) {
+                BucketVersioningConfiguration versioningConfig = s3.getBucketVersioningConfiguration(bucketName);
+                List<String> versionedStates = Arrays.asList(BucketVersioningConfiguration.ENABLED, BucketVersioningConfiguration.SUSPENDED);
+                versioningEnabled = versionedStates.contains(versioningConfig.getStatus());
+            }
+        }
     }
 
     @Override
@@ -493,4 +511,8 @@ public boolean isDecodeKeys() {
     public void setDecodeKeys(boolean decodeKeys) {
         this.decodeKeys = decodeKeys;
     }
+
+    public boolean isVersioningEnabled() {
+        return versioningEnabled;
+    }
 }

src/main/java/com/emc/vipr/sync/target/S3Target.java

@@ -121,13 +121,30 @@ public void configure(SyncSource source, Iterator<SyncFilter> filters, SyncTarge
         if (endpoint != null)
             s3.setEndpoint(endpoint);
 
+        // TODO: generalize uri translation
+        S3Util.S3Uri s3Uri = new S3Util.S3Uri();
+        s3Uri.protocol = protocol;
+        s3Uri.endpoint = endpoint;
+        s3Uri.accessKey = accessKey;
+        s3Uri.secretKey = secretKey;
+        s3Uri.rootKey = rootKey;
+        if (targetUri == null) targetUri = s3Uri.toUri();
+
         if (disableVHosts) {
             l4j.info("The use of virtual hosted buckets on the s3 source has been DISABLED.  Path style buckets will be used.");
             S3ClientOptions opts = new S3ClientOptions();
             opts.setPathStyleAccess(true);
             s3.setS3ClientOptions(opts);
         }
 
+        // for version support. TODO: genericize version support
+        if (source instanceof S3Source) {
+            s3Source = (S3Source) source;
+            if (!s3Source.isVersioningEnabled()) includeVersions = false; // don't include versions if source versioning is off
+        } else if (includeVersions) {
+            throw new ConfigurationException("Object versions are currently only supported with the S3 source & target plugins.");
+        }
+
         if (!s3.doesBucketExist(bucketName)) {
             if (createBucket) {
                 s3.createBucket(bucketName);
@@ -141,11 +158,7 @@ public void configure(SyncSource source, Iterator<SyncFilter> filters, SyncTarge
 
         if (rootKey == null) rootKey = ""; // make sure rootKey isn't null
 
-        // for version support. TODO: genericize version support
-        if (source instanceof S3Source) s3Source = (S3Source) source;
         if (includeVersions) {
-            if (s3Source == null)
-                throw new ConfigurationException("Object versions are currently only supported with the S3 source & target plugins.");
             String status = s3.getBucketVersioningConfiguration(bucketName).getStatus();
             if (BucketVersioningConfiguration.OFF.equals(status))
                 throw new ConfigurationException("The specified bucket does not have versioning enabled.");