fog 1.6.0 → 1.7.0

data/lib/fog/aws/cdn.rb

@@ -9,7 +9,11 @@ module Fog
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :host, :path, :port, :scheme, :version, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
 
-      model_path 'fog/aws/cdn/models'
+      model_path 'fog/aws/models/cdn'
+      model       :distribution
+      collection  :distributions
+      model       :streaming_distribution
+      collection  :streaming_distributions
 
       request_path 'fog/aws/requests/cdn'
       request 'delete_distribution'
@@ -17,6 +21,7 @@ module Fog
       request 'get_distribution'
       request 'get_distribution_list'
       request 'get_invalidation_list'
+      request 'get_invalidation'
       request 'get_streaming_distribution'
       request 'get_streaming_distribution_list'
       request 'post_distribution'
@@ -28,12 +33,12 @@ module Fog
       class Mock
 
         def self.data
-          @data ||= Hash.new do |hash, region|
-            hash[region] = Hash.new do |region_hash, key|
-              region_hash[key] = {
-                :buckets => {}
+          @data ||= Hash.new do |hash, key|
+            hash[key] =  {
+                :distributions => {},
+                :streaming_distributions => {},
+                :invalidations => {}
               }
-            end
           end
         end
 
@@ -45,15 +50,14 @@ module Fog
           require 'mime/types'
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)
-          @region             = options[:region]
         end
 
         def data
-          self.class.data[@region][@aws_access_key_id]
+          self.class.data[@aws_access_key_id]
         end
 
         def reset_data
-          self.class.data[@region].delete(@aws_access_key_id)
+          self.class.data.delete(@aws_access_key_id)
         end
 
         def signature(params)
@@ -63,6 +67,62 @@ module Fog
         def setup_credentials(options={})
           @aws_access_key_id  = options[:aws_access_key_id]
         end
+
+        def self.distribution_id
+          random_id(14)
+        end
+
+        def self.generic_id
+          random_id(14)
+        end
+
+        def self.domain_name
+          "#{random_id(12).downcase}.cloudfront.net"
+        end
+
+        def self.random_id(length)
+          Fog::Mock.random_selection("abcdefghijklmnopqrstuvwxyz0123456789", length).upcase
+        end
+
+        CDN_ERRORS = {
+          :access_denies => {:code => 'AccessDenied',:msg  => 'Access denied.',:status => 403},
+          :inappropriate_xml => {:code => 'InappropriateXML',:msg  => 'The XML document you provided was well-formed and valid, but not appropriate for this operation.',:status => 400},
+          :internal_error => {:code => 'InternalError',:msg  => 'We encountered an internal error. Please try again.',:status => 500},
+          :invalid_action => {:code => 'InvalidAction',:msg  => 'The action specified is not valid.',:status => 400},
+          :invalid_argument => {:code => 'InvalidArgument',:msg  => '%s', :status => 400},
+          :not_implemented => {:code => 'NotImplemented', :msg  => 'Not implemented.',:status => 501},
+          :no_such_distribution => { :code => 'NoSuchDistribution', :msg => 'The specified distribution does not exist', :status => 404 },
+          :no_such_streaming_distribution => { :code => 'NoSuchStreamingDistribution', :msg => 'The specified streaming distribution does not exist', :status => 404 },
+          :no_such_invalidation => { :code => 'NoSuchInvalidation', :msg => 'The specified invalidation does not exist', :status => 404 },
+          :cname_exists => { :code => 'CNAMEAlreadyExists', :msg => 'One or more of the CNAMEs you provided are already associated with a different distribution', :status => 409 },
+          :illegal_update => { :code => 'IllegalUpdate', :msg => 'Origin and CallerReference cannot be updated.', :status => 400 },
+          :invalid_if_match_version => { :code => 'InvalidIfMatchVersion', :msg => 'The If-Match version is missing or not valid for the distribution.', :status => 400},
+          :distribution_not_disabled => { :code => 'DistributionNotDisabled', :msg => 'The distribution you are trying to delete has not been disabled.', :status => 409 },
+
+        }
+
+        def self.error(code, argument = '')
+          if error = CDN_ERRORS[code]
+            raise_error(error[:status], error[:code], error[:msg] % argument)
+          end
+        end
+
+        def self.raise_error(status, code, message='')
+          response = Excon::Response.new
+          response.status = status
+          response.body = <<EOF
+<ErrorResponse xmlns="http://cloudfront.amazonaws.com/doc/2010-11-01/">
+   <Error>
+      <Type>Sender</Type>
+      <Code>#{code}</Code>
+      <Message>#{message}.</Message>
+   </Error>
+   <RequestId>#{Fog::AWS::Mock.request_id}</RequestId>
+</ErrorResponse>
+EOF
+
+          raise(Excon::Errors.status_error({:expects => 201}, response))
+        end
       end
 
       class Real

data/lib/fog/aws/cloud_watch.rb

@@ -6,7 +6,7 @@ module Fog
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
 
       request_path 'fog/aws/requests/cloud_watch'
 
@@ -94,6 +94,10 @@ module Fog
           setup_credentials(options)
 
           @connection_options = options[:connection_options] || {}
+
+          @instrumentor           = options[:instrumentor]
+          @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.cloud_watch'
+
           options[:region] ||= 'us-east-1'
           @host = options[:host] || "monitoring.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
@@ -136,6 +140,16 @@ module Fog
             }
           )
 
+          if @instrumentor
+            @instrumentor.instrument("#{@instrumentor_name}.request", params) do
+              _request(body, idempotent, parser)
+            end
+          else
+            _request(body, idempotent, parser)
+          end
+        end
+
+        def _request(body, idempotent, parser)
           @connection.request({
             :body       => body,
             :expects    => 200,

data/lib/fog/aws/compute.rb

@@ -212,6 +212,8 @@ module Fog
           @data = nil
         end
 
+        attr_accessor :region
+
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
           @aws_credentials_expire_at = Time::now + 20

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

@@ -20,11 +20,12 @@ module Fog
         attribute :min_size,                  :aliases => 'MinSize'
         attribute :placement_group,           :aliases => 'PlacementGroup'
         attribute :suspended_processes,       :aliases => 'SuspendedProcesses'
-        attribute :vpc_zone_identifier,       :aliases => 'VPCZoneIdentifier'
         attribute :tags,                      :aliases => 'Tags'
+        attribute :termination_policies,      :aliases => 'TerminationPolicies'
+        attribute :vpc_zone_identifier,       :aliases => 'VPCZoneIdentifier'
 
         def initialize(attributes={})
-          attributes['DefaultCooldown'] ||= 0
+          attributes['DefaultCooldown'] ||= 300
           attributes['DesiredCapacity'] ||= 0
           attributes['EnabledMetrics'] ||= []
           attributes['HealthCheckGracePeriod'] ||= 0
@@ -35,6 +36,7 @@ module Fog
           attributes['MinSize'] ||= 0
           attributes['SuspendedProcesses'] ||= []
           attributes['Tags'] ||= []
+          attributes['TerminationPolicies'] ||= ['Default']
           super
         end
 
@@ -119,9 +121,13 @@ module Fog
         #  self
         #end
 
-        def destroy
+        def destroy(options = { :force => false })
           requires :id
-          connection.delete_auto_scaling_group(id)
+
+          opts = {}
+          opts.merge({'ForceDelete' => true}) if options[:force]
+          
+          connection.delete_auto_scaling_group(id, opts)
         end
 
         def update

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

@@ -0,0 +1,93 @@
+require 'fog/core/model'
+require 'fog/aws/models/cdn/invalidations'
+require 'fog/aws/models/cdn/distribution_helper'
+
+module Fog
+  module CDN
+    class AWS
+
+      class Distribution < 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 :custom_origin,      :aliases => 'CustomOrigin'
+        attribute :cname,              :aliases => 'CNAME'
+        attribute :comment,            :aliases => 'Comment'
+        attribute :enabled,            :aliases => 'Enabled'
+        attribute :in_progress_invalidation_batches, :aliases => 'InProgressInvalidationBatches'
+        attribute :logging,            :aliases => 'Logging'
+        attribute :trusted_signers,    :aliases => 'TrustedSigners'
+        attribute :default_root_object,:aliases => 'DefaultRootObject'
+        attribute :domain,             :aliases => 'DomainName'
+        attribute :etag,               :aliases => ['Etag', 'ETag']
+
+        # items part of DistributionConfig
+        CONFIG = [ :caller_reference, :origin,  :cname, :comment, :enabled, :logging, :trusted_signers, :default_root_object ]
+
+        def initialize(new_attributes = {})
+          super(distribution_config_to_attributes(new_attributes))
+        end
+
+        def invalidations
+          @invalidations ||= begin
+            Fog::CDN::AWS::Invalidations.new(
+              :distribution => self,
+              :connection => connection
+            )
+          end
+        end
+
+        def save
+          requires_one :s3_origin, :custom_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_distribution(identity, etag)
+        end
+
+        def put_distribution_config(identity, etag, options)
+          connection.put_distribution_config(identity, etag, options)
+        end
+
+        def post_distribution(options = {})
+          connection.post_distribution(options)
+        end
+
+        def attributes_to_options
+          options = {
+            'CallerReference' => caller_reference,
+            'S3Origin' => s3_origin,
+            'CustomOrigin' => custom_origin,
+            'CNAME' => cname,
+            'Comment' => comment,
+            'Enabled' => enabled,
+            'Logging' => logging,
+            'TrustedSigners' => trusted_signers,
+            'DefaultRootObject' => default_root_object
+          }
+          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('DistributionConfig') || {})
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,64 @@
+require 'fog/core/collection'
+
+module Fog
+  module CDN
+    class AWS
+
+      module DistributionHelper
+
+        def destroy
+          requires :identity, :etag, :caller_reference
+          raise "Distribution must be disabled to be deleted" unless disabled?
+          delete_distribution(identity, etag)
+          true
+        end
+
+        def enabled?
+          requires :identity
+          !!enabled and ready?
+        end
+
+        def disabled?
+          requires :identity
+          not enabled? and ready?
+        end
+
+        def custom_origin?
+          requires :identity
+          not custom_origin.nil?
+        end
+
+        def ready?
+          requires :identity
+          status == 'Deployed'
+        end
+
+        def enable
+          requires :identity
+          reload if etag.nil? or caller_reference.nil?
+          unless enabled?
+            self.enabled = true
+            response = put_distribution_config(identity, etag, attributes_to_options)
+            etag = response.headers['ETag']
+            merge_attributes(response.body)
+          end
+          true
+        end
+
+        def disable
+          requires :identity
+          reload if etag.nil? or caller_reference.nil?
+          if enabled?
+            self.enabled = false
+            response = put_distribution_config(identity, etag, attributes_to_options)
+            etag = response.headers['ETag']
+            merge_attributes(response.body)
+          end
+          true
+        end
+
+      end
+
+    end
+  end
+end

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

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

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

@@ -0,0 +1,47 @@
+require 'fog/core/collection'
+
+module Fog
+  module CDN
+    class AWS
+
+      module DistributionsHelper
+        def all(options = {})
+          merge_attributes(options)
+          data = list_distributions(options).body
+          merge_attributes('IsTruncated' => data['IsTruncated'], 'Marker' => data['Marker'], 'MaxItems' => data['MaxItems'])
+          if summary = data['DistributionSummary']
+            load(summary.map { |a| { 'DistributionConfig' => a } })
+          else
+            load((data['StreamingDistributionSummary'] || {}).map { |a| { 'StreamingDistributionConfig' => a }})
+          end
+        end
+
+        def get(dist_id)
+          response = get_distribution(dist_id)
+          data = response.body.merge({'ETag' => response.headers['ETag']})
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+        def each
+          if !block_given?
+            self
+          else
+            subset = dup.all
+
+            subset.each_distribution_this_page {|f| yield f}
+            while subset.is_truncated
+              subset = subset.all('Marker' => subset.marker, 'MaxItems' => 1000)
+              subset.each_distribution_this_page {|f| yield f}
+            end
+
+            self
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,64 @@
+require 'fog/core/model'
+
+module Fog
+  module CDN
+    class AWS
+
+      class Invalidation < Fog::Model
+
+        identity :id,                :aliases => 'Id'
+
+        attribute :status,           :aliases => 'Status'
+        attribute :create_time,      :aliases => 'CreateTime'
+        attribute :caller_reference, :aliases => 'CallerReference'
+        attribute :paths,            :aliases => 'Paths'
+
+        def initialize(new_attributes={})
+          new_attributes[:caller_reference] ||= Time.now.utc.to_i.to_s
+          super(invalidation_to_attributes(new_attributes))
+        end
+
+        def distribution
+          @distribution
+        end
+
+        def ready?
+          requires :id, :status
+          status == 'Completed'
+        end
+
+        def save
+          requires :paths, :caller_reference
+          raise "Submitted invalidation cannot be submitted again" if identity
+          response = connection.post_invalidation(distribution.identity, paths, caller_reference)
+          merge_attributes(invalidation_to_attributes(response.body))
+          true
+        end
+
+        def destroy
+          # invalidations can't be removed, but tests are requiring they do :)
+          true
+        end
+
+        private
+
+        def distribution=(dist)
+          @distribution = dist
+        end
+
+        def invalidation_to_attributes(new_attributes={})
+          invalidation_batch = new_attributes.delete('InvalidationBatch') || {}
+          if invalidation_batch['Path']
+            new_attributes[:paths] = invalidation_batch['Path']
+          end
+          if invalidation_batch['CallerReference']
+            new_attributes[:caller_reference] = invalidation_batch['CallerReference']
+          end
+          new_attributes
+        end
+
+      end
+
+    end
+  end
+end