fog-maestrodev 1.8.0.20130114204828 → 1.14.0.20130806165225

data/lib/fog/aws/iam.rb

@@ -78,6 +78,8 @@ module Fog
       collection  :policies
       model       :access_key
       collection  :access_keys
+      model       :role
+      collection  :roles
 
 
       class Mock
@@ -92,6 +94,7 @@ module Fog
                   :path        => '/',
                   :arn         => "arn:aws:iam::#{Fog::AWS::Mock.owner_id}:user/#{ukey}",
                   :access_keys => [],
+                  :created_at  => Time.now,
                   :policies    => {}
                 }
               end,
@@ -205,19 +208,16 @@ module Fog
             :parser     => parser
           })
         rescue Excon::Errors::HTTPStatusError => error
-          if match = error.message.match(/<Code>(.*)<\/Code>(?:.*<Message>(.*)<\/Message>)?/m)
-            case match[1]
-            when 'CertificateNotFound', 'NoSuchEntity'
-              raise Fog::AWS::IAM::NotFound.slurp(error, match[2])
-            when 'EntityAlreadyExists', 'KeyPairMismatch', 'LimitExceeded', 'MalformedCertificate', 'ValidationError'
-              raise Fog::AWS::IAM.const_get(match[1]).slurp(error, match[2])
-            else
-              raise Fog::AWS::IAM::Error.slurp(error, "#{match[1]} => #{match[2]}") if match[1]
-              raise
-            end
-          else
-            raise
-          end
+          match = Fog::AWS::Errors.match_error(error)
+          raise if match.empty?
+          raise case match[:code]
+                when 'CertificateNotFound', 'NoSuchEntity'
+                  Fog::AWS::IAM::NotFound.slurp(error, match[:message])
+                when 'EntityAlreadyExists', 'KeyPairMismatch', 'LimitExceeded', 'MalformedCertificate', 'ValidationError'
+                  Fog::AWS::IAM.const_get(match[:code]).slurp(error, match[:message])
+                else
+                  Fog::AWS::IAM::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
+                end
         end
 
       end

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

@@ -4,14 +4,22 @@ module Fog
   module AWS
     class AutoScaling
       class Activities < Fog::Collection
-
         model Fog::AWS::AutoScaling::Activity
 
-        def all
+        attribute :filters
+
+        # Creates a new scaling policy.
+        def initialize(attributes={})
+          self.filters = attributes
+          super(attributes)
+        end
+
+        def all(filters = filters)
           data = []
           next_token = nil
+          self.filters = filters
           loop do
-            result = service.describe_scaling_activities('NextToken' => next_token).body['DescribeScalingActivitiesResult']
+            result = service.describe_scaling_activities(filters.merge('NextToken' => next_token)).body['DescribeScalingActivitiesResult']
             data += result['Activities']
             next_token = result['NextToken']
             break if next_token.nil?

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

@@ -111,8 +111,7 @@ module Fog
           requires :launch_configuration_name
           requires :max_size
           requires :min_size
-
-          service.create_auto_scaling_group(id, availability_zones, launch_configuration_name, max_size, min_size, options)
+          service.create_auto_scaling_group(id, availability_zones, launch_configuration_name, max_size, min_size, filtered_options(:create_auto_scaling_group))
           reload
         end
 
@@ -132,10 +131,14 @@ module Fog
 
         def update
           requires :id
-          service.update_auto_scaling_group(id, options)
+          service.update_auto_scaling_group(id, filtered_options(:update_auto_scaling_group) )
           reload
         end
 
+        def filtered_options(method)
+          Hash[options.select{|k,_| ExpectedOptions[method].include?(k)}]
+        end
+
         def options
           ret = Hash[self.class.aliases.map { |key, value| [key, send(value)] }]
           ret.delete_if { |key, value| value.nil? }

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

@@ -6,16 +6,20 @@ module Fog
       class Policies < Fog::Collection
         model Fog::AWS::AutoScaling::Policy
 
+        attribute :filters
+
         # Creates a new scaling policy.
         def initialize(attributes={})
-          super
+          self.filters = attributes
+          super(attributes)
         end
 
-        def all
+        def all(filters = filters)
           data = []
           next_token = nil
+          self.filters = filters
           loop do
-            result = service.describe_policies('NextToken' => next_token).body['DescribePoliciesResult']
+            result = service.describe_policies(filters.merge('NextToken' => next_token)).body['DescribePoliciesResult']
             data += result['ScalingPolicies']
             next_token = result['NextToken']
             break if next_token.nil?

data/lib/fog/aws/models/beanstalk/environment.rb

@@ -47,8 +47,12 @@ module Fog
 
         # Returns the load balancer object associated with the environment.
         def load_balancer(elb_connection = Fog::AWS[:elb])
-          requires :resources
-          elb_connection.load_balancers.get(resources['LoadBalancer']['LoadBalancerName'])
+
+          if resources.nil?
+            elb_connection.load_balancers.get(live_resources['LoadBalancers'].first['Name'])
+          else
+            elb_connection.load_balancers.get(resources['LoadBalancer']['LoadBalancerName'])
+          end
         end
 
         # Return events related to this version

data/lib/fog/aws/models/cdn/distributions.rb

@@ -23,7 +23,8 @@ module Fog
           service.get_distribution_list(options)
         end
 
-        alias :each_distribution_this_page :each
+        alias_method :each_distribution_this_page, :each
+        alias_method :each, :each_distribution
 
       end
 

data/lib/fog/aws/models/cdn/distributions_helper.rb

@@ -5,6 +5,7 @@ module Fog
     class AWS
 
       module DistributionsHelper
+        
         def all(options = {})
           merge_attributes(options)
           data = list_distributions(options).body
@@ -24,7 +25,7 @@ module Fog
           nil
         end
 
-        def each
+        def each_distribution
           if !block_given?
             self
           else

data/lib/fog/aws/models/cdn/streaming_distributions.rb

@@ -23,7 +23,8 @@ module Fog
           service.get_streaming_distribution_list(options)
         end
 
-        alias :each_distribution_this_page :each
+        alias_method :each_distribution_this_page, :each
+        alias_method :each, :each_distribution
 
       end
 

data/lib/fog/aws/models/compute/flavors.rb

@@ -9,7 +9,7 @@ module Fog
         { :bits => 0,  :cores =>   2,  :disk => 0,    :id =>  't1.micro',   :name => 'Micro Instance',       :ram => 613},
 
         { :bits => 32, :cores =>   1,  :disk => 160,  :id =>  'm1.small',   :name => 'Small Instance',       :ram => 1740.8},
-	{ :bits => 32, :cores =>   2,  :disk => 400,  :id =>  'm1.medium',  :name => 'Medium Instance',      :ram => 3750},
+        { :bits => 32, :cores =>   2,  :disk => 400,  :id =>  'm1.medium',  :name => 'Medium Instance',      :ram => 3750},
         { :bits => 64, :cores =>   4,  :disk => 850,  :id =>  'm1.large',   :name => 'Large Instance',       :ram => 7680},
         { :bits => 64, :cores =>   8,  :disk => 1690, :id =>  'm1.xlarge',  :name => 'Extra Large Instance', :ram => 15360},
 

data/lib/fog/aws/models/compute/server.rb

@@ -8,46 +8,52 @@ module Fog
         extend Fog::Deprecation
         deprecate :ip_address, :public_ip_address
 
-        identity  :id,                    :aliases => 'instanceId'
+        identity  :id,                       :aliases => 'instanceId'
 
         attr_accessor :architecture
-        attribute :ami_launch_index,      :aliases => 'amiLaunchIndex'
-        attribute :availability_zone,     :aliases => 'availabilityZone'
-        attribute :block_device_mapping,  :aliases => 'blockDeviceMapping'
-        attribute :network_interfaces,    :aliases => 'networkInterfaces'
-        attribute :client_token,          :aliases => 'clientToken'
-        attribute :dns_name,              :aliases => 'dnsName'
-        attribute :ebs_optimized,         :aliases => 'ebsOptimized'
+        attribute :ami_launch_index,         :aliases => 'amiLaunchIndex'
+        attribute :availability_zone,        :aliases => 'availabilityZone'
+        attribute :block_device_mapping,     :aliases => 'blockDeviceMapping'
+        attribute :network_interfaces,       :aliases => 'networkInterfaces'
+        attribute :client_token,             :aliases => 'clientToken'
+        attribute :dns_name,                 :aliases => 'dnsName'
+        attribute :ebs_optimized,            :aliases => 'ebsOptimized'
         attribute :groups
-        attribute :flavor_id,             :aliases => 'instanceType'
-        attribute :iam_instance_profile,  :aliases => 'iamInstanceProfile'
-        attribute :image_id,              :aliases => 'imageId'
+        attribute :flavor_id,                :aliases => 'instanceType'
+        attribute :hypervisor              
+        attribute :iam_instance_profile,     :aliases => 'iamInstanceProfile'
+        attribute :image_id,                 :aliases => 'imageId'
         attr_accessor :instance_initiated_shutdown_behavior
-        attribute :kernel_id,             :aliases => 'kernelId'
-        attribute :key_name,              :aliases => 'keyName'
-        attribute :created_at,            :aliases => 'launchTime'
-        attribute :monitoring,            :squash => 'state'
-        attribute :placement_group,       :aliases => 'groupName'
-        attribute :platform,              :aliases => 'platform'
-        attribute :product_codes,         :aliases => 'productCodes'
-        attribute :private_dns_name,      :aliases => 'privateDnsName'
-        attribute :private_ip_address,    :aliases => 'privateIpAddress'
-        attribute :public_ip_address,     :aliases => 'ipAddress'
-        attribute :ramdisk_id,            :aliases => 'ramdiskId'
+        attribute :kernel_id,                :aliases => 'kernelId'
+        attribute :key_name,                 :aliases => 'keyName'
+        attribute :created_at,               :aliases => 'launchTime'
+        attribute :lifecycle,                :aliases => 'instanceLifecycle' 
+        attribute :monitoring,               :squash =>  'state'
+        attribute :placement_group,          :aliases => 'groupName'
+        attribute :platform,                 :aliases => 'platform'
+        attribute :product_codes,            :aliases => 'productCodes'
+        attribute :private_dns_name,         :aliases => 'privateDnsName'
+        attribute :private_ip_address,       :aliases => 'privateIpAddress'
+        attribute :public_ip_address,        :aliases => 'ipAddress'
+        attribute :ramdisk_id,               :aliases => 'ramdiskId'
         attribute :reason
-        attribute :root_device_name,      :aliases => 'rootDeviceName'
-        attribute :root_device_type,      :aliases => 'rootDeviceType'
-        attribute :security_group_ids,    :aliases => 'securityGroupIds'
-        attribute :state,                 :aliases => 'instanceState', :squash => 'name'
-        attribute :state_reason,          :aliases => 'stateReason'
-        attribute :subnet_id,             :aliases => 'subnetId'
+        attribute :requester_id,             :aliases => 'requesterId'
+        attribute :root_device_name,         :aliases => 'rootDeviceName'
+        attribute :root_device_type,         :aliases => 'rootDeviceType'
+        attribute :security_group_ids,       :aliases => 'securityGroupIds'
+        attribute :source_dest_check,        :aliases => 'sourceDestCheck'
+        attribute :spot_instance_request_id, :aliases => 'spotInstanceRequestId'
+        attribute :state,                    :aliases => 'instanceState', :squash => 'name'
+        attribute :state_reason,             :aliases => 'stateReason'
+        attribute :subnet_id,                :aliases => 'subnetId'
         attribute :tenancy
-        attribute :tags,                  :aliases => 'tagSet'
+        attribute :tags,                     :aliases => 'tagSet'
         attribute :user_data
-        attribute :vpc_id,                :aliases => 'vpcId'
+        attribute :virtualization_type,      :aliases => 'virtualizationType'
+        attribute :vpc_id,                   :aliases => 'vpcId'
 
-        attr_accessor :password
-        attr_writer   :iam_instance_profile_name, :iam_instance_profile_arn
+        attr_accessor                        :password
+        attr_writer                          :iam_instance_profile_name, :iam_instance_profile_arn
 
 
         def initialize(attributes={})
@@ -202,7 +208,7 @@ module Fog
           end
 
           # wait for aws to be ready
-          wait_for { sshable? }
+          wait_for { sshable?(credentials) }
 
           Fog::SSH.new(public_ip_address, username, credentials).run(commands)
         end

data/lib/fog/aws/models/compute/spot_request.rb

@@ -21,6 +21,7 @@ module Fog
         attribute :availability_zone_group,    :aliases => 'availabilityZoneGroup'
         attribute :product_description,        :aliases => 'productDescription'
 
+        attribute :ebs_optimized,              :aliases => 'LaunchSpecification.EbsOptimized'
         attribute :groups,                     :aliases => 'LaunchSpecification.SecurityGroup'
         attribute :key_name,                   :aliases => 'LaunchSpecification.KeyName'
         attribute :availability_zone,          :aliases => 'LaunchSpecification.Placement.AvailabilityZone'
@@ -94,7 +95,8 @@ module Fog
             'LaunchSpecification.KeyName'                    => key_name,
             'LaunchSpecification.Monitoring.Enabled'         => monitoring,
             'LaunchSpecification.Placement.AvailabilityZone' => availability_zone,
-            'LaunchSpecification.SecurityGroup'              => groups,
+            'LaunchSpecification.SecurityGroupId'            => groups,
+            'LaunchSpecification.EbsOptimized'               => ebs_optimized,
             'LaunchSpecification.UserData'                   => user_data,
             'LaunchSpecification.SubnetId'                   => subnet_id,
             'LaunchSpecification.IamInstanceProfile.Arn'     => @iam_instance_profile_arn,
@@ -104,16 +106,6 @@ module Fog
             'ValidUntil'                                     => valid_until }
           options.delete_if {|key, value| value.nil?}
 
-          # If subnet is defined then this is a Virtual Private Cloud.
-          # subnet & security group cannot co-exist. Attempting to specify
-          # both subnet and groups will cause an error.  Instead please make
-          # use of Security Group Ids when working in a VPC.
-          if subnet_id
-            options.delete('LaunchSpecification.SecurityGroup')
-          else
-            options.delete('LaunchSpecification.SubnetId')
-          end
-
           data = service.request_spot_instances(image_id, flavor_id, price, options).body
           spot_instance_request = data['spotInstanceRequestSet'].first
           spot_instance_request['launchSpecification'].each do |name,value|

data/lib/fog/aws/models/compute/volume.rb

@@ -71,7 +71,7 @@ module Fog
 
         def server
           requires :server_id
-          service.servers('instance-id' => server_id)
+          service.servers.get(server_id)
         end
 
         def server=(new_server)
@@ -108,6 +108,7 @@ module Fog
             self.availability_zone = new_server.availability_zone
           elsif new_server
             requires :device
+            wait_for { ready? }
             @server = nil
             self.server_id = new_server.id
             service.attach_volume(server_id, id, device)

data/lib/fog/aws/models/data_pipeline/pipeline.rb

@@ -0,0 +1,67 @@
+require 'fog/core/model'
+
+module Fog
+  module AWS
+    class DataPipeline
+
+      class Pipeline < Fog::Model
+
+        identity  :id, :aliases => 'pipelineId'
+        attribute :name
+        attribute :description
+        attribute :user_id, :aliases => 'userId'
+        attribute :account_id, :aliases => 'accountId'
+        attribute :state, :aliases => 'pipelineState'
+        attribute :unique_id, :aliases => 'uniqueId'
+
+        def initialize(attributes={})
+
+          # Extract the 'fields' portion of a response to attributes
+          if attributes.include?('fields')
+            string_fields = attributes['fields'].select { |f| f.include?('stringValue') }
+            field_attributes = Hash[string_fields.map { |f| [f['key'][/^@(.+)$/, 1], f['stringValue']] }]
+            merge_attributes(field_attributes)
+          end
+
+          super
+        end
+
+        def save
+          requires :name
+          requires :unique_id
+
+          data = service.create_pipeline(unique_id, name)
+          merge_attributes(data)
+
+          true
+        end
+
+        def activate
+          requires :id
+
+          service.activate_pipeline(id)
+
+          true
+        end
+
+        def put(objects)
+          requires :id
+
+          service.put_pipeline_definition(id, objects)
+
+          true
+        end
+
+        def destroy
+          requires :id
+
+          service.delete_pipeline(id)
+
+          true
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/models/data_pipeline/pipelines.rb

@@ -0,0 +1,36 @@
+require 'fog/core/collection'
+require 'fog/aws/models/data_pipeline/pipeline'
+
+module Fog
+  module AWS
+    class DataPipeline
+
+      class Pipelines < Fog::Collection
+
+        model Fog::AWS::DataPipeline::Pipeline
+
+        def all
+          ids = []
+
+          begin
+            result = service.list_pipelines
+            ids << result['pipelineIdList'].map { |id| id['id'] }
+          end while (result['hasMoreResults'] && result['marker'])
+
+          load(service.describe_pipelines(ids.flatten)['pipelineDescriptionList'])
+        end
+
+        def get(id)
+          data = service.describe_pipelines([id])['pipelineDescriptionList'].first
+          new(data)
+        rescue Excon::Errors::BadRequest => error
+          data = Fog::JSON.decode(error.response.body)
+          raise unless data['__type'] == 'PipelineDeletedException' || data['__type'] == 'PipelineNotFoundException'
+
+          nil
+        end
+
+      end
+    end
+  end
+end

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

@@ -23,7 +23,6 @@ module Fog
         attribute :set_identifier,:aliases => ['SetIdentifier']
 
         def initialize(attributes={})
-          self.ttl ||= 3600
           super
         end
 
@@ -38,6 +37,7 @@ module Fog
         end
 
         def save
+          self.ttl ||= 3600
           options = attributes_to_options('CREATE')
           data = service.change_resource_record_sets(zone.id, [options]).body
           merge_attributes(data)