fog-aws 0.13.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: badc87e616be93da06befa9fd46e268c422729db
-  data.tar.gz: 35e964f02dbd63c4b6911fca95bf53e72fffa4b1
+  metadata.gz: b81ad3bfcfe0482650342c825be51289c0530ab5
+  data.tar.gz: 72f9f0dfc281ec1454f318a43d148bd049b68b21
 SHA512:
-  metadata.gz: a6ca15f2dcb849b4f9a1bdf89fe9c22b9b69c5e8f916223f75158cf70adab53bbe70d3bff1b782823d022173b56e5a4b94cf3dfadc1d1815b52625406ba9ea5b
-  data.tar.gz: 87078c05b1e205f2230cb37b60cc65c57db0b694969bb88bb757d5b5c0127f77f900e79cf035ce392632843d49b11dfaf81fae8a3ba1b93f068d09bc89f8a178
+  metadata.gz: 9a06e4f197b2cdc74e01d4e3b975fcfc696b44c09fd82e2ffef77e35b84697a6b9afcdfb271f68ecb7d7a3b0326d7f0898742a2ca0d58d6f120e371e5cc12266
+  data.tar.gz: eb2936873d29e923a8a9e9b66d0fa3aba653c185332c0ee733ccecf44d29db09911b22c7be59d4a8b9aa7dfa208bad09ea3d3418a5ef2103fa8c79dad0a5b1eb

data/CHANGELOG.md

@@ -2,7 +2,17 @@
 
 ## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v0.12.0...HEAD)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v0.13.0...HEAD)
+
+**Merged pull requests:**
+
+- fix host header with another port on s3 [\#327](https://github.com/fog/fog-aws/pull/327) ([rodrigoapereira](https://github.com/rodrigoapereira))
+- Add new t2.xlarge, t2.2xlarge and r4 class instances. [\#326](https://github.com/fog/fog-aws/pull/326) ([rogersd](https://github.com/rogersd))
+- Fix the bug that can't create fifo queue in SQS. [\#323](https://github.com/fog/fog-aws/pull/323) ([ebihara99999](https://github.com/ebihara99999))
+- data pipeline mocks [\#318](https://github.com/fog/fog-aws/pull/318) ([ehowe](https://github.com/ehowe))
+
+## [v0.13.0](https://github.com/fog/fog-aws/tree/v0.13.0) (2016-11-29)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v0.12.0...v0.13.0)
 
 **Closed issues:**
 

data/lib/fog/aws/data_pipeline.rb

@@ -9,6 +9,7 @@ module Fog
       request_path 'fog/aws/requests/data_pipeline'
       request :activate_pipeline
       request :create_pipeline
+      request :deactivate_pipeline
       request :delete_pipeline
       request :describe_pipelines
       request :list_pipelines
@@ -22,8 +23,58 @@ module Fog
       collection  :pipelines
 
       class Mock
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
+
+        def self.data
+          @data ||= Hash.new do |hash, region|
+            hash[region] = Hash.new do |region_hash, key|
+              region_hash[key] = {
+                :pipelines            => {},
+                :pipeline_definitions => {},
+              }
+            end
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def data
+          self.class.data[@region][@aws_access_key_id]
+        end
+
+        def reset
+          self.class.reset
+        end
+
+        attr_accessor :region
+
         def initialize(options={})
-          Fog::Mock.not_implemented
+          @region                = options[:region] || "us-east-1"
+          @aws_access_key_id     = options[:aws_access_key_id]
+          @aws_secret_access_key = options[:aws_secret_access_key]
+        end
+
+        def stringify_keys(object)
+          case object
+          when Hash
+            object.inject({}) { |h,(k,v)| h[k.to_s] = stringify_keys(v); h }
+          when Array
+            object.map { |v| stringify_keys(v) }
+          else
+            object
+          end
+        end
+
+        def find_pipeline(id)
+          pipeline = self.data[:pipelines].values.detect { |p| p["pipelineId"] == id }
+
+          if pipeline.nil? || pipeline[:deleted]
+            raise Fog::AWS::DataPipeline::NotFound.new("Pipeline with id: #{id} does not exist")
+          end
+
+          pipeline
         end
       end
 
@@ -116,7 +167,19 @@ module Fog
         end
 
         def _request(params)
-          @connection.request(params)
+          response = @connection.request(params)
+
+          unless response.body.empty?
+            response.body = Fog::JSON.decode(response.body)
+          end
+
+          response
+        rescue Excon::Error::BadRequest => error
+          match = Fog::AWS::Errors.match_error(error)
+          raise if match.empty?
+          if %w(PipelineNotFoundException PipelineDeletedException).include?(match[:code])
+            raise Fog::AWS::DataPipeline::NotFound.slurp(error, match[:message])
+          end
         end
       end
     end

data/lib/fog/aws/mock.rb

@@ -170,6 +170,10 @@ module Fog
         "sir-#{Fog::Mock.random_letters_and_numbers(8)}"
       end
 
+      def self.data_pipeline_id
+        "df-#{Fog::Mock.random_letters_and_numbers(19).capitalize}"
+      end
+
       def self.spot_product_descriptions
         [
           'Linux/UNIX',

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

@@ -54,6 +54,26 @@ module Fog
           :ebs_optimized_available => false,
           :instance_store_volumes  => 0
         },
+        {
+          :id                      => 't2.xlarge',
+          :name                    => 'Micro Instance',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 0,
+          :ram                     => 16384,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 't2.2xlarge',
+          :name                    => 'Micro Instance',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 0,
+          :ram                     => 32768,
+          :ebs_optimized_available => false,
+          :instance_store_volumes  => 0
+        },
         {
           :id                      => 'm1.small',
           :name                    => 'Small Instance',
@@ -95,7 +115,7 @@ module Fog
           :instance_store_volumes  => 4
         },
         {
-          :id                      =>  'c1.medium',
+          :id                      => 'c1.medium',
           :bits                    => 32,
           :cores                   => 5,
           :disk                    => 350,
@@ -255,7 +275,7 @@ module Fog
           :instance_store_volumes  => 1
         },
         {
-          :id                      =>  'm2.2xlarge',
+          :id                      => 'm2.2xlarge',
           :name                    => 'High Memory Double Extra Large',
           :bits                    => 64,
           :cores                   => 13,
@@ -328,7 +348,7 @@ module Fog
           :id                      => "hi1.4xlarge",
           :name                    => "High I/O Quadruple Extra Large Instance",
           :bits                    => 64,
-          :cores                   =>   35,
+          :cores                   =>  35,
           :disk                    => 2048,
           :ram                     => 61952,
           :ebs_optimized_available => false,
@@ -411,7 +431,7 @@ module Fog
           :cores                   => 2,
           :ram                     => 15616,
           :disk                    => 32,
-          :ebs_optimized_available => true,
+          :ebs_optimized_available => false,
           :instance_store_volumes  => 1
         },
         {
@@ -454,6 +474,66 @@ module Fog
           :ebs_optimized_available => false,
           :instance_store_volumes  => 2
         },
+        {
+          :id                      => "r4.large",
+          :name                    => "R4 Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 15616,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r4.xlarge",
+          :name                    => "R4 Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 31232,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r4.2xlarge",
+          :name                    => "R4 Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 62464,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r4.4xlarge",
+          :name                    => "R4 Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 124928,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r4.8xlarge",
+          :name                    => "R4 Eight Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 249856,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "r4.16xlarge",
+          :name                    => "R4 Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 32,
+          :ram                     => 499712,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
         {
           :id                      => "d2.xlarge",
           :name                    => "D2 Extra Large",

data/lib/fog/aws/requests/data_pipeline/activate_pipeline.rb

@@ -14,16 +14,20 @@ module Fog
 
           response = request({
             :body => Fog::JSON.encode(params),
-            :headers => { 'X-Amz-Target' => 'DataPipeline.ActivatePipeline' },
+            :headers => { 'X-Amz-Target' => 'DataPipeline.ActivatePipeline' }
           })
-
-          Fog::JSON.decode(response.body)
         end
       end
 
       class Mock
         def activate_pipeline(id)
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+
+          pipeline = find_pipeline(id)
+          pipeline[:active] = true
+
+          response.body = {}
+          response
         end
       end
     end

data/lib/fog/aws/requests/data_pipeline/create_pipeline.rb

@@ -24,14 +24,35 @@ module Fog
             :body => Fog::JSON.encode(params),
             :headers => { 'X-Amz-Target' => 'DataPipeline.CreatePipeline' },
           })
-
-          Fog::JSON.decode(response.body)
         end
       end
 
       class Mock
         def create_pipeline(unique_id, name, description=nil, tags=nil)
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+
+          if existing_pipeline = self.data[:pipelines][unique_id]
+            {"pipelineId" => existing_pipeline["pipelineId"]}
+          else
+            pipeline_id = Fog::AWS::Mock.data_pipeline_id
+            mapped_tags = if tags
+                            tags.map { |k,v| {"key" => k.to_s, "value" => v.to_s}}
+                          else
+                            []
+                          end
+
+            pipeline = {
+              "name"        => name,
+              "description" => description,
+              "fields"      => mapped_tags,
+              "pipelineId"  => pipeline_id,
+            }
+
+            self.data[:pipelines][unique_id] = pipeline
+
+            response.body = {"pipelineId" => pipeline_id}
+          end
+          response
         end
       end
     end

data/lib/fog/aws/requests/data_pipeline/deactivate_pipeline.rb

@@ -0,0 +1,36 @@
+module Fog
+  module AWS
+    class DataPipeline
+      class Real
+        # Activate a pipeline
+        # http://docs.aws.amazon.com/datapipeline/latest/APIReference/API_DectivatePipeline.html
+        # ==== Parameters
+        # * PipelineId <~String> - The ID of the pipeline to activate
+        # ' cancelActive <~Boolean> - Indicates whether to cancel any running objects. The default is true, which sets the state of any running objects to CANCELED. If this value is false, the pipeline is deactivated after all running objects finish.
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def deactivate_pipeline(id, cancel_active=true)
+          params = { 'pipelineId' => id, 'cancelActive' => cancel_active }
+
+          response = request({
+            :body => Fog::JSON.encode(params),
+            :headers => { 'X-Amz-Target' => 'DataPipeline.DectivatePipeline' }
+          })
+        end
+      end
+
+      class Mock
+        def deactivate_pipeline(id, cancel_active=true)
+          response = Excon::Response.new
+
+          pipeline = find_pipeline(id)
+          pipeline[:active] = false
+
+          response.body = {}
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/data_pipeline/delete_pipeline.rb

@@ -22,7 +22,12 @@ module Fog
 
       class Mock
         def delete_pipeline(id)
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+
+          pipeline = find_pipeline(id)
+          pipeline[:deleted] = true
+
+          true
         end
       end
     end

data/lib/fog/aws/requests/data_pipeline/describe_objects.rb

@@ -23,14 +23,28 @@ module Fog
             :body => Fog::JSON.encode(params),
             :headers => { 'X-Amz-Target' => 'DataPipeline.DescribeObjects' },
           })
-
-          Fog::JSON.decode(response.body)
         end
       end
 
       class Mock
         def describe_objects(id, objects, options={})
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+
+          find_pipeline(id)
+
+          pipeline_objects = self.data[:pipeline_definitions][id]["pipelineObjects"].select { |o| objects.include?(o["id"]) }
+
+          response.body = {
+            "hasMoreResults"  => false,
+            "marker"          => options[:marker],
+            "pipelineObjects" => [
+              {
+                "fields" => pipeline_objects
+              }
+            ]
+          }
+
+          response
         end
       end
     end

data/lib/fog/aws/requests/data_pipeline/describe_pipelines.rb

@@ -17,14 +17,14 @@ module Fog
             :body => Fog::JSON.encode(params),
             :headers => { 'X-Amz-Target' => 'DataPipeline.DescribePipelines' },
           })
-
-          Fog::JSON.decode(response.body)
         end
       end
 
       class Mock
         def describe_pipelines(ids)
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          response.body = {"pipelineDescriptionList" => self.data[:pipelines].values.select { |p| !p[:deleted] && ids.include?(p["pipelineId"]) } }
+          response
         end
       end
     end

data/lib/fog/aws/requests/data_pipeline/get_pipeline_definition.rb

@@ -18,14 +18,17 @@ module Fog
             :body => Fog::JSON.encode(params),
             :headers => { 'X-Amz-Target' => 'DataPipeline.GetPipelineDefinition' },
           })
-
-          Fog::JSON.decode(response.body)
         end
       end
 
       class Mock
-        def get_pipeline_definition(id, objects)
-          Fog::Mock.not_implemented
+        def get_pipeline_definition(id)
+          response = Excon::Response.new
+
+          pipeline = find_pipeline(id)
+
+          response.body = self.data[:pipeline_definitions][id] || {"pipelineObjects" => []}
+          response
         end
       end
     end

data/lib/fog/aws/requests/data_pipeline/list_pipelines.rb

@@ -17,14 +17,14 @@ module Fog
             :body => Fog::JSON.encode(params),
             :headers => { 'X-Amz-Target' => 'DataPipeline.ListPipelines' },
           })
-
-          Fog::JSON.decode(response.body)
         end
       end
 
       class Mock
         def list_pipelines(options={})
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          response.body = {"pipelineIdList" => self.data[:pipelines].values.map { |p| {"id" => p["pipelineId"], "name" => p["name"]} } }
+          response
         end
       end
     end

data/lib/fog/aws/requests/data_pipeline/put_pipeline_definition.rb

@@ -1,35 +1,7 @@
 module Fog
   module AWS
     class DataPipeline
-      class Real
-        # Put raw pipeline definition JSON
-        # http://docs.aws.amazon.com/datapipeline/latest/APIReference/API_PutPipelineDefinition.html
-        # ==== Parameters
-        # * PipelineId <~String> - The ID of the pipeline
-        # * PipelineObjects <~String> - Objects in the pipeline
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        def put_pipeline_definition(id, objects)
-          params = {
-            'pipelineId' => id,
-            'pipelineObjects' => transform_objects(objects),
-          }
-
-          response = request({
-            :body => Fog::JSON.encode(params),
-            :headers => { 'X-Amz-Target' => 'DataPipeline.PutPipelineDefinition' },
-          })
-
-          Fog::JSON.decode(response.body)
-        end
-
-        # Take a list of pipeline object hashes as specified in the Data Pipeline JSON format
-        # and transform it into the format expected by the API
-        def transform_objects(objects)
-          objects.map { |object| JSONObject.new(object).to_api }
-        end
-
+      module Shared
         class JSONObject
           def initialize(object)
             @json_fields = object.clone
@@ -53,7 +25,7 @@ module Fog
 
           def field_for_kv(key, value)
             if value.is_a?(Hash)
-              { 'key' => key, 'refValue' => value['ref'] }
+              { 'key' => key, 'refValue' => value['ref'], 'stringValue' => value['stringValue'] }
 
             elsif value.is_a?(Array)
               value.map { |subvalue| field_for_kv(key, subvalue) }
@@ -64,11 +36,60 @@ module Fog
             end
           end
         end
+
+        # Take a list of pipeline object hashes as specified in the Data Pipeline JSON format
+        # and transform it into the format expected by the API
+        def transform_objects(objects)
+          objects.map { |object| JSONObject.new(object).to_api }
+        end
+      end
+
+      class Real
+        include Shared
+        # Put raw pipeline definition JSON
+        # http://docs.aws.amazon.com/datapipeline/latest/APIReference/API_PutPipelineDefinition.html
+        # ==== Parameters
+        # * PipelineId <~String> - The ID of the pipeline
+        # * PipelineObjects <~String> - Objects in the pipeline
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def put_pipeline_definition(id, pipeline_objects, options={})
+          params = {
+            'pipelineId' => id,
+            'pipelineObjects' => transform_objects(pipeline_objects),
+          }.merge(options)
+
+          response = request({
+            :body => Fog::JSON.encode(params),
+            :headers => { 'X-Amz-Target' => 'DataPipeline.PutPipelineDefinition' },
+          })
+        end
       end
 
       class Mock
-        def put_pipeline_definition(id, objects)
-          Fog::Mock.not_implemented
+        include Shared
+
+        def put_pipeline_definition(id, pipeline_objects, _options={})
+          response = Excon::Response.new
+          options  = _options.dup
+
+          pipeline = find_pipeline(id)
+
+          stringified_objects = if pipeline_objects.any?
+                                  transform_objects(stringify_keys(pipeline_objects))
+                                else
+                                  options.each { |k,v| options[k] = transform_objects(stringify_keys(v)) }
+                                end
+
+          if stringified_objects.is_a?(Array)
+            stringified_objects = {"pipelineObjects" => stringified_objects}
+          end
+
+          self.data[:pipeline_definitions][id] = stringified_objects
+
+          response.body = {"errored" => false, "validationErrors" => [], "validationWarnings" => []}
+          response
         end
       end
     end

data/lib/fog/aws/requests/data_pipeline/query_objects.rb

@@ -23,14 +23,17 @@ module Fog
             :body => Fog::JSON.encode(params),
             :headers => { 'X-Amz-Target' => 'DataPipeline.QueryObjects' },
           })
-
-          Fog::JSON.decode(response.body)
         end
       end
 
       class Mock
         def query_objects(id, sphere, options={})
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+
+          find_pipeline(id)
+
+          response.body = {"hasMoreResults" => false, "ids" => ["Default"]}
+          response
         end
       end
     end

data/lib/fog/aws/sqs.rb

@@ -128,7 +128,7 @@ module Fog
               :host               => @host,
               :path               => path || @path,
               :port               => @port,
-              :version            => '2009-02-01'
+              :version            => '2012-11-05'
             }
           )
 

data/lib/fog/aws/storage.rb

@@ -190,6 +190,7 @@ module Fog
 
           params = request_params(params)
           params[:headers][:host] = params[:host]
+          params[:headers][:host] += ":#{params[:port]}" if params.fetch(:port, nil)
 
           signature_query_params = @signer.signature_parameters(params, now, "UNSIGNED-PAYLOAD")
           params[:query] = (params[:query] || {}).merge(signature_query_params)

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "0.13.0"
+    VERSION = "1.0.0"
   end
 end

data/tests/requests/data_pipeline/helper.rb

@@ -35,9 +35,13 @@ class AWS
         "marker" => Fog::Nullable::String,
         "pipelineObjects" => [
           {
-            'id' => String,
-            'name' => String,
-            'fields' => FIELDS,
+            "fields" => [
+              {
+                'id' => String,
+                'name' => String,
+                'fields' => FIELDS,
+              }
+            ]
           }
         ]
       }
@@ -65,7 +69,9 @@ class AWS
             "name" => String,
             "fields" => FIELDS,
           }
-        ]
+        ],
+        "parameterObjects" => Fog::Nullable::Array,
+        "parameterValues" => Fog::Nullable::Array,
       }
     end
   end

data/tests/requests/data_pipeline/pipeline_tests.rb

@@ -1,6 +1,4 @@
 Shindo.tests('AWS::DataPipeline | pipeline_tests', ['aws', 'data_pipeline']) do
-  pending if Fog.mocking?
-
   @pipeline_id = nil
 
   tests('success') do
@@ -9,18 +7,18 @@ Shindo.tests('AWS::DataPipeline | pipeline_tests', ['aws', 'data_pipeline']) do
       name = 'fog-test-pipeline-name'
       description = 'Fog test pipeline'
 
-      result = Fog::AWS[:data_pipeline].create_pipeline(unique_id, name, description, {})
+      result = Fog::AWS[:data_pipeline].create_pipeline(unique_id, name, description, {}).body
       @pipeline_id = result['pipelineId']
       result
     end
 
     tests("#list_pipelines").formats(AWS::DataPipeline::Formats::LIST_PIPELINES) do
-      Fog::AWS[:data_pipeline].list_pipelines()
+      Fog::AWS[:data_pipeline].list_pipelines.body
     end
 
     tests("#describe_pipelines").formats(AWS::DataPipeline::Formats::DESCRIBE_PIPELINES) do
       ids = [@pipeline_id]
-      Fog::AWS[:data_pipeline].describe_pipelines(ids)
+      Fog::AWS[:data_pipeline].describe_pipelines(ids).body
     end
 
     tests("#put_pipeline_definition").formats(AWS::DataPipeline::Formats::PUT_PIPELINE_DEFINITION) do
@@ -39,35 +37,39 @@ Shindo.tests('AWS::DataPipeline | pipeline_tests', ['aws', 'data_pipeline']) do
         },
       ]
 
-      Fog::AWS[:data_pipeline].put_pipeline_definition(@pipeline_id, objects)
+      Fog::AWS[:data_pipeline].put_pipeline_definition(@pipeline_id, objects).body
     end
 
     tests("#activate_pipeline") do
       Fog::AWS[:data_pipeline].activate_pipeline(@pipeline_id)
     end
 
+    tests("#deactivate_pipeline") do
+      Fog::AWS[:data_pipeline].activate_pipeline(@pipeline_id)
+    end
+
     tests("#get_pipeline_definition").formats(AWS::DataPipeline::Formats::GET_PIPELINE_DEFINITION) do
-      Fog::AWS[:data_pipeline].get_pipeline_definition(@pipeline_id)
+      Fog::AWS[:data_pipeline].get_pipeline_definition(@pipeline_id).body
     end
 
     tests("#query_objects") do
       tests("for COMPONENTs").formats(AWS::DataPipeline::Formats::QUERY_OBJECTS) do
-        Fog::AWS[:data_pipeline].query_objects(@pipeline_id, 'COMPONENT')
+        Fog::AWS[:data_pipeline].query_objects(@pipeline_id, 'COMPONENT').body
       end
 
       tests("for INSTANCEs").formats(AWS::DataPipeline::Formats::QUERY_OBJECTS) do
-        Fog::AWS[:data_pipeline].query_objects(@pipeline_id, 'INSTANCE')
+        Fog::AWS[:data_pipeline].query_objects(@pipeline_id, 'INSTANCE').body
       end
 
       tests("for ATTEMPTs").formats(AWS::DataPipeline::Formats::QUERY_OBJECTS) do
-        Fog::AWS[:data_pipeline].query_objects(@pipeline_id, 'ATTEMPT')
+        Fog::AWS[:data_pipeline].query_objects(@pipeline_id, 'ATTEMPT').body
       end
     end
 
     tests('#describe_objects').formats(AWS::DataPipeline::Formats::DESCRIBE_OBJECTS) do
-      attempts = Fog::AWS[:data_pipeline].query_objects(@pipeline_id, 'ATTEMPT')
+      attempts = Fog::AWS[:data_pipeline].query_objects(@pipeline_id, 'ATTEMPT').body
       object_ids = attempts['ids'][0..5]
-      Fog::AWS[:data_pipeline].describe_objects(@pipeline_id, object_ids)
+      Fog::AWS[:data_pipeline].describe_objects(@pipeline_id, object_ids).body
     end
 
     tests("#delete_pipeline").returns(true) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -960,6 +960,7 @@ files:
 - lib/fog/aws/requests/compute/unmonitor_instances.rb
 - lib/fog/aws/requests/data_pipeline/activate_pipeline.rb
 - lib/fog/aws/requests/data_pipeline/create_pipeline.rb
+- lib/fog/aws/requests/data_pipeline/deactivate_pipeline.rb
 - lib/fog/aws/requests/data_pipeline/delete_pipeline.rb
 - lib/fog/aws/requests/data_pipeline/describe_objects.rb
 - lib/fog/aws/requests/data_pipeline/describe_pipelines.rb
@@ -1678,9 +1679,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Amazon Web Services.
 test_files: []
-has_rdoc: