fog 0.10.0 → 0.11.0

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

@@ -0,0 +1,59 @@
+module Fog
+  module CDN
+    class AWS
+      class Real
+
+        require 'fog/cdn/parsers/aws/get_streaming_distribution_list'
+
+        # List information about distributions in CloudFront
+        #
+        # ==== Parameters
+        # * options<~Hash> - config arguments for list.  Defaults to {}.
+        #   * 'Marker'<~String> - limits object keys to only those that appear
+        #     lexicographically after its value.
+        #   * 'MaxItems'<~Integer> - limits number of object keys returned
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'IsTruncated'<~Boolean> - Whether or not the listing is truncated
+        #     * 'Marker'<~String> - Marker specified for query
+        #     * 'MaxItems'<~Integer> - Maximum number of keys specified for query
+        #     * 'NextMarker'<~String> - Marker to specify for next page (id of last result of current page)
+        #     * 'StreamingDistributionSummary'<~Array>:
+        #       * 'S3Origin'<~Hash>:
+        #         * 'DNSName'<~String> - origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'
+        #         * 'OriginAccessIdentity'<~String> - Optional: Used when serving private content
+        #       or
+        #       * 'CustomOrigin'<~Hash>:
+        #         * 'DNSName'<~String> - origin to associate with distribution, ie 'www.example.com'
+        #         * 'HTTPPort'<~Integer> - HTTP port of origin, in [80, 443] or (1024...65535)
+        #         * 'HTTPSPort'<~Integer> - HTTPS port of origin, in [80, 443] or (1024...65535)
+        #       * 'OriginProtocolPolicy'<~String> - Policy on using http vs https, in ['http-only', 'match-viewer']
+        #       * 'Comment'<~String> - comment associated with distribution
+        #       * 'CNAME'<~Array> - array of associated cnames
+        #       * 'Enabled'<~Boolean> - whether or not distribution is enabled
+        #       * 'Id'<~String> - Id of distribution
+        #       * 'LastModifiedTime'<~String> - Timestamp of last modification of distribution
+        #       * 'Origin'<~String> - s3 origin bucket
+        #       * 'Status'<~String> - Status of distribution
+        #       * 'TrustedSigners'<~Array> - trusted signers
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/ListStreamingDistributions.html
+
+        def get_streaming_distribution_list(options = {})
+          request({
+            :expects    => 200,
+            :idempotent => true,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::CDN::AWS::GetStreamingDistributionList.new,
+            :path       => "/streaming-distribution",
+            :query      => options
+          })
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,78 @@
+module Fog
+  module CDN
+    class AWS
+      class Real
+
+        require 'fog/cdn/parsers/aws/streaming_distribution'
+
+        # create a new streaming distribution in CloudFront
+        #
+        # ==== Parameters
+        # * options<~Hash> - config for distribution.  Defaults to {}.
+        #   REQUIRED:
+        #   * 'S3Origin'<~Hash>:
+        #     * 'DNSName'<~String> - origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'
+        #   OPTIONAL:
+        #   * 'CallerReference'<~String> - Used to prevent replay, defaults to Time.now.to_i.to_s
+        #   * 'Comment'<~String> - Optional comment about distribution
+        #   * 'CNAME'<~Array> - Optional array of strings to set as CNAMEs
+        #   * 'Enabled'<~Boolean> - Whether or not distribution should accept requests, defaults to true
+        #   * 'Logging'<~Hash>: Optional logging config
+        #     * 'Bucket'<~String> - Bucket to store logs in, ie 'mylogs.s3.amazonaws.com'
+        #     * 'Prefix'<~String> - Optional prefix for log filenames, ie 'myprefix/'
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'Id'<~String> - Id of distribution
+        #     * 'Status'<~String> - Status of distribution
+        #     * 'LastModifiedTime'<~String> - Timestamp of last modification of distribution
+        #     * 'DomainName'<~String>: Domain name of distribution
+        #     * 'StreamingDistributionConfig'<~Array>:
+        #       * 'CallerReference'<~String> - Used to prevent replay, defaults to Time.now.to_i.to_s
+        #       * 'CNAME'<~Array> - array of associated cnames
+        #       * 'Comment'<~String> - comment associated with distribution
+        #       * 'Enabled'<~Boolean> - whether or not distribution is enabled
+        #       * 'Logging'<~Hash>:
+        #         * 'Bucket'<~String> - bucket logs are stored in
+        #         * 'Prefix'<~String> - prefix logs are stored with
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/CreateStreamingDistribution.html
+
+        def post_streaming_distribution(options = {})
+          options['CallerReference'] = Time.now.to_i.to_s
+          data = '<?xml version="1.0" encoding="UTF-8"?>'
+          data << "<StreamingDistributionConfig xmlns=\"http://cloudfront.amazonaws.com/doc/#{@version}/\">"
+          for key, value in options
+            case value
+            when Array
+              for item in value
+                data << "<#{key}>#{item}</#{key}>"
+              end
+            when Hash
+              data << "<#{key}>"
+              for inner_key, inner_value in value
+                data << "<#{inner_key}>#{inner_value}</#{inner_key}>"
+              end
+              data << "</#{key}>"
+            else
+              data << "<#{key}>#{value}</#{key}>"
+            end
+          end
+          data << "</StreamingDistributionConfig>"
+          request({
+            :body       => data,
+            :expects    => 201,
+            :headers    => { 'Content-Type' => 'text/xml' },
+            :idempotent => true,
+            :method     => 'POST',
+            :parser     => Fog::Parsers::CDN::AWS::StreamingDistribution.new,
+            :path       => "/streaming-distribution"
+          })
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,83 @@
+module Fog
+  module CDN
+    class AWS
+      class Real
+
+        require 'fog/cdn/parsers/aws/streaming_distribution'
+
+        # update a streaming distribution in CloudFront
+        #
+        # ==== Parameters
+        # * distribution_id<~String> - Id of distribution to update config for
+        # * options<~Hash> - config for distribution.  Defaults to {}.
+        #   REQUIRED:
+        #   * 'S3Origin'<~Hash>:
+        #     * 'DNSName'<~String> - origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'
+        #   OPTIONAL:
+        #   * 'CallerReference'<~String> - Used to prevent replay, defaults to Time.now.to_i.to_s
+        #   * 'Comment'<~String> - Optional comment about distribution
+        #   * 'CNAME'<~Array> - Optional array of strings to set as CNAMEs
+        #   * 'Enabled'<~Boolean> - Whether or not distribution should accept requests, defaults to true
+        #   * 'Logging'<~Hash>: Optional logging config
+        #     * 'Bucket'<~String> - Bucket to store logs in, ie 'mylogs.s3.amazonaws.com'
+        #     * 'Prefix'<~String> - Optional prefix for log filenames, ie 'myprefix/'
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'DomainName'<~String>: Domain name of distribution
+        #     * 'Id'<~String> - Id of distribution
+        #     * 'LastModifiedTime'<~String> - Timestamp of last modification of distribution
+        #     * 'Status'<~String> - Status of distribution
+        #     * 'StreamingDistributionConfig'<~Array>:
+        #       * 'CallerReference'<~String> - Used to prevent replay, defaults to Time.now.to_i.to_s
+        #       * 'CNAME'<~Array> - array of associated cnames
+        #       * 'Comment'<~String> - comment associated with distribution
+        #       * 'Enabled'<~Boolean> - whether or not distribution is enabled
+        #       * 'Logging'<~Hash>:
+        #         * 'Bucket'<~String> - bucket logs are stored in
+        #         * 'Prefix'<~String> - prefix logs are stored with
+        #       * 'Origin'<~String> - s3 origin bucket
+        #       * 'TrustedSigners'<~Array> - trusted signers
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/PutStreamingDistribution.html
+
+        def put_streaming_distribution_config(distribution_id, etag, options = {})
+          data = '<?xml version="1.0" encoding="UTF-8"?>'
+          data << "<StreamingDistributionConfig xmlns=\"http://cloudfront.amazonaws.com/doc/#{@version}/\">"
+          for key, value in options
+            case value
+            when Array
+              for item in value
+                data << "<#{key}>#{item}</#{key}>"
+              end
+            when Hash
+              data << "<#{key}>"
+              for inner_key, inner_value in value
+                data << "<#{inner_key}>#{inner_value}</#{inner_key}>"
+              end
+              data << "</#{key}>"
+            else
+              data << "<#{key}>#{value}</#{key}>"
+            end
+          end
+          data << "</StreamingDistributionConfig>"
+          request({
+            :body       => data,
+            :expects    => 200,
+            :headers    => {
+              'Content-Type'  => 'text/xml',
+              'If-Match'      => etag
+            },
+            :idempotent => true,
+            :method     => 'PUT',
+            :parser     => Fog::Parsers::CDN::AWS::StreamingDistribution.new,
+            :path       => "/streaming-distribution/#{distribution_id}/config"
+          })
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute.rb

@@ -44,7 +44,7 @@ module Fog
       when :vcloud
         require 'fog/compute/vcloud'
         Fog::Vcloud::Compute.new(attributes)
-      when 'VirtualBox'
+      when :virtualbox
         require 'fog/compute/virtual_box'
         Fog::Compute::VirtualBox.new(attributes)
       when :voxel
@@ -55,9 +55,13 @@ module Fog
       end
     end
 
+    def self.providers
+      Fog.services[:compute]
+    end
+
     def self.servers
       servers = []
-      for provider in [:aws, :bluebox, :brightbox, :ecloud, :gogrid, :linode, :newservers, :ninefold, :rackspace, :slicehost, :stormondemand, :virtualbox, :voxel]
+      for provider in self.providers
         begin
           servers.concat(self[provider].servers)
         rescue # ignore any missing credentials/etc

data/lib/fog/compute/aws.rb

@@ -70,7 +70,8 @@ module Fog
       request :get_console_output
       request :get_password_data
       request :import_key_pair
-      request :modify_image_attributes
+      request :modify_image_attribute
+      request :modify_instance_attribute
       request :modify_snapshot_attribute
       request :purchase_reserved_instances_offering
       request :reboot_instances
@@ -85,6 +86,16 @@ module Fog
       request :monitor_instances
       request :unmonitor_instances
 
+      # deprecation
+      class Real
+
+        def modify_image_attributes(*params)
+          Formatador.display_line("[yellow][WARN] modify_image_attributes is deprecated, use modify_image_attribute instead[/] [light_black](#{caller.first})[/]")
+          modify_image_attribute(*params)
+        end
+
+      end
+
       class Mock
 
         def self.data

data/lib/fog/compute/brightbox.rb

@@ -97,17 +97,14 @@ module Fog
           @connection = Fog::Connection.new(@api_url)
         end
 
-        def request(params)
-          begin
-            get_oauth_token if @oauth_token.nil?
-            response = authenticated_request(params)
-          rescue Excon::Errors::Unauthorized => e
-            get_oauth_token
-            response = authenticated_request(params)
-          end
-          unless response.body.empty?
-            response = MultiJson.decode(response.body)
-          end
+        def request(method, url, expected_responses, options = nil)
+          request_options = {
+            :method   => method.to_s.upcase,
+            :path     => url,
+            :expects  => expected_responses
+          }
+          request_options[:body] = MultiJson.encode(options) unless options.nil?
+          make_request(request_options)
         end
 
         def account
@@ -135,9 +132,22 @@ module Fog
           return @oauth_token
         end
 
+        def make_request(params)
+          begin
+            get_oauth_token if @oauth_token.nil?
+            response = authenticated_request(params)
+          rescue Excon::Errors::Unauthorized => e
+            get_oauth_token
+            response = authenticated_request(params)
+          end
+          unless response.body.empty?
+            response = MultiJson.decode(response.body)
+          end
+        end
+
         def authenticated_request(options)
           headers = options[:headers] || {}
-          headers.merge!("Authorization" => "OAuth #{@oauth_token}")
+          headers.merge!("Authorization" => "OAuth #{@oauth_token}", "Content-Type" => "application/json")
           options[:headers] = headers
           @connection.request(options)
         end

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

@@ -13,6 +13,7 @@ module Fog
         attribute :description
         attribute :location,              :aliases => 'imageLocation'
         attribute :owner_id,              :aliases => 'imageOwnerId'
+        attribute :owner_alias,           :aliases => 'imageOwnerAlias'
         attribute :state,                 :aliases => 'imageState'
         attribute :type,                  :aliases => 'imageType'
         attribute :is_public,             :aliases => 'isPublic'
@@ -36,6 +37,10 @@ module Fog
           end
         end
 
+        def ready?
+          state == 'available'
+        end
+
       end
 
     end

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/compute/models/server'
 
 module Fog
   module Compute
     class AWS
 
-      class Server < Fog::Model
+      class Server < Fog::Compute::Server
         extend Fog::Deprecation
         deprecate :ip_address, :public_ip_address
 
@@ -25,6 +25,7 @@ module Fog
         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'
@@ -167,17 +168,29 @@ module Fog
 
           data = connection.run_instances(image_id, 1, 1, options)
           merge_attributes(data.body['instancesSet'].first)
+
+          if self.tags
+            for key, value in self.tags
+              connection.tags.create(
+                :key          => key,
+                :resource_id  => self.identity,
+                :value        => value
+              )
+            end
+          end
+
           true
         end
 
         def setup(credentials = {})
-          requires :identity, :public_ip_address, :username
+          requires :public_ip_address, :username
           require 'multi_json'
+          require 'net/ssh'
 
           commands = [
             %{mkdir .ssh},
             %{passwd -l #{username}},
-            %{echo "#{MultiJson.encode(attributes)}" >> ~/attributes.json}
+            %{echo "#{MultiJson.encode(Fog::JSON.sanitize(attributes))}" >> ~/attributes.json}
           ]
           if public_key
             commands << %{echo "#{public_key}" >> ~/.ssh/authorized_keys}
@@ -199,31 +212,15 @@ module Fog
           Fog::SSH.new(public_ip_address, username, credentials).run(commands)
         end
 
-        def ssh(commands)
-          requires :identity, :public_ip_address, :username
-
-          options = {}
-          options[:key_data] = [private_key] if private_key
-          Fog::SSH.new(public_ip_address, username, options).run(commands)
-        end
-
-        def scp(local_path, remote_path, upload_options = {})
-          requires :public_ip_address, :username
-
-          scp_options = {}
-          scp_options[:key_data] = [private_key] if private_key
-          Fog::SCP.new(public_ip_address, username, scp_options).upload(local_path, remote_path, upload_options)
-        end
-
         def start
           requires :id
           connection.start_instances(id)
           true
         end
 
-        def stop
+        def stop(force = false)
           requires :id
-          connection.stop_instances(id)
+          connection.stop_instances(id, force)
           true
         end
 

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

@@ -10,7 +10,7 @@ module Fog
 
         attribute :value
         attribute :resource_id,           :aliases => 'resourceId'
-        attribute :resource_type,         :aliases => 'resourceType'        
+        attribute :resource_type,         :aliases => 'resourceType'
 
         def initialize(attributes = {})
           super

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

@@ -1,4 +1,4 @@
-require 'fog/core/model'
+require 'fog/compute/models/server'
 
 module Fog
   module Compute
@@ -6,7 +6,7 @@ module Fog
 
       class BlockInstantiationError < StandardError; end
 
-      class Server < Fog::Model
+      class Server < Fog::Compute::Server
 
         identity :id
 
@@ -120,22 +120,6 @@ module Fog
           retry
         end
 
-        def ssh(commands)
-          requires :identity, :ips, :username
-
-          options = {}
-          options[:key_data] = [private_key] if private_key
-          Fog::SSH.new(public_ip_address, username, options).run(commands)
-        end
-
-        def scp(local_path, remote_path, upload_options = {})
-          requires :ips, :username
-
-          scp_options = {}
-          scp_options[:key_data] = [private_key] if private_key
-          Fog::SCP.new(public_ip_address, username, scp_options).upload(local_path, remote_path, upload_options)
-        end
-
         def username
           @username ||= 'deploy'
         end