fog-aws 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf9e61d32774df1fdd1785f95486b29df3d65a9a
-  data.tar.gz: 47262cd3dcf0219cad7bed796fe50eb73ec79512
+  metadata.gz: d5bfdd4651881d56cd47ad871e5b8b7a993418cd
+  data.tar.gz: 5bd28c47be8f7e7aabf993c499b09bdd79b25cbe
 SHA512:
-  metadata.gz: 67554241896742b1773e330c13faca2378dc98c73d30973595728d53a17ed15733b4c85d15008ccd907973782eb1f01494c70443248ff6488ebdb89dc5711fe6
-  data.tar.gz: e6d5bc4029b927ac549bbc5fb26474ea059c667653f1293673f9e4702cef4e35a7f67ddc1aaf5d5594d2543817142cc6bab9f3e938478c17db1ba598ee698ee6
+  metadata.gz: 83234e86990287d8151a86c98cc1d3e72d697397278b73ca48b991fb7d827eb360576012f72031dd0c4b2401027370a5ebcccac4abc29cd81df16f43ee702d86
+  data.tar.gz: be95bfbfe84599f9f53de207fa68bc3ce920c6f53ba27b9846abae103c4b4837b91de8537af5f4b87b2577bef910a0117331fae73fb90c4509219a5d94a49a30

data/lib/fog/aws/auto_scaling.rb

@@ -11,6 +11,7 @@ module Fog
       recognizes :host, :path, :port, :scheme, :persistent, :region, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
 
       request_path 'fog/aws/requests/auto_scaling'
+      request :attach_load_balancers
       request :create_auto_scaling_group
       request :create_launch_configuration
       request :create_or_update_tags
@@ -33,6 +34,7 @@ module Fog
       request :describe_scheduled_actions
       request :describe_tags
       request :describe_termination_policy_types
+      request :detach_load_balancers
       request :disable_metrics_collection
       request :enable_metrics_collection
       request :execute_policy

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

@@ -44,11 +44,23 @@ module Fog
           activities = Fog::AWS::AutoScaling::Activities.new(:service => service, :filters => {'AutoScalingGroupName' => id})
         end
 
+        def attach_load_balancers(*load_balancer_names)
+          requires :id
+          service.attach_load_balancers(id, 'LoadBalancerNames' => load_balancer_names)
+          reload
+        end
+
         def configuration
           requires :launch_configuration_name
           service.configurations.get(launch_configuration_name)
         end
 
+        def detach_load_balancers(*load_balancer_names)
+          requires :id
+          service.detach_load_balancers(id, 'LoadBalancerNames' => load_balancer_names)
+          reload
+        end
+
         def disable_metrics_collection(metrics = {})
           requires :id
           service.disable_metrics_collection(id, 'Metrics' => metrics)

data/lib/fog/aws/models/dns/zones.rb

@@ -10,8 +10,8 @@ module Fog
         model Fog::DNS::AWS::Zone
 
         def all(options = {})
-          options[:marker]   ||= marker
-          options[:maxitems] ||= max_items
+          options[:marker]   ||= marker unless marker.nil?
+          options[:maxitems] ||= max_items unless max_items.nil?
           data = service.list_hosted_zones(options).body['HostedZones']
           load(data)
         end

data/lib/fog/aws/parsers/dns/get_hosted_zone.rb

@@ -8,6 +8,8 @@ module Fog
             @name_servers = []
             @response = {}
             @section = :hosted_zone
+            @vpcs = []
+            @vpc = {}
           end
 
           def end_element(name)
@@ -15,7 +17,7 @@ module Fog
               case name
               when 'Id'
                 @hosted_zone[name]= value.sub('/hostedzone/', '')
-              when 'Name', 'CallerReference', 'Comment'
+              when 'Name', 'CallerReference', 'Comment', 'PrivateZone', 'Config', 'ResourceRecordSetCount'
                 @hosted_zone[name]= value
               when 'HostedZone'
                 @response['HostedZone'] = @hosted_zone
@@ -31,6 +33,15 @@ module Fog
               when 'NameServers'
                 @response['NameServers'] = @name_servers
                 @name_servers = {}
+              when 'VPCId', 'VPCRegion'
+                @vpc[name] = value
+              when 'VPC'
+                @vpcs << @vpc
+                @vpc = {}
+              when 'VPCs'
+                @response['HostedZone']['VPCs'] = @vpcs
+                @vpcs = {}
+                @section = :vpcs
               end
             end
           end

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

@@ -0,0 +1,58 @@
+module Fog
+  module AWS
+    class AutoScaling
+      class Real
+        require 'fog/aws/parsers/auto_scaling/basic'
+
+        # Attaches one or more load balancers to the specified Auto Scaling
+        # group.
+        #
+        # ==== Parameters
+        # * auto_scaling_group_name<~String> - The name of the Auto Scaling
+        # group.
+        # * options<~Hash>:
+        # 'LoadBalancerNames'<~Array> - A list of LoadBalancers to use.
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AutoScaling/latest/APIReference/API_AttachLoadBalancers.html
+        #
+
+        ExpectedOptions[:attach_load_balancers] = %w[LoadBalancerNames]
+
+        def attach_load_balancers(auto_scaling_group_name, options = {})
+          if load_balancer_names = options.delete('LoadBalancerNames')
+            options.merge!(AWS.indexed_param('LoadBalancerNames.member.%d', [*load_balancer_names]))
+          end
+
+          request({
+            'Action'               => 'AttachLoadBalancers',
+            'AutoScalingGroupName' => auto_scaling_group_name,
+            :parser                => Fog::Parsers::AWS::AutoScaling::Basic.new
+          }.merge!(options))
+        end
+
+      end
+
+      class Mock
+        def attach_load_balancers(auto_scaling_group_name, options = {})
+          unexpected_options = options.keys - ExpectedOptions[:attach_load_balancers]
+
+          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_load_balancers.rb

@@ -0,0 +1,62 @@
+module Fog
+  module AWS
+    class AutoScaling
+      class Real
+        require 'fog/aws/parsers/auto_scaling/basic'
+
+        # Removes one or more load balancers from the specified Auto Scaling
+        # group.
+        #
+        # When you detach a load balancer, it enters the Removing state while
+        # deregistering the instances in the group. When all instances are
+        # deregistered, then you can no longer describe the load balancer using
+        # DescribeLoadBalancers. Note that the instances remain running.
+        #
+        # ==== Parameters
+        # * auto_scaling_group_name<~String> - The name of the Auto Scaling
+        # group.
+        # * options<~Hash>:
+        # 'LoadBalancerNames'<~Array> - A list of LoadBalancers to use.
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AutoScaling/latest/APIReference/API_DetachLoadBalancers.html
+        #
+
+        ExpectedOptions[:detach_load_balancers] = %w[LoadBalancerNames]
+
+        def detach_load_balancers(auto_scaling_group_name, options = {})
+          if load_balancer_names = options.delete('LoadBalancerNames')
+            options.merge!(AWS.indexed_param('LoadBalancerNames.member.%d', [*load_balancer_names]))
+          end
+
+          request({
+            'Action'               => 'DetachLoadBalancers',
+            'AutoScalingGroupName' => auto_scaling_group_name,
+            :parser                => Fog::Parsers::AWS::AutoScaling::Basic.new
+          }.merge!(options))
+        end
+      end
+
+      class Mock
+        def detach_load_balancers(auto_scaling_group_name, options = {})
+          unexpected_options = options.keys - ExpectedOptions[:detach_load_balancers]
+
+          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/dns/create_hosted_zone.rb

@@ -12,6 +12,8 @@ module Fog
         #   * caller_ref<~String> - unique string that identifies the request & allows failed
         #                           calls to be retried without the risk of executing the operation twice
         #   * comment<~String> -
+        #   * vpc_id<~String> - specify both a VPC's ID and its region to create a private zone for that VPC
+        #   * vpc_region<~String> - specify both a VPC's ID and its region to create a private zone for that VPC
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -40,6 +42,9 @@ module Fog
           if options[:comment]
             optional_tags += "<HostedZoneConfig><Comment>#{options[:comment]}</Comment></HostedZoneConfig>"
           end
+          if options[:vpc_id] and options[:vpc_region]
+            optional_tags += "<VPC><VPCId>#{options[:vpc_id]}</VPCId><VPCRegion>#{options[:vpc_region]}</VPCRegion></VPC>"
+          end
 
           request({
             :body    => %Q{<?xml version="1.0" encoding="UTF-8"?><CreateHostedZoneRequest xmlns="https://route53.amazonaws.com/doc/#{@version}/"><Name>#{name}</Name>#{optional_tags}</CreateHostedZoneRequest>},

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "0.7.3"
+    VERSION = "0.7.4"
   end
 end

data/tests/requests/auto_scaling/auto_scaling_tests.rb

@@ -27,6 +27,14 @@ Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d
       Fog::AWS[:auto_scaling].create_auto_scaling_group(@asg_name, zones, @lc_name, max_size, min_size).body
     end
 
+    tests("#attach_load_balancers").formats(AWS::AutoScaling::Formats::BASIC) do
+      Fog::AWS[:auto_scaling].attach_load_balancers(@asg_name, 'LoadBalancerNames' => 'elb-test-fog').body
+    end
+
+    tests("#detach_load_balancers").formats(AWS::AutoScaling::Formats::BASIC) do
+      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
       Fog::AWS[:auto_scaling].describe_auto_scaling_groups().body
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -694,6 +694,7 @@ files:
 - lib/fog/aws/rds.rb
 - lib/fog/aws/redshift.rb
 - lib/fog/aws/region_methods.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
 - lib/fog/aws/requests/auto_scaling/create_or_update_tags.rb
@@ -716,6 +717,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_load_balancers.rb
 - lib/fog/aws/requests/auto_scaling/disable_metrics_collection.rb
 - lib/fog/aws/requests/auto_scaling/enable_metrics_collection.rb
 - lib/fog/aws/requests/auto_scaling/execute_policy.rb