aws-sdk-resources 2.1.36 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0202a7a060f88f8495dee3858023812366c4dd15
-  data.tar.gz: 400a1bb204530aaacd07e6a4680cadf30de52f2a
+  metadata.gz: 3d315374401e1f267e514406a412303fdb76c538
+  data.tar.gz: b1f51b8fd3529973df0b457a7edf55b0d38a22c6
 SHA512:
-  metadata.gz: e2c124d79e8ecedc0a948cdc813f9620c35f460d0b41db334fc0be8989f082eb31c7d895b52a43e752c4c82e1ad721ceddc75d6fe82d183ae1ca5acf596f4908
-  data.tar.gz: 5ef9405ec02223c0c74744a39f8088cb4ed3dfa660cd4ddc8aed607d725b7a7aacbd2060cb70295e6bac11f7680db466673f720a77e7dd864cfe4bbb17083dc1
+  metadata.gz: 7f9255eeb9734022304514aa6165b39c61a90cde7c63a24b06beb0bb0d63f2621fe9c98246f011695e575566a3aafbc7e1dcd93e3ffd45b0ce54ef8c164dc6ba
+  data.tar.gz: 46fd4b7838da1c9fcd745e3f5df791eabcd731ec5dfa764a886cabee61d80ac13cab981cebd09ad38eb9449613869367cf4af0b95da6e561b925d9b8b633ad49

data/lib/aws-sdk-resources.rb

@@ -41,4 +41,51 @@ module Aws
     require(svc) if File.exist?(svc)
   end
 
+  # In version 2.2, all batch resource operations were renamed:
+  #
+  # * All operations are now prefixed with `batch_`, e.g. `#start`
+  #   became `#batch_start`.
+  #
+  # * All batch operations with "delete" or "terminate" in the name
+  #   are now suffixed with `!`, e.g. `#delete` is now `#batch_delete!`
+  #
+  # For backwards compatibility, existing batch methods must still respond
+  # to their old names. This callback registers these methods with their
+  # old names.
+  service_added do |name, svc_module, options|
+    unless ENV['DOCSTRINGS']
+      case name
+      when 'EC2'
+        {
+          'create_tags' => 'batch_create_tags',
+          'monitor' => 'batch_create_tags',
+          'reboot' => 'batch_reboot',
+          'start' => 'batch_start',
+          'stop' => 'batch_stop',
+          'terminate' => 'batch_terminate!',
+          'unmonitor' => 'batch_unmonitor',
+        }.each do |deprecated_name, name|
+          Resources::Operations::DeprecatedOperation.define({
+            resource_class: EC2::Instance,
+            deprecated_name: deprecated_name,
+            name: name,
+          })
+        end
+        Resources::Operations::DeprecatedOperation.define({
+          resource_class: EC2::Tag,
+          deprecated_name: 'delete',
+          name: 'batch_delete!',
+        })
+      when 'S3'
+        [S3::Object, S3::ObjectSummary, S3::ObjectVersion].each do |klass|
+          Resources::Operations::DeprecatedOperation.define({
+            resource_class: klass,
+            deprecated_name: 'delete',
+            name: 'batch_delete!',
+          })
+        end
+      end
+    end
+  end
+
 end

data/lib/aws-sdk-resources/batch.rb

@@ -117,10 +117,27 @@ module Aws
       private
 
       def invoke_batch_operation(method_name, args, block)
+        self.class.validate_batch_args!(args)
         operation = @resource_class.batch_operation(method_name)
         operation.call(resource:self, args:args, block:block)
       end
 
+      class << self
+
+        # @api private
+        def validate_batch_args!(args)
+          case args.count
+          when 0
+          when 1
+            unless Hash === args.first
+              raise ArgumentError, "expected options to be a hash"
+            end
+          else
+            raise ArgumentError, "wrong number of arguments, expected 0 or 1"
+          end
+        end
+
+      end
     end
   end
 end

data/lib/aws-sdk-resources/collection.rb

@@ -72,6 +72,7 @@ module Aws
       # @api private
       def method_missing(method_name, *args, &block)
         if respond_to?(method_name)
+          Batch.validate_batch_args!(args)
           batches.each do |batch|
             batch.send(method_name, *args, &block)
           end

data/lib/aws-sdk-resources/definition.rb

@@ -51,12 +51,26 @@ module Aws
 
       def define_batch_actions(namespace, resource, batch_actions)
         batch_actions.each do |name, definition|
-          method_name = underscore(name)
+          method_name = "batch_" + underscore(name)
+          method_name += '!' if dangerous?(name, definition)
           operation = build_operation(namespace, resource, definition)
           resource.add_batch_operation(method_name, operation)
         end
       end
 
+      def dangerous?(name, definition)
+        if
+          name.match(/delete/i) ||
+          name.match(/terminate/i) ||
+          definition['request']['operation'].match(/delete/i) ||
+          definition['request']['operation'].match(/terminate/i)
+        then
+          true
+        else
+          false
+        end
+      end
+
       def define_data_attributes(namespace, resource, definition)
         if shape_name = definition['shape']
           shape = resource.client_class.api.metadata['shapes'][shape_name]

data/lib/aws-sdk-resources/operations.rb

@@ -231,6 +231,43 @@ module Aws
 
       end
 
+      # @api private
+      class DeprecatedOperation
+
+        def initialize(options = {})
+          @name = options[:name]
+          @deprecated_name = options[:deprecated_name]
+          @resource_class = options[:resource_class]
+          @operation = @resource_class.batch_operation(@name)
+          @warned = false
+        end
+
+        def call(*args)
+          unless @warned
+            @warned = true
+            warn(deprecation_warning)
+          end
+          @operation.call(*args)
+        end
+
+        private
+
+        def deprecation_warning
+          "DEPRECATION WARNING: called deprecated batch method " +
+          "`##{@deprecated_name}` on a batch of `#{@resource_class.name}` " +
+          "objects; use `##{@name}` instead"
+        end
+
+        class << self
+
+          def define(options = {})
+            klass = options[:resource_class]
+            deprecated_name = options[:deprecated_name]
+            klass.add_batch_operation(deprecated_name, new(options))
+          end
+
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-resources
 version: !ruby/object:Gem::Version
-  version: 2.1.36
+  version: 2.2.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.36
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.36
+        version: 2.2.0
 description: Provides resource oriented interfaces and other higher-level abstractions
   for many AWS services. This gem is part of the official AWS SDK for Ruby.
 email: