lib/omnibus/config.rb in omnibus-5.5.0 vs lib/omnibus/config.rb in omnibus-5.6.0

@@ -277,28 +277,51 @@
 
     # The S3 access key to use with S3 caching.
     #
     # @return [String]
     default(:s3_access_key) do
-      raise MissingRequiredAttribute.new(self, :s3_access_key, "'ABCD1234'")
+      if s3_profile
+        nil
+      else
+        raise MissingRequiredAttribute.new(self, :s3_access_key, "'ABCD1234'")
+      end
     end
 
     # The S3 secret key to use with S3 caching.
     #
-    # @return [String]
+    # @return [String, nil]
     default(:s3_secret_key) do
-      raise MissingRequiredAttribute.new(self, :s3_secret_key, "'EFGH5678'")
+      if s3_profile
+        nil
+      else
+        raise MissingRequiredAttribute.new(self, :s3_secret_key, "'EFGH5678'")
+      end
     end
 
+    # The AWS credentials profile to use with S3 caching.
+    #
+    # @return [String]
+    default(:s3_profile, nil)
+
     # The region of the S3 bucket you want to cache software artifacts in.
     # Defaults to 'us-east-1'
     #
     # @return [String]
     default(:s3_region) do
       "us-east-1"
     end
 
+    # The HTTP or HTTPS endpoint to send requests to, when using non-standard endpoint
+    #
+    # @return [String, nil]
+    default(:s3_endpoint, nil)
+
+    # Enable or disable S3 Accelerate support
+    #
+    # @return [true, false]
+    default(:s3_accelerate, false)
+
     # --------------------------------------------------
     # @!endgroup
     #
 
     #
@@ -388,18 +411,26 @@
 
     # The S3 access key to use for S3 artifact release.
     #
     # @return [String]
     default(:publish_s3_access_key) do
-      raise MissingRequiredAttribute.new(self, :publish_s3_access_key, "'ABCD1234'")
+      if s3_profile
+        nil
+      else
+        raise MissingRequiredAttribute.new(self, :publish_s3_access_key, "'ABCD1234'")
+      end
     end
 
     # The S3 secret key to use for S3 artifact release
     #
     # @return [String]
     default(:publish_s3_secret_key) do
-      raise MissingRequiredAttribute.new(self, :publish_s3_secret_key, "'EFGH5678'")
+      if s3_profile
+        nil
+      else
+        raise MissingRequiredAttribute.new(self, :publish_s3_secret_key, "'EFGH5678'")
+      end
     end
 
     # --------------------------------------------------
     # @!endgroup
     #
@@ -468,9 +499,15 @@
           "manually set windows_arch in your omnibus.rb file to :x86."
         end
       end
       :x86
     end
+
+    # Flag specifying whether the project should be built with FIPS
+    # compatability or not.
+    #
+    # @return [true, false]
+    default(:fips_mode, false)
 
     # --------------------------------------------------
     # @!endgroup
     #