fog-aws 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b06f370b5dc8f1261cfe6c34c5c1c0fe55b0b162a1e406a4aa8dd7d19ae6109a
-  data.tar.gz: 1e3ea64a2e8f5772f0fe36c2c02d2d025652ece1dd5608eb164d0f97c9acaf75
+  metadata.gz: 6102e30cc006be40adc471fd91d1ca9547fa46ac91703737aa3dc544ee577378
+  data.tar.gz: c73d52ba32eb89c42ae4f4307eaea8a3a9f06583dddaa5790f78b5207cdc7129
 SHA512:
-  metadata.gz: e891f34795e0d49a960379482328fefdb413337cd9cce1064ec2768eb3bb51275d66857ee4c831e0b240c97a590955ddf46eec33cd179fb2136f7b9973e74609
-  data.tar.gz: 763f9774a5f2ee8338077f3ed043b2fdfd864eb2fa20920c835f41ae29af28ebde7401f938114ebe69172c05152b9b70cba8d68f5f7881f7b551dd989a243cac
+  metadata.gz: 1567e0ebc839dedb5829b4d4292d28937cfaa93fb474a5424c4d5a7f423e2d3755e826ce853045cec540341dd7c626f5fd54c1423852f7d7e5930494286f01b2
+  data.tar.gz: 76deb66ad0ad18890effdef923160f0d81dfa46df074a9c6acf8d44b46901d3fb2cd53584121bfa959fe2b86e2d82f536b0754aee31d78691e30b4ebd22f12aa

data/lib/fog/aws.rb

@@ -5,10 +5,6 @@ require 'fog/json'
 require File.expand_path('../aws/version', __FILE__)
 
 module Fog
-  module CDN
-    autoload :AWS,  File.expand_path('../aws/cdn', __FILE__)
-  end
-
   module AWS
     extend Fog::Provider
 
@@ -20,6 +16,7 @@ module Fog
 
     # Services
     autoload :AutoScaling,      File.expand_path('../aws/auto_scaling', __FILE__)
+    autoload :CDN,              File.expand_path('../aws/cdn', __FILE__)
     autoload :CloudFormation,   File.expand_path('../aws/cloud_formation', __FILE__)
     autoload :CloudWatch,       File.expand_path('../aws/cloud_watch', __FILE__)
     autoload :Compute,          File.expand_path('../aws/compute', __FILE__)

data/lib/fog/aws/cdn.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS < Fog::Service
+  module AWS
+    class CDN < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
@@ -200,4 +200,17 @@ EOF
       end
     end
   end
+
+  # @deprecated
+  module CDN
+    # @deprecated
+    class AWS < Fog::AWS::CDN
+      # @deprecated
+      # @overrides Fog::Service.new (from the fog-core gem)
+      def self.new(*)
+        Fog::Logger.deprecation 'Fog::CDN::AWS is deprecated, please use Fog::AWS::CDN.'
+        super
+      end
+    end
+  end
 end

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

@@ -2,10 +2,10 @@ require 'fog/aws/models/cdn/invalidations'
 require 'fog/aws/models/cdn/distribution_helper'
 
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Distribution < Fog::Model
-        include Fog::CDN::AWS::DistributionHelper
+        include Fog::AWS::CDN::DistributionHelper
 
         identity :id,                 :aliases => 'Id'
 
@@ -33,7 +33,7 @@ module Fog
 
         def invalidations
           @invalidations ||= begin
-            Fog::CDN::AWS::Invalidations.new(
+            Fog::AWS::CDN::Invalidations.new(
               :distribution => self,
               :service => service
             )

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

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       module DistributionHelper
         def destroy
           requires :identity, :etag, :caller_reference

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

@@ -2,12 +2,12 @@ require 'fog/aws/models/cdn/distribution'
 require 'fog/aws/models/cdn/distributions_helper'
 
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Distributions < Fog::Collection
-        include Fog::CDN::AWS::DistributionsHelper
+        include Fog::AWS::CDN::DistributionsHelper
 
-        model Fog::CDN::AWS::Distribution
+        model Fog::AWS::CDN::Distribution
 
         attribute :marker,    :aliases => 'Marker'
         attribute :max_items, :aliases => 'MaxItems'

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

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       module DistributionsHelper
 
         def all(options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Invalidation < Fog::Model
         identity :id,                :aliases => 'Id'
 

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

@@ -1,8 +1,8 @@
 require 'fog/aws/models/cdn/invalidation'
 
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Invalidations < Fog::Collection
         attribute :is_truncated,            :aliases => ['IsTruncated']
         attribute :max_items,               :aliases => ['MaxItems']
@@ -11,7 +11,7 @@ module Fog
 
         attribute :distribution
 
-        model Fog::CDN::AWS::Invalidation
+        model Fog::AWS::CDN::Invalidation
 
         def all(options = {})
           requires :distribution

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

@@ -2,10 +2,10 @@ require 'fog/aws/models/cdn/invalidations'
 require 'fog/aws/models/cdn/distribution_helper'
 
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class StreamingDistribution < Fog::Model
-        include Fog::CDN::AWS::DistributionHelper
+        include Fog::AWS::CDN::DistributionHelper
 
         identity :id,                 :aliases => 'Id'
 

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

@@ -2,12 +2,12 @@ require 'fog/aws/models/cdn/streaming_distribution'
 require 'fog/aws/models/cdn/distributions_helper'
 
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class StreamingDistributions < Fog::Collection
-        include Fog::CDN::AWS::DistributionsHelper
+        include Fog::AWS::CDN::DistributionsHelper
 
-        model Fog::CDN::AWS::StreamingDistribution
+        model Fog::AWS::CDN::StreamingDistribution
 
         attribute :marker,    :aliases => 'Marker'
         attribute :max_items, :aliases => 'MaxItems'

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module CDN
-      module AWS
+    module AWS
+      module CDN
         class Distribution < Fog::Parsers::Base
           def reset
             @response = { 'DistributionConfig' => { 'CNAME' => [], 'Logging' => {}, 'TrustedSigners' => [] } }

data/lib/fog/aws/parsers/cdn/get_distribution_list.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module CDN
-      module AWS
+    module AWS
+      module CDN
         class GetDistributionList < Fog::Parsers::Base
           def reset
             @distribution_summary = { 'CNAME' => [], 'TrustedSigners' => [] }

data/lib/fog/aws/parsers/cdn/get_invalidation.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module CDN
-      module AWS
+    module AWS
+      module CDN
         class GetInvalidation < Fog::Parsers::Base
           def reset
             @response = { 'InvalidationBatch' => { 'Path' => [] } }

data/lib/fog/aws/parsers/cdn/get_invalidation_list.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module CDN
-      module AWS
+    module AWS
+      module CDN
         class GetInvalidationList < Fog::Parsers::Base
           def reset
             @invalidation_summary = { }

data/lib/fog/aws/parsers/cdn/get_streaming_distribution_list.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module CDN
-      module AWS
+    module AWS
+      module CDN
         class GetStreamingDistributionList < Fog::Parsers::Base
           def reset
             @distribution_summary = { 'CNAME' => [], 'TrustedSigners' => [] }

data/lib/fog/aws/parsers/cdn/post_invalidation.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module CDN
-      module AWS
+    module AWS
+      module CDN
         class PostInvalidation < Fog::Parsers::Base
           def reset
             @response = { 'InvalidationBatch' => { 'Path' => [] } }

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
+    module AWS
       module CDN
-        module AWS
 
         class StreamingDistribution < Fog::Parsers::Base
           def reset

data/lib/fog/aws/requests/cdn/delete_distribution.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         # Delete a distribution from CloudFront.
         #
@@ -26,13 +26,13 @@ module Fog
 
           if distribution
             if distribution['ETag'] != etag
-              Fog::CDN::AWS::Mock.error(:invalid_if_match_version)
+              Fog::AWS::CDN::Mock.error(:invalid_if_match_version)
             end
             unless distribution['DistributionConfig']['CallerReference']
-              Fog::CDN::AWS::Mock.error(:illegal_update)
+              Fog::AWS::CDN::Mock.error(:illegal_update)
             end
             if distribution['DistributionConfig']['Enabled']
-              Fog::CDN::AWS::Mock.error(:distribution_not_disabled)
+              Fog::AWS::CDN::Mock.error(:distribution_not_disabled)
             end
 
             self.data[:distributions].delete(distribution_id)
@@ -43,7 +43,7 @@ module Fog
             response.body = "x-amz-request-id: #{Fog::AWS::Mock.request_id}"
             response
           else
-            Fog::CDN::AWS::Mock.error(:no_such_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_distribution)
           end
         end
       end

data/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         # Delete a streaming distribution from CloudFront.
         #
@@ -26,13 +26,13 @@ module Fog
 
           if distribution
             if distribution['ETag'] != etag
-              Fog::CDN::AWS::Mock.error(:invalid_if_match_version)
+              Fog::AWS::CDN::Mock.error(:invalid_if_match_version)
             end
             unless distribution['StreamingDistributionConfig']['CallerReference']
-              Fog::CDN::AWS::Mock.error(:illegal_update)
+              Fog::AWS::CDN::Mock.error(:illegal_update)
             end
             if distribution['StreamingDistributionConfig']['Enabled']
-              Fog::CDN::AWS::Mock.error(:distribution_not_disabled)
+              Fog::AWS::CDN::Mock.error(:distribution_not_disabled)
             end
 
             self.data[:streaming_distributions].delete(distribution_id)
@@ -42,7 +42,7 @@ module Fog
             response.body = "x-amz-request-id: #{Fog::AWS::Mock.request_id}"
             response
           else
-            Fog::CDN::AWS::Mock.error(:no_such_streaming_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_streaming_distribution)
           end
         end
       end

data/lib/fog/aws/requests/cdn/get_distribution.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/distribution'
 
@@ -42,7 +42,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::CDN::AWS::Distribution.new,
+            :parser     => Fog::Parsers::AWS::CDN::Distribution.new,
             :path       => "/distribution/#{distribution_id}"
           })
         end
@@ -54,14 +54,14 @@ module Fog
 
           distribution = self.data[:distributions][distribution_id]
           unless distribution
-            Fog::CDN::AWS::Mock.error(:no_such_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_distribution)
           end
 
           if distribution['Status'] == 'InProgress' && (Time.now - Time.parse(distribution['LastModifiedTime']) >= Fog::Mock.delay * 2)
             distribution['Status'] = 'Deployed'
           end
 
-          etag = Fog::CDN::AWS::Mock.generic_id
+          etag = Fog::AWS::CDN::Mock.generic_id
           response.status = 200
           response.body = {
             'InProgressInvalidationBatches' => 0,

data/lib/fog/aws/requests/cdn/get_distribution_list.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/get_distribution_list'
 
@@ -42,7 +42,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::CDN::AWS::GetDistributionList.new,
+            :parser   => Fog::Parsers::AWS::CDN::GetDistributionList.new,
             :path       => "/distribution",
             :query      => options
           })

data/lib/fog/aws/requests/cdn/get_invalidation.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/get_invalidation'
 
@@ -24,7 +24,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::CDN::AWS::GetInvalidation.new,
+            :parser   => Fog::Parsers::AWS::CDN::GetInvalidation.new,
             :path       => "/distribution/#{distribution_id}/invalidation/#{invalidation_id}"
           })
         end
@@ -34,12 +34,12 @@ module Fog
         def get_invalidation(distribution_id, invalidation_id)
           distribution = self.data[:distributions][distribution_id]
           unless distribution
-            Fog::CDN::AWS::Mock.error(:no_such_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_distribution)
           end
 
           invalidation = self.data[:invalidations][distribution_id][invalidation_id]
           unless invalidation
-            Fog::CDN::AWS::Mock.error(:no_such_invalidation)
+            Fog::AWS::CDN::Mock.error(:no_such_invalidation)
           end
 
           if invalidation['Status'] == 'InProgress' && (Time.now - Time.parse(invalidation['CreateTime']) >= Fog::Mock.delay * 2)

data/lib/fog/aws/requests/cdn/get_invalidation_list.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/get_invalidation_list'
 
@@ -27,7 +27,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::CDN::AWS::GetInvalidationList.new,
+            :parser   => Fog::Parsers::AWS::CDN::GetInvalidationList.new,
             :path       => "/distribution/#{distribution_id}/invalidation",
             :query      => options
           })
@@ -38,7 +38,7 @@ module Fog
         def get_invalidation_list(distribution_id, options = {})
           distribution = self.data[:distributions][distribution_id]
           unless distribution
-            Fog::CDN::AWS::Mock.error(:no_such_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_distribution)
           end
 
           invalidations = (self.data[:invalidations][distribution_id] || {}).values

data/lib/fog/aws/requests/cdn/get_streaming_distribution.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/streaming_distribution'
 
@@ -35,7 +35,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::CDN::AWS::StreamingDistribution.new,
+            :parser     => Fog::Parsers::AWS::CDN::StreamingDistribution.new,
             :path       => "/streaming-distribution/#{distribution_id}"
           })
         end
@@ -47,14 +47,14 @@ module Fog
 
           distribution = self.data[:streaming_distributions][distribution_id]
           unless distribution
-            Fog::CDN::AWS::Mock.error(:no_such_streaming_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_streaming_distribution)
           end
 
           if distribution['Status'] == 'InProgress' && (Time.now - Time.parse(distribution['LastModifiedTime']) >= Fog::Mock.delay * 2)
             distribution['Status'] = 'Deployed'
           end
 
-          etag = Fog::CDN::AWS::Mock.generic_id
+          etag = Fog::AWS::CDN::Mock.generic_id
           response.status = 200
           response.body = distribution.reject { |k,v| k == 'ETag' }
 

data/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/get_streaming_distribution_list'
 
@@ -42,7 +42,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::CDN::AWS::GetStreamingDistributionList.new,
+            :parser   => Fog::Parsers::AWS::CDN::GetStreamingDistributionList.new,
             :path       => "/streaming-distribution",
             :query      => options
           })

data/lib/fog/aws/requests/cdn/post_distribution.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/distribution'
 
@@ -77,7 +77,7 @@ module Fog
             :headers    => { 'Content-Type' => 'text/xml' },
             :idempotent => true,
             :method     => 'POST',
-            :parser     => Fog::Parsers::CDN::AWS::Distribution.new,
+            :parser     => Fog::Parsers::AWS::CDN::Distribution.new,
             :path       => "/distribution"
           })
         end
@@ -88,7 +88,7 @@ module Fog
 
         def post_distribution(options = {})
           if self.data[:distributions].values.any? { |d| (d['CNAME'] & (options['CNAME']||[])).empty? }
-            Fog::CDN::AWS::Mock.error(:invalid_argument, 'CNAME is already in use')
+            Fog::AWS::CDN::Mock.error(:invalid_argument, 'CNAME is already in use')
           end
 
           response = Excon::Response.new
@@ -96,10 +96,10 @@ module Fog
           response.status = 201
           options['CallerReference'] = Time.now.to_i.to_s
 
-          dist_id = Fog::CDN::AWS::Mock.distribution_id
+          dist_id = Fog::AWS::CDN::Mock.distribution_id
 
           distribution = {
-            'DomainName' => Fog::CDN::AWS::Mock.domain_name,
+            'DomainName' => Fog::AWS::CDN::Mock.domain_name,
             'Id' => dist_id,
             'Status' => 'InProgress',
             'LastModifiedTime' => Time.now.utc.iso8601,

data/lib/fog/aws/requests/cdn/post_invalidation.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/post_invalidation'
 
@@ -35,7 +35,7 @@ module Fog
             :headers    => {'Content-Type' => 'text/xml'},
             :idempotent => true,
             :method     => 'POST',
-            :parser     => Fog::Parsers::CDN::AWS::PostInvalidation.new,
+            :parser     => Fog::Parsers::AWS::CDN::PostInvalidation.new,
             :path       => "/distribution/#{distribution_id}/invalidation"
           })
         end
@@ -45,7 +45,7 @@ module Fog
         def post_invalidation(distribution_id, paths, caller_reference = Time.now.to_i.to_s)
           distribution = self.data[:distributions][distribution_id]
           if distribution
-            invalidation_id = Fog::CDN::AWS::Mock.distribution_id
+            invalidation_id = Fog::AWS::CDN::Mock.distribution_id
             invalidation = {
               'Id' => invalidation_id,
               'Status' => 'InProgress',
@@ -66,7 +66,7 @@ module Fog
             response.body = invalidation
             response
           else
-            Fog::CDN::AWS::Mock.error(:no_such_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_distribution)
           end
         end
       end

data/lib/fog/aws/requests/cdn/post_streaming_distribution.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/streaming_distribution'
 
@@ -64,7 +64,7 @@ module Fog
             :headers    => { 'Content-Type' => 'text/xml' },
             :idempotent => true,
             :method     => 'POST',
-            :parser     => Fog::Parsers::CDN::AWS::StreamingDistribution.new,
+            :parser     => Fog::Parsers::AWS::CDN::StreamingDistribution.new,
             :path       => "/streaming-distribution"
           })
         end
@@ -75,7 +75,7 @@ module Fog
 
         def post_streaming_distribution(options = {})
           if self.data[:streaming_distributions].values.any? { |d| (d['CNAME'] & (options['CNAME']||[])).empty? }
-            Fog::CDN::AWS::Mock.error(:invalid_argument, 'CNAME is already in use')
+            Fog::AWS::CDN::Mock.error(:invalid_argument, 'CNAME is already in use')
           end
 
           response = Excon::Response.new
@@ -83,10 +83,10 @@ module Fog
           response.status = 201
           options['CallerReference'] = Time.now.to_i.to_s
 
-          dist_id = Fog::CDN::AWS::Mock.distribution_id
+          dist_id = Fog::AWS::CDN::Mock.distribution_id
 
           distribution = {
-            'DomainName' => Fog::CDN::AWS::Mock.domain_name,
+            'DomainName' => Fog::AWS::CDN::Mock.domain_name,
             'Id' => dist_id,
             'Status' => 'InProgress',
             'LastModifiedTime' => Time.now.utc.iso8601,

data/lib/fog/aws/requests/cdn/put_distribution_config.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/distribution'
 
@@ -80,7 +80,7 @@ module Fog
             },
             :idempotent => true,
             :method     => 'PUT',
-            :parser     => Fog::Parsers::CDN::AWS::Distribution.new,
+            :parser     => Fog::Parsers::AWS::CDN::Distribution.new,
             :path       => "/distribution/#{distribution_id}/config"
           })
         end
@@ -92,10 +92,10 @@ module Fog
 
           if distribution
             if distribution['ETag'] != etag
-              Fog::CDN::AWS::Mock.error(:invalid_if_match_version)
+              Fog::AWS::CDN::Mock.error(:invalid_if_match_version)
             end
             unless distribution['DistributionConfig']['CallerReference']
-              Fog::CDN::AWS::Mock.error(:illegal_update)
+              Fog::AWS::CDN::Mock.error(:illegal_update)
             end
 
             distribution['DistributionConfig'].merge!(options)
@@ -103,11 +103,11 @@ module Fog
 
             response = Excon::Response.new
             response.status = 200
-            response.headers['ETag'] = Fog::CDN::AWS::Mock.generic_id
+            response.headers['ETag'] = Fog::AWS::CDN::Mock.generic_id
             response.body = distribution.merge({ 'LastModifiedTime' => Time.now.utc.iso8601 }).reject{ |k,v| k == 'ETag' }
             response
           else
-            Fog::CDN::AWS::Mock.error(:no_such_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_distribution)
           end
         end
       end

data/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/streaming_distribution'
 
@@ -69,7 +69,7 @@ module Fog
             },
             :idempotent => true,
             :method     => 'PUT',
-            :parser     => Fog::Parsers::CDN::AWS::StreamingDistribution.new,
+            :parser     => Fog::Parsers::AWS::CDN::StreamingDistribution.new,
             :path       => "/streaming-distribution/#{distribution_id}/config"
           })
         end
@@ -81,10 +81,10 @@ module Fog
 
           if distribution
             if distribution['ETag'] != etag
-              Fog::CDN::AWS::Mock.error(:invalid_if_match_version)
+              Fog::AWS::CDN::Mock.error(:invalid_if_match_version)
             end
             unless distribution['StreamingDistributionConfig']['CallerReference']
-              Fog::CDN::AWS::Mock.error(:illegal_update)
+              Fog::AWS::CDN::Mock.error(:illegal_update)
             end
 
             distribution['StreamingDistributionConfig'].merge!(options)
@@ -92,11 +92,11 @@ module Fog
 
             response = Excon::Response.new
             response.status = 200
-            response.headers['ETag'] = Fog::CDN::AWS::Mock.generic_id
+            response.headers['ETag'] = Fog::AWS::CDN::Mock.generic_id
             response.body = distribution.merge({ 'LastModifiedTime' => Time.now.utc.iso8601 }).reject{ |k,v| k == 'ETag' }
             response
           else
-            Fog::CDN::AWS::Mock.error(:no_such_streaming_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_streaming_distribution)
           end
         end
       end

data/lib/fog/aws/service_mapper.rb

@@ -14,7 +14,7 @@ module Fog
           when :beanstalk
             Fog::AWS::ElasticBeanstalk
           when :cdn
-            Fog::CDN::AWS
+            Fog::AWS::CDN
           when :cloud_formation
             Fog::AWS::CloudFormation
           when :cloud_watch
@@ -126,4 +126,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "3.2.0"
+    VERSION = "3.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler