aws-record 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c259c949c94ace6740e388e2e37fa10d08d13c8b2b79cfd7d10652bc00fa6e34
-  data.tar.gz: 52bcb1b830d09018a77db7e6d19fdabe78d7cc5a324245de6de39fa66ae8231e
+  metadata.gz: 309ae7c37a70b41c9bb7695bd0c79a5faa83195c764986f28d43becc61f82f09
+  data.tar.gz: d13944acd83e60191102e72078cd399190dfc0632a670a791134c33382578260
 SHA512:
-  metadata.gz: b71b3595ada2889fd0120c705d6b901b343b2e72bbb834223e291b7bd624d7b800f831612ccf1df4e4b29fdf478f091c05617375a1e944b0d0a8248ac85df08b
-  data.tar.gz: c30b07acabd6604a55468f3ea1dfea5ff1fdaee3aa199d15c594f3864d54ffc7ba3339e86606c881a2c19843fad780f72638f768ebcda0e8ba991e5e77f9e134
+  metadata.gz: c4ad5ee650e8d785eee3fac8b5f33f5e2db82ea3fd903bbde374e5d85920ec92c85c724fe55ed913befcb5ad5b1c27e9d38ebc3c41a7ae4c3eefe9cba45ea690
+  data.tar.gz: 8f014faf8d060af4db13acde3cdbc67e8a34a534c612c8a7b739911d1ea568743fb899ff88b11474e46417af7ad25761dd3a7cabda850c96c79297ef4b79981c

data/lib/aws-record/record/table_migration.rb

@@ -56,15 +56,24 @@ module Aws
       # @param [Hash] opts options to pass on to the client call to
       #  +#create_table+. See the documentation above in the AWS SDK for Ruby
       #  V2.
-      # @option opts [Hash] :provisioned_throughput This is a required argument,
-      #  in which you must specify the +:read_capacity_units+ and
+      # @option opts [Hash] :billing_mode Accepts values 'PAY_PER_REQUEST' or
+      #  'PROVISIONED'. If :provisioned_throughput option is specified, this
+      #  option is not required, as 'PROVISIONED' is assumed. If
+      #  :provisioned_throughput is not specified, this option is required
+      #  and must be set to 'PAY_PER_REQUEST'.
+      # @option opts [Hash] :provisioned_throughput Unless :billing_mode is
+      #  set to 'PAY_PER_REQUEST', this is a required argument, in which
+      #  you must specify the +:read_capacity_units+ and
       #  +:write_capacity_units+ of your new table.
       # @option opts [Hash] :global_secondary_index_throughput This argument is
-      #  required if you define any global secondary indexes. It should map your
+      #  required if you define any global secondary indexes, unless
+      #  :billing_mode is set to 'PAY_PER_REQUEST'. It should map your
       #  global secondary index names to their provisioned throughput, similar
       #  to how you define the provisioned throughput for the table in general.
       def create!(opts)
         gsit = opts.delete(:global_secondary_index_throughput)
+        _validate_billing(opts)
+
         create_opts = opts.merge({
           table_name: @model.table_name,
           attribute_definitions: _attribute_definitions,
@@ -75,14 +84,19 @@ module Aws
           _append_to_attribute_definitions(lsis, create_opts)
         end
         if gsis = @model.global_secondary_indexes_for_migration
-          unless gsit
+          unless gsit || opts[:billing_mode] == 'PAY_PER_REQUEST'
             raise ArgumentError.new(
-              "If you define global secondary indexes, you must also define"\
-                " :global_secondary_index_throughput on table creation."
+              'If you define global secondary indexes, you must also define'\
+                ' :global_secondary_index_throughput on table creation,'\
+                " unless :billing_mode is set to 'PAY_PER_REQUEST'."
             )
           end
-          gsis_with_throughput = _add_throughout_to_gsis(gsis, gsit)
-          create_opts[:global_secondary_indexes] = gsis_with_throughput
+          gsis_opts = if opts[:billing_mode] == 'PAY_PER_REQUEST'
+                        gsis
+                      else
+                        _add_throughput_to_gsis(gsis, gsit)
+                      end
+          create_opts[:global_secondary_indexes] = gsis_opts
           _append_to_attribute_definitions(gsis, create_opts)
         end
         @client.create_table(create_opts)
@@ -142,6 +156,33 @@ module Aws
         end
       end
 
+      def _validate_billing(opts)
+        valid_modes = %w[PAY_PER_REQUEST PROVISIONED]
+        if opts.key?(:billing_mode)
+          unless valid_modes.include?(opts[:billing_mode])
+            raise ArgumentError.new(
+              ":billing_mode option must be one of #{valid_modes.join(', ')}"\
+                " current value is: #{opts[:billing_mode]}"
+            )
+          end
+        end
+        if opts.key?(:provisioned_throughput)
+          if opts[:billing_mode] == 'PAY_PER_REQUEST'
+            raise ArgumentError.new(
+              'when :provisioned_throughput option is specified, :billing_mode'\
+                " must either be unspecified or have a value of 'PROVISIONED'"
+            )
+          end
+        else
+          if opts[:billing_mode] != 'PAY_PER_REQUEST'
+            raise ArgumentError.new(
+              'when :provisioned_throughput option is not specified,'\
+                " :billing_mode must be set to 'PAY_PER_REQUEST'"
+            )
+          end
+        end
+      end
+
       def _attribute_definitions
         _keys.map do |type, attr|
           {
@@ -173,7 +214,7 @@ module Aws
         create_opts[:attribute_definitions] = attr_def
       end
 
-      def _add_throughout_to_gsis(global_secondary_indexes, gsi_throughput)
+      def _add_throughput_to_gsis(global_secondary_indexes, gsi_throughput)
         missing_throughput = []
         ret = global_secondary_indexes.map do |params|
           name = params[:index_name]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-record
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-dynamodb
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: AWS Record library for Amazon DynamoDB