fog 1.6.0 → 1.7.0

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

@@ -0,0 +1,54 @@
+require 'fog/core/collection'
+require 'fog/aws/models/cdn/invalidation'
+
+module Fog
+  module CDN
+    class AWS
+
+      class Invalidations < Fog::Collection
+
+        attribute :is_truncated,            :aliases => ['IsTruncated']
+        attribute :max_items,               :aliases => ['MaxItems']
+        attribute :next_marker,             :aliases => ['NextMarker']
+        attribute :marker,                  :aliases => ['Marker']
+
+        attribute :distribution
+
+        model Fog::CDN::AWS::Invalidation
+
+        def all(options = {})
+          requires :distribution
+          options[:max_items]  ||= max_items
+          options.delete_if {|key, value| value.nil?}
+
+          data = connection.get_invalidation_list(distribution.identity, options).body
+
+          merge_attributes(data.reject {|key, value| !['IsTruncated', 'MaxItems', 'NextMarker', 'Marker'].include?(key)})
+
+          load(data['InvalidationSummary'])
+        end
+
+        def get(invalidation_id)
+          requires :distribution
+
+          data = connection.get_invalidation(distribution.identity, invalidation_id).body
+
+          if data
+            invalidation = new(data)
+          else
+            nil
+          end
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+        def new(attributes = {})
+          requires :distribution
+          super({ :distribution => distribution }.merge!(attributes))
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,77 @@
+require 'fog/core/model'
+require 'fog/aws/models/cdn/invalidations'
+require 'fog/aws/models/cdn/distribution_helper'
+
+module Fog
+  module CDN
+    class AWS
+
+      class StreamingDistribution < Fog::Model
+        include Fog::CDN::AWS::DistributionHelper
+
+        identity :id,                 :aliases => 'Id'
+
+        attribute :caller_reference,   :aliases => 'CallerReference'
+        attribute :last_modified_time, :aliases => 'LastModifiedTime'
+        attribute :status,             :aliases => 'Status'
+        attribute :s3_origin,          :aliases => 'S3Origin'
+        attribute :cname,              :aliases => 'CNAME'
+        attribute :comment,            :aliases => 'Comment'
+        attribute :enabled,            :aliases => 'Enabled'
+        attribute :logging,            :aliases => 'Logging'
+        attribute :domain,             :aliases => 'DomainName'
+        attribute :etag,               :aliases => ['Etag', 'ETag']
+
+        # items part of DistributionConfig
+        CONFIG = [ :caller_reference, :cname, :comment, :enabled, :logging ]
+
+        def initialize(new_attributes = {})
+          super(distribution_config_to_attributes(new_attributes))
+        end
+
+        def save
+          requires_one :s3_origin
+          options = attributes_to_options
+          response = identity ? put_distribution_config(identity, etag, options) : post_distribution(options)
+          etag = response.headers['ETag']
+          merge_attributes(response.body)
+          true
+        end
+
+        private
+
+        def delete_distribution(identity, etag)
+          connection.delete_streaming_distribution(identity, etag)
+        end
+
+        def put_distribution_config(identity, etag, options)
+          connection.put_streaming_distribution_config(identity, etag, options)
+        end
+
+        def post_distribution(options = {})
+          connection.post_streaming_distribution(options)
+        end
+
+        def attributes_to_options
+          options = {
+            'CallerReference' => caller_reference,
+            'S3Origin' => s3_origin,
+            'CNAME' => cname,
+            'Comment' => comment,
+            'Enabled' => enabled,
+            'Logging' => logging,
+          }
+          options.reject! { |k,v| v.nil? }
+          options.reject! { |k,v| v.respond_to?(:empty?) && v.empty? }
+          options
+        end
+
+        def distribution_config_to_attributes(new_attributes = {})
+          new_attributes.merge(new_attributes.delete('StreamingDistributionConfig') || {})
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+require 'fog/core/collection'
+require 'fog/aws/models/cdn/streaming_distribution'
+require 'fog/aws/models/cdn/distributions_helper'
+
+module Fog
+  module CDN
+    class AWS
+
+      class StreamingDistributions < Fog::Collection
+        include Fog::CDN::AWS::DistributionsHelper
+
+        model Fog::CDN::AWS::StreamingDistribution
+
+        attribute :marker,    :aliases => 'Marker'
+        attribute :max_items, :aliases => 'MaxItems'
+        attribute :is_truncated,    :aliases => 'IsTruncated'
+
+        def get_distribution(dist_id)
+          connection.get_streaming_distribution(dist_id)
+        end
+
+        def list_distributions(options = {})
+          connection.get_streaming_distribution_list(options)
+        end
+
+        alias :each_distribution_this_page :each
+
+      end
+
+    end
+  end
+end

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

@@ -47,7 +47,6 @@ module Fog
         attribute :vpc_id,                :aliases => 'vpcId'
 
         attr_accessor :password
-        attr_writer   :private_key, :private_key_path, :public_key, :public_key_path, :username
         attr_writer   :iam_instance_profile_name, :iam_instance_profile_arn
 
 
@@ -118,24 +117,6 @@ module Fog
           self.key_name = new_keypair && new_keypair.name
         end
 
-        def private_key_path
-          @private_key_path ||= Fog.credentials[:private_key_path]
-          @private_key_path &&= File.expand_path(@private_key_path)
-        end
-
-        def private_key
-          @private_key ||= private_key_path && File.read(private_key_path)
-        end
-
-        def public_key_path
-          @public_key_path ||= Fog.credentials[:public_key_path]
-          @public_key_path &&= File.expand_path(@public_key_path)
-        end
-
-        def public_key
-          @public_key ||= public_key_path && File.read(public_key_path)
-        end
-
         def ready?
           state == 'running'
         end
@@ -232,10 +213,6 @@ module Fog
           true
         end
 
-        def username
-          @username ||= 'root'
-        end
-
         def volumes
           requires :id
           connection.volumes(:server => self)

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/compute/models/server'
 
 module Fog
   module Compute
     class AWS
       
-      class SpotRequest < Fog::Model
+      class SpotRequest < Fog::Compute::Server
 
         identity :id,                          :aliases => 'spotInstanceRequestId'
 
@@ -33,10 +33,6 @@ module Fog
         attribute :fault,                      :squash  => 'message'
         attribute :user_data
         
-        attr_writer   :private_key, :private_key_path, :public_key, :public_key_path
-
-        attr_writer :username
-
         def initialize(attributes={})
           self.groups ||= ["default"]
           self.flavor_id ||= 't1.micro'
@@ -74,24 +70,6 @@ module Fog
         def key_pair=(new_keypair)
           self.key_name = new_keypair && new_keypair.name
         end
-        
-        def private_key_path
-          @private_key_path ||= Fog.credentials[:private_key_path]
-          @private_key_path &&= File.expand_path(@private_key_path)
-        end
-
-        def private_key
-          @private_key ||= private_key_path && File.read(private_key_path)
-        end
-
-        def public_key_path
-          @public_key_path ||= Fog.credentials[:public_key_path]
-          @public_key_path &&= File.expand_path(@public_key_path)
-        end
-
-        def public_key
-          @public_key ||= public_key_path && File.read(public_key_path)
-        end
 
         def ready?
           state == 'active'

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

@@ -60,6 +60,24 @@ module Fog
           connection.snapshots(:server => self)
         end
 
+        def tags
+          requires :id
+          connection.list_tags_for_resource(id).
+            body['ListTagsForResourceResult']['TagList']
+        end
+
+        def add_tags(new_tags)
+          requires :id
+          connection.add_tags_to_resource(id, new_tags)
+          tags
+        end
+
+        def remove_tags(tag_keys)
+          requires :id
+          connection.remove_tags_from_resource(id, tag_keys)
+          tags
+        end
+
         def modify(immediately, options)
           options[:security_group_names] ||= options['DBSecurityGroups']
           params = self.class.new(options).attributes_to_params

data/lib/fog/aws/models/rds/subnet_group.rb

@@ -0,0 +1,20 @@
+require 'fog/core/model'
+
+module Fog
+  module AWS
+    class RDS
+
+      class SubnetGroup < Fog::Model
+
+        identity   :id, :aliases => ['DBSubnetGroupName', :name]
+        attribute  :description, :aliases => 'DBSubnetGroupDescription'
+        attribute  :status, :aliases => 'SubnetGroupStatus'
+        attribute  :vpc_id, :aliases => 'VpcId'
+        attribute  :subnet_ids, :aliases => 'Subnets'
+
+        # TODO: ready?, save, destroy
+
+      end
+    end
+  end
+end

data/lib/fog/aws/models/rds/subnet_groups.rb

@@ -0,0 +1,27 @@
+require 'fog/core/collection'
+require 'fog/aws/models/rds/subnet_group'
+
+module Fog
+  module AWS
+    class RDS
+
+      class SubnetGroups < Fog::Collection
+
+        model Fog::AWS::RDS::SubnetGroup
+
+        def all
+          data = connection.describe_db_subnet_groups.body['DescribeDBSubnetGroupsResult']['DBSubnetGroups']
+          load(data) # data is an array of attribute hashes
+        end
+
+        def get(identity)
+          data = connection.describe_db_subnet_groups(identity).body['DescribeDBSubnetGroupsResult']['DBSubnetGroups'].first
+          new(data) # data is an attribute hash
+        rescue Fog::AWS::RDS::NotFound
+          nil
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/models/storage/file.rb

@@ -70,7 +70,7 @@ module Fog
 
         remove_method :metadata
         def metadata
-          attributes.reject {|key, value| !(key.to_s =~ /^x-amz-meta-/)}
+          attributes.reject {|key, value| !(key.to_s =~ /^x-amz-/)}
         end
 
         remove_method :metadata=

data/lib/fog/aws/parsers/auto_scaling/describe_adjustment_types.rb

@@ -15,15 +15,28 @@ module Fog
             @adjustment_type = {}
           end
 
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'AdjustmentTypes'
+              @in_adjustment_types = true
+            end
+          end
+
           def end_element(name)
             case name
             when 'member'
-              @results['AdjustmentTypes'] << @adjustment_type
-              reset_adjustment_type
+              if @in_adjustment_types
+                @results['AdjustmentTypes'] << @adjustment_type
+                reset_adjustment_type
+              end
 
             when 'AdjustmentType'
               @adjustment_type[name] = value
 
+            when 'AdjustmentTypes'
+              @in_adjustment_types = false
+
             when 'RequestId'
               @response['ResponseMetadata'][name] = value
 

data/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_groups.rb

@@ -10,13 +10,21 @@ module Fog
             reset_enabled_metric
             reset_instance
             reset_suspended_process
+            reset_tag
             @results = { 'AutoScalingGroups' => [] }
             @response = { 'DescribeAutoScalingGroupsResult' => {}, 'ResponseMetadata' => {} }
           end
 
           def reset_auto_scaling_group
-            @auto_scaling_group = { 'AvailabilityZones' => [], 'EnabledMetrics' => [], 'Instances' => [], 
-                                  'LoadBalancerNames' => [], 'SuspendedProcesses' => [], 'TerminationPolicies' => [] }
+            @auto_scaling_group = {
+              'AvailabilityZones' => [],
+              'EnabledMetrics' => [],
+              'Instances' => [],
+              'LoadBalancerNames' => [],
+              'SuspendedProcesses' => [],
+              'Tags' => [],
+              'TerminationPolicies' => []
+            }
           end
 
           def reset_enabled_metric
@@ -31,9 +39,14 @@ module Fog
             @suspended_process = {}
           end
 
+          def reset_tag
+            @tag = {}
+          end
+
           def start_element(name, attrs = [])
             super
             case name
+            when 'member'
             when 'AvailabilityZones'
               @in_availability_zones = true
             when 'EnabledMetrics'
@@ -44,6 +57,8 @@ module Fog
               @in_load_balancer_names = true
             when 'SuspendedProcesses'
               @in_suspended_processes = true
+            when 'Tags'
+              @in_tags = true
             when 'TerminationPolicies'
               @in_termination_policies = true
             end
@@ -65,30 +80,24 @@ module Fog
               elsif @in_suspended_processes
                 @auto_scaling_group['SuspendedProcesses'] << @suspended_process
                 reset_suspended_process
+              elsif @in_tags
+                @auto_scaling_group['Tags'] << @tag
+                reset_tag
               elsif @in_termination_policies
                 @auto_scaling_group['TerminationPolicies'] << value
-              elsif !@in_instances && !@in_policies
+              else
                 @results['AutoScalingGroups'] << @auto_scaling_group
                 reset_auto_scaling_group
               end
 
             when 'AvailabilityZones'
               @in_availability_zones = false
-              
+
             when 'Granularity', 'Metric'
               @enabled_metric[name] = value
             when 'EnabledMetrics'
               @in_enabled_metrics = false
 
-            when 'LaunchConfigurationName'
-              if @in_instances
-                @instance[name] = value
-              else
-                @auto_scaling_group[name] = value
-              end
-            when 'TerminationPolicies'
-              @in_termination_policies = false
-
             when 'AvailabilityZone', 'HealthStatus', 'InstanceId', 'LifecycleState'
               @instance[name] = value
             when 'Instances'
@@ -102,6 +111,23 @@ module Fog
             when 'SuspendedProcesses'
               @in_suspended_processes = false
 
+            when 'Key', 'ResourceId', 'ResourceType', 'Value'
+              @tag[name] = value
+            when 'PropagateAtLaunch'
+              @tag[name] = (value == 'true')
+            when 'Tags'
+              @in_tags = false
+
+            when 'TerminationPolicies'
+              @in_termination_policies = false
+
+            when 'LaunchConfigurationName'
+              if @in_instances
+                @instance[name] = value
+              else
+                @auto_scaling_group[name] = value
+              end
+
             when 'AutoScalingGroupARN', 'AutoScalingGroupName'
               @auto_scaling_group[name] = value
             when 'CreatedTime'