Added versioning for S3 buckets

src/main/java/com/libertymutualgroup/herman/aws/ecs/broker/s3/S3Broker.java

@@ -27,6 +27,7 @@
 import com.amazonaws.services.s3.model.BucketNotificationConfiguration;
 import com.amazonaws.services.s3.model.BucketPolicy;
 import com.amazonaws.services.s3.model.BucketTaggingConfiguration;
+import com.amazonaws.services.s3.model.BucketVersioningConfiguration;
 import com.amazonaws.services.s3.model.BucketWebsiteConfiguration;
 import com.amazonaws.services.s3.model.CannedAccessControlList;
 import com.amazonaws.services.s3.model.CreateBucketRequest;
@@ -42,6 +43,7 @@
 import com.amazonaws.services.s3.model.SetBucketLoggingConfigurationRequest;
 import com.amazonaws.services.s3.model.SetBucketNotificationConfigurationRequest;
 import com.amazonaws.services.s3.model.SetBucketPolicyRequest;
+import com.amazonaws.services.s3.model.SetBucketVersioningConfigurationRequest;
 import com.amazonaws.services.s3.model.TopicConfiguration;
 import com.amazonaws.util.IOUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -175,6 +177,7 @@ public void brokerBucketFromEcsPush(AmazonS3 s3Client, AWSKMS kmsClient, S3Bucke
             taskProperties.getS3().getDefaultEncryption() : bucket.getEncryptionOption());
         configuration.setSnsNotifications(bucket.getSnsNotifications());
         configuration.setLambdaNotifications(bucket.getLambdaNotifications());
+        configuration.setVersioning(bucket.getVersioning());
 
         if (S3EncryptionOption.KMS.equals(configuration.getEncryptionOption()) && kmsKeyId != null) {
             String kmsKeyArn = kmsClient.describeKey(new DescribeKeyRequest().withKeyId(kmsKeyId)).getKeyMetadata().getArn();
@@ -297,6 +300,19 @@ private void brokerBucket(AmazonS3 client, S3InjectConfiguration configuration,
                 configuration.getAppName(),
                 new BucketLoggingConfiguration()));
         }
+
+        if(configuration.getVersioning()) {
+            buildLogger.addLogEntry("S3 Versioning enabled");
+            BucketVersioningConfiguration bucketVersioningConfiguration =
+                    new BucketVersioningConfiguration().withStatus("Enabled");
+
+            SetBucketVersioningConfigurationRequest setBucketVersioningConfigurationRequest =
+                    new SetBucketVersioningConfigurationRequest(bucketName,bucketVersioningConfiguration);
+
+            client.setBucketVersioningConfiguration(setBucketVersioningConfigurationRequest);
+        } else {
+            buildLogger.addLogEntry("S3 Versioning not enabled");
+        }
         updateNotificationConfiguration(configuration, client);
     }
 

src/main/java/com/libertymutualgroup/herman/aws/ecs/broker/s3/S3Bucket.java

@@ -22,6 +22,7 @@ public class S3Bucket {
     private String name;
     private String policyName;
     private S3EncryptionOption encryptionOption;
+    private Boolean versioning = false;
     private List<S3EventConfiguration> snsNotifications;
     private List<S3EventConfiguration> lambdaNotifications;
 
@@ -49,6 +50,10 @@ public void setEncryptionOption(S3EncryptionOption encryptionOption) {
         this.encryptionOption = encryptionOption;
     }
 
+    public Boolean getVersioning() { return versioning; }
+
+    public void setVersioning(Boolean versioning) { this.versioning = versioning; }
+
     public List<S3EventConfiguration> getSnsNotifications() {
         return snsNotifications;
     }
@@ -83,6 +88,11 @@ public S3Bucket withEncryptionOption(
         return this;
     }
 
+    public S3Bucket withVersioning(final Boolean versioning) {
+        this.versioning = versioning;
+        return this;
+    }
+
     public S3Bucket withLambdaNotifications(final List<S3EventConfiguration> lambdaNotifications) {
         this.lambdaNotifications = lambdaNotifications;
         return this;
@@ -99,6 +109,7 @@ public String toString() {
             "name='" + name + '\'' +
             ", policyName='" + policyName + '\'' +
             ", encryptionOption=" + encryptionOption + '\'' +
+            ", versioning=" + versioning + '\'' +
             ", lambdaNotifications=" + lambdaNotifications + '\'' +
             ", snsNotifications=" + snsNotifications +
              '}';

src/main/java/com/libertymutualgroup/herman/aws/ecs/broker/s3/S3InjectConfiguration.java

@@ -36,6 +36,7 @@ public class S3InjectConfiguration implements KmsAppDefinition {
     private String kmsKeyArn;
     private String kmsKeyName;
     private List<HermanTag> tags;
+    private Boolean versioning = false;
 
     // Index and Error files used for website buckets
     private String indexFile = "index.html";
@@ -157,6 +158,10 @@ public void setSnsNotifications(
         this.snsNotifications = snsNotifications;
     }
 
+    public Boolean getVersioning() { return versioning; }
+
+    public void setVersioning(Boolean versioning) { this.versioning = versioning; }
+
     public S3InjectConfiguration withAppName(final String appName) {
         this.appName = appName;
         return this;
@@ -224,6 +229,11 @@ public S3InjectConfiguration withSnsNotifications(final List<S3EventConfiguratio
         return this;
     }
 
+    public S3InjectConfiguration withVersioning(final Boolean versioning) {
+        this.versioning = versioning;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "S3InjectConfiguration{" +
@@ -241,6 +251,7 @@ public String toString() {
             ", tags=" + tags +
             ", indexFile='" + indexFile + '\'' +
             ", errorFile='" + errorFile + '\'' +
+            ", versioning='" + versioning + '\'' +
             '}';
     }
 }