fog-aws 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e77bea854342136841867ba57ed6e1675c276946
-  data.tar.gz: 2df27806c77f8443b44cf76358575e98d34b3320
+  metadata.gz: 8a3fe2205326df34b806ce5c7d47829ce70f0d5b
+  data.tar.gz: 40bdef0a30eb0a7aeda1f17eea835246582b1e79
 SHA512:
-  metadata.gz: 57c26f03d63dfef478f8df9360d6e3e4111c73e4e2ebc0c4a9936e2a19c08719c6bf509c472434b9668a9abe85ce2a17b665bcec136541a2f896ec508e1327cd
-  data.tar.gz: 1968a9af031b2e8ffa1ea65678d9f12bad0032f72b4fa76f4580381e1e0a86c2e6e72f870c8c7e44178b1b7404b2a981628a96c299e1cdf2fb2a9e1e2eec6825
+  metadata.gz: 2ae069b0e407eec780b4f21bddd5a33c47f63008ad4a768faf126668d445006d15508b98a257da98bc992bf07d644bd028b0a1d71a406eb0219349023ed3c908
+  data.tar.gz: ab88e76d662b5f7a4e5cc20fad2482bf8e374623e038b79c3df01a6156c0086c40e84760c7b3a8eba1f8211484949672659d68c122c8a9cc50a29a0a1cbad545

data/lib/fog/aws/auto_scaling.rb

@@ -35,6 +35,8 @@ module Fog
       request :describe_tags
       request :describe_termination_policy_types
       request :detach_load_balancers
+      request :detach_instances
+      request :attach_instances
       request :disable_metrics_collection
       request :enable_metrics_collection
       request :execute_policy

data/lib/fog/aws/models/auto_scaling/group.rb

@@ -61,6 +61,18 @@ module Fog
           reload
         end
 
+        def detach_instances(*instance_ids)
+          requires :id
+          service.detach_instances(id, 'InstanceIds' => instance_ids)
+          reload
+        end
+
+        def attach_instances(*instance_ids)
+          requires :id
+          service.attach_instances(id, 'InstanceIds' => instance_ids)
+          reload
+        end
+
         def disable_metrics_collection(metrics = {})
           requires :id
           service.disable_metrics_collection(id, 'Metrics' => metrics)

data/lib/fog/aws/requests/auto_scaling/attach_instances.rb

@@ -0,0 +1,60 @@
+module Fog
+  module AWS
+    class AutoScaling
+      class Real
+        require 'fog/aws/parsers/auto_scaling/basic'
+
+        # Removes one or more instances from the specified Auto Scaling group.
+        #
+        #  cli equiv:
+        # `aws autoscaling attach-instances --instance-ids i-93633f9b --auto-scaling-group-name my-auto-scaling-group`
+        #
+        # ==== Parameters
+        #
+        #   * AutoScalingGroupName<~String> - The name of the Auto Scaling group``
+        #   * 'InstanceIds'<~Array> - The list of Auto Scaling instances to detach.
+        #
+        # ==== See Also
+        #
+        # http://docs.aws.amazon.com/AutoScaling/latest/APIReference/API_AttachInstances.html
+
+        ExpectedOptions[:asg_name] = %w[AutoScalingGroupName]
+        ExpectedOptions[:instance_ids] = %w[InstanceIds]
+
+        def attach_instances(auto_scaling_group_name, options = {})
+
+          if instance_ids = options.delete('InstanceIds')
+            options.merge!(AWS.indexed_param('InstanceIds.member.%d', [*instance_ids]))
+          end
+
+          request({
+            'Action'               => 'AttachInstances',
+            'AutoScalingGroupName' => auto_scaling_group_name,
+            :parser                => Fog::Parsers::AWS::AutoScaling::Basic.new
+          }.merge!(options))
+        end
+      end
+
+      class Mock
+        def attach_instances(auto_scaling_group_name, options = {})
+          unexpected_options = options.keys - ExpectedOptions[:asg_name] - ExpectedOptions[:instance_ids]
+
+          unless unexpected_options.empty?
+            raise Fog::AWS::AutoScaling::ValidationError.new("Options #{unexpected_options.join(',')} should not be included in request")
+          end
+
+          unless self.data[:auto_scaling_groups].key?(auto_scaling_group_name)
+            raise Fog::AWS::AutoScaling::ValidationError.new('AutoScalingGroup name not found - null')
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/auto_scaling/detach_instances.rb

@@ -0,0 +1,69 @@
+module Fog
+  module AWS
+    class AutoScaling
+      class Real
+        require 'fog/aws/parsers/auto_scaling/basic'
+
+        # Removes one or more instances from the specified Auto Scaling group.
+        #
+        #  cli equiv:
+        # `aws autoscaling detach-instances --instance-ids i-2a2d8978 --auto-scaling-group-name my-asg --should-decrement-desired-capacity`
+        #
+        # ==== Parameters
+        #
+        #   * AutoScalingGroupName<~String> - The name of the Auto Scaling group``
+        #   * 'InstanceIds'<~Array> - The list of Auto Scaling instances to detach.
+        #
+        # * options<~Hash>:
+        # 'shouldDecrementDesiredCapacity'<~Boolean> - decrement the asg capacity or not (it will boot another if an instance id detached)
+        #
+        # ==== See Also
+        #
+        # http://docs.aws.amazon.com/AutoScaling/latest/APIReference/API_DetachInstances.html
+
+        ExpectedOptions[:asg_name] = %w[AutoScalingGroupName]
+        ExpectedOptions[:instance_ids] = %w[InstanceIds]
+
+        def detach_instances(auto_scaling_group_name, options = {})
+
+          if should_decrement_desired_capacity = options.delete('ShouldDecrementDesiredCapacity')
+            options.merge!('ShouldDecrementDesiredCapacity' => true.to_s)
+          else
+            options.merge!('ShouldDecrementDesiredCapacity' => false.to_s)
+          end
+
+          if instance_ids = options.delete('InstanceIds')
+            options.merge!(AWS.indexed_param('InstanceIds.member.%d', [*instance_ids]))
+          end
+
+          request({
+            'Action'               => 'DetachInstances',
+            'AutoScalingGroupName' => auto_scaling_group_name,
+            :parser                => Fog::Parsers::AWS::AutoScaling::Basic.new
+          }.merge!(options))
+        end
+      end
+
+      class Mock
+        def detach_instances(auto_scaling_group_name, options = {})
+          unexpected_options = options.keys - ExpectedOptions[:asg_name] - ExpectedOptions[:instance_ids]
+
+          unless unexpected_options.empty?
+            raise Fog::AWS::AutoScaling::ValidationError.new("Options #{unexpected_options.join(',')} should not be included in request")
+          end
+
+          unless self.data[:auto_scaling_groups].key?(auto_scaling_group_name)
+            raise Fog::AWS::AutoScaling::ValidationError.new('AutoScalingGroup name not found - null')
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "0.9.0"
+    VERSION = "0.9.1"
   end
 end

data/tests/requests/auto_scaling/auto_scaling_tests.rb

@@ -35,7 +35,15 @@ Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d
       Fog::AWS[:auto_scaling].detach_load_balancers(@asg_name, 'LoadBalancerNames' => 'elb-test-fog').body
     end
 
-    tests("#describe_auto_scaling_groups").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do
+    tests("#detach_instances").formats(AWS::AutoScaling::Formats::BASIC) do
+      Fog::AWS[:auto_scaling].detach_instances(@asg_name, 'InstanceIds' => 'i-deadbeef').body
+    end
+
+    tests("#attach_instances").formats(AWS::AutoScaling::Formats::BASIC) do
+      Fog::AWS[:auto_scaling].attach_instances(@asg_name, 'InstanceIds' => 'i-deadbeef').body
+    end
+
+   tests("#describe_auto_scaling_groups").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do
       Fog::AWS[:auto_scaling].describe_auto_scaling_groups().body
     end
     tests("#describe_auto_scaling_groups").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -707,6 +707,7 @@ files:
 - lib/fog/aws/parsers/sts/get_session_token.rb
 - lib/fog/aws/rds.rb
 - lib/fog/aws/redshift.rb
+- lib/fog/aws/requests/auto_scaling/attach_instances.rb
 - lib/fog/aws/requests/auto_scaling/attach_load_balancers.rb
 - lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb
 - lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb
@@ -730,6 +731,7 @@ files:
 - lib/fog/aws/requests/auto_scaling/describe_scheduled_actions.rb
 - lib/fog/aws/requests/auto_scaling/describe_tags.rb
 - lib/fog/aws/requests/auto_scaling/describe_termination_policy_types.rb
+- lib/fog/aws/requests/auto_scaling/detach_instances.rb
 - lib/fog/aws/requests/auto_scaling/detach_load_balancers.rb
 - lib/fog/aws/requests/auto_scaling/disable_metrics_collection.rb
 - lib/fog/aws/requests/auto_scaling/enable_metrics_collection.rb