fog-aws 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e0d4cac4894ba3bccfd3df9686c95311418cfb5
-  data.tar.gz: 7e8b47035280cc888f00521d79760b1a22bb4326
+  metadata.gz: 53e5c13a8cdab463ca2f7e696ce8f6be7a28e6b7
+  data.tar.gz: 7c0b522b66731d66b8374cf1cf8d8c8cba679d57
 SHA512:
-  metadata.gz: 7e9e38a21257953f72fabc2a5cd3188523ad55c9f646a55f560aad3e441b546833f3866102050ca7f879fba2abfb1e6849a4bfd47edf229def8c6912a4b6baf3
-  data.tar.gz: 755a06be0f463c4ff0be9bc4b08598b6035401f793a1bb5aa1014067cf89bff0a06c7d7879a833b289d2fd1575274dbc8539d56ef79b49e477e985f1e7bd55d5
+  metadata.gz: 5c93b6c6b2d5013370a4277bd28002c5b357af8d28846f21c1c44147a1ec4773e15c4ab047795ee5fd718755b66ad153db597be569cbe33e043c930e599e9f01
+  data.tar.gz: 174a539d140553b296d6ef4beb68f792f6f02a67ca3c17a7d25a76c7d1038aade3807ec7efb7be7e1bb0c479c010ad5e790a9e396bd7fec7895d73de4c620c9e

data/lib/fog/aws.rb

@@ -36,6 +36,7 @@ module Fog
     autoload :CloudWatch,       File.expand_path('../aws/cloud_watch', __FILE__)
     autoload :DataPipeline,     File.expand_path('../aws/data_pipeline', __FILE__)
     autoload :DynamoDB,         File.expand_path('../aws/dynamodb', __FILE__)
+    autoload :ECS,              File.expand_path('../aws/ecs', __FILE__)
     autoload :ELB,              File.expand_path('../aws/elb', __FILE__)
     autoload :EMR,              File.expand_path('../aws/emr', __FILE__)
     autoload :ElasticBeanstalk, File.expand_path('../aws/beanstalk', __FILE__)
@@ -62,6 +63,7 @@ module Fog
     service(:dns,             'DNS')
     service(:dynamodb,        'DynamoDB')
     service(:elasticache,     'Elasticache')
+    service(:ecs,             'ECS')
     service(:elb,             'ELB')
     service(:emr,             'EMR')
     service(:federation,      'Federation')

data/lib/fog/aws/ecs.rb

@@ -0,0 +1,187 @@
+module Fog
+  module AWS
+    class ECS < Fog::Service
+
+      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, :version, :instrumentor, :instrumentor_name
+
+      request_path 'fog/aws/requests/ecs'
+      request :list_clusters
+      request :create_cluster
+      request :delete_cluster
+      request :describe_clusters
+
+      request :list_task_definitions
+      request :describe_task_definition
+      request :deregister_task_definition
+      request :register_task_definition
+      request :list_task_definition_families
+
+      request :list_services
+      request :describe_services
+      request :create_service
+      request :delete_service
+      request :update_service
+
+      request :list_container_instances
+      request :describe_container_instances
+      request :deregister_container_instance
+
+      request :list_tasks
+      request :describe_tasks
+      request :run_task
+      request :start_task
+      request :stop_task
+
+      class Real
+        attr_reader :region
+
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
+        # Initialize connection to ECS
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   ecs = ECS.new(
+        #    :aws_access_key_id => your_aws_access_key_id,
+        #    :aws_secret_access_key => your_aws_secret_access_key
+        #   )
+        #
+        # ==== Parameters
+        # * options<~Hash> - config arguments for connection.  Defaults to {}.
+        #   * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1' and etc.
+        #
+        # ==== Returns
+        # * ECS object with connection to AWS.
+        def initialize(options={})
+          @use_iam_profile = options[:use_iam_profile]
+          @instrumentor       = options[:instrumentor]
+          @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.ecs'
+          @connection_options     = options[:connection_options] || {}
+
+          @region     = options[:region]      || 'us-east-1'
+          @host       = options[:host]        || "ecs.#{@region}.amazonaws.com"
+          @path       = options[:path]        || '/'
+          @persistent = options[:persistent]  || false
+          @port       = options[:port]        || 443
+          @scheme     = options[:scheme]      || 'https'
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @version    = options[:version] || '2014-11-13'
+
+          setup_credentials(options)
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        private
+
+        def setup_credentials(options)
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token     = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key,@region,'ecs')
+        end
+
+        def request(params)
+          refresh_credentials_if_expired
+
+          idempotent  = params.delete(:idempotent)
+          parser      = params.delete(:parser)
+
+          body, headers = Fog::AWS.signed_params_v4(
+            params,
+            {'Content-Type' => 'application/x-www-form-urlencoded' },
+            {
+              :aws_session_token  => @aws_session_token,
+              :signer             => @signer,
+              :host               => @host,
+              :path               => @path,
+              :port               => @port,
+              :version            => @version,
+              :method             => 'POST'
+            }
+          )
+
+          if @instrumentor
+            @instrumentor.instrument("#{@instrumentor_name}.request", params) do
+              _request(body, headers, idempotent, parser)
+            end
+          else
+            _request(body, headers, idempotent, parser)
+          end
+        end
+
+        def _request(body, headers, idempotent, parser)
+          @connection.request({
+            :body       => body,
+            :expects    => 200,
+            :headers    => headers,
+            :idempotent => idempotent,
+            :method     => 'POST',
+            :parser     => parser
+          })
+        rescue Excon::Errors::HTTPStatusError => error
+          match = Fog::AWS::Errors.match_error(error)
+          raise if match.empty?
+          raise case match[:code]
+                when 'NotFound'
+                  Fog::AWS::ECS::NotFound.slurp(error, match[:message])
+                else
+                  Fog::AWS::ECS::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
+                end
+        end
+      end
+
+      class Mock
+        def self.data
+          @data ||= Hash.new do |hash, region|
+            hash[region] = Hash.new do |region_hash, key|
+              region_hash[key] = {
+                :clusters => [],
+                :task_definitions => [],
+                :services => [],
+                :container_instances => [],
+                :tasks => []
+              }
+            end
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        attr_accessor :region
+
+        def initialize(options={})
+          @use_iam_profile = options[:use_iam_profile]
+          @region          = options[:region] || 'us-east-1'
+
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
+            raise ArgumentError, "Unknown region: #{@region.inspect}"
+          end
+
+          setup_credentials(options)
+        end
+
+        def data
+          self.class.data[@region][@aws_access_key_id]
+        end
+
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+        end
+
+        def setup_credentials(options)
+          @aws_access_key_id = options[:aws_access_key_id]
+        end
+      end
+    end
+  end
+end

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

@@ -44,6 +44,16 @@ module Fog
           :ebs_optimized_available => false,
           :instance_store_volumes  => 0
         },
+        {
+          :id                      => 't2.large',
+          :name                    => 'Micro Instance',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 8192,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 0
+        },
         {
           :id                      => 'm1.small',
           :name                    => 'Small Instance',

data/lib/fog/aws/parsers/ecs/base.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Parsers
+    module AWS
+      module ECS
+        # Base parser for ResponseMetadata, RequestId
+        class Base < Fog::Parsers::Base
+          def reset
+            super
+            @response = {'ResponseMetadata' => {}}
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/ecs/container_instance.rb

@@ -0,0 +1,75 @@
+module Fog
+  module Parsers
+    module AWS
+      module ECS
+        require 'fog/aws/parsers/ecs/base'
+
+        class ContainerInstance < Fog::Parsers::AWS::ECS::Base
+          def start_element(name, attrs = [])
+            super
+            if @contexts.include?(name)
+              @context.push(name)
+            end
+          end
+
+          def end_element(name)
+            super
+            case name
+            when 'stringSetValue'
+              @context.pop
+              case @context.last
+              when 'remainingResources'
+                @remaining_resource[name] = @string_set
+              when 'registeredResources'
+                @registered_resource[name] = @string_set
+              end
+              @string_set = []
+            when *@contexts
+              @context.pop
+            when 'member'
+              case @context.last
+              when 'remainingResources'
+                @container_instance['remainingResources'] ||= []
+                @container_instance['remainingResources'] << @remaining_resource
+                @remaining_resource = {}
+              when 'registeredResources'
+                @container_instance['registeredResources'] ||= []
+                @container_instance['registeredResources'] << @registered_resource
+                @registered_resource = {}
+              when 'stringSetValue'
+                @string_set << value.to_i
+              end
+            when 'longValue', 'integerValue'
+              case @context.last
+              when 'remainingResources'
+                @remaining_resource[name] = value.to_i
+              when 'registeredResources'
+                @registered_resource[name] = value.to_i
+              end
+            when 'doubleValue'
+              case @context.last
+              when 'remainingResources'
+                @remaining_resource[name] = value.to_f
+              when 'registeredResources'
+                @registered_resource[name] = value.to_f
+              end
+            when 'name', 'type'
+              case @context.last
+              when 'remainingResources'
+                @remaining_resource[name] = value
+              when 'registeredResources'
+                @registered_resource[name] = value
+              end
+            when 'agentConnected'
+              @container_instance[name] = value == 'true'
+            when 'runningTasksCount', 'pendingTasksCount'
+              @container_instance[name] = value.to_i
+            when 'status', 'containerInstanceArn', 'ec2InstanceId'
+              @container_instance[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/ecs/create_cluster.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Parsers
+    module AWS
+      module ECS
+        require 'fog/aws/parsers/ecs/base'
+
+        class CreateCluster < Fog::Parsers::AWS::ECS::Base
+          def reset
+            super
+            @result = 'CreateClusterResult'
+            @response[@result] = {}
+            @cluster = {}
+          end
+
+          def end_element(name)
+            super
+            case name
+            when 'clusterName', 'clusterArn', 'status'
+              @cluster[name] = value
+            when 'registeredContainerInstancesCount', 'runningTasksCount', 'pendingTasksCount'
+              @cluster[name] = value.to_i
+            when 'cluster'
+              @response[@result]['cluster'] = @cluster
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/ecs/create_service.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Parsers
+    module AWS
+      module ECS
+        require 'fog/aws/parsers/ecs/service'
+
+        class CreateService < Fog::Parsers::AWS::ECS::Service
+          def reset
+            super
+            @result = 'CreateServiceResult'
+            @response[@result] = {}
+            @contexts = %w(service loadBalancers events deployments)
+            @service       = {}
+            @context       = []
+            @deployment    = {}
+            @load_balancer = {}
+            @event         = {}
+          end
+
+          def end_element(name)
+            super
+            case name
+            when 'service'
+              @response[@result]['service'] = @service
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/ecs/delete_cluster.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Parsers
+    module AWS
+      module ECS
+        require 'fog/aws/parsers/ecs/base'
+
+        class DeleteCluster < Fog::Parsers::AWS::ECS::Base
+          def reset
+            super
+            @result = 'DeleteClusterResult'
+            @response[@result] = {}
+            @cluster = {}
+          end
+
+          def end_element(name)
+            super
+            case name
+            when 'clusterName', 'clusterArn', 'status'
+              @cluster[name] = value
+            when 'registeredContainerInstancesCount', 'runningTasksCount', 'pendingTasksCount'
+              @cluster[name] = value.to_i
+            when 'cluster'
+              @response[@result]['cluster'] = @cluster
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/ecs/delete_service.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Parsers
+    module AWS
+      module ECS
+        require 'fog/aws/parsers/ecs/service'
+
+        class DeleteService < Fog::Parsers::AWS::ECS::Service
+          def reset
+            super
+            @result = 'DeleteServiceResult'
+            @response[@result] = {}
+            @contexts = %w(service loadBalancers events deployments)
+            @service       = {}
+            @context       = []
+            @deployment    = {}
+            @load_balancer = {}
+            @event         = {}
+          end
+
+          def end_element(name)
+            super
+            case name
+            when 'service'
+              @response[@result]['service'] = @service
+            end
+          end
+        end
+      end
+    end
+  end
+end