dpl 1.8.30.travis.1843.3 → 1.8.30.travis.1849.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 415081635bd9b2a23bf3f95d2100542e42d2ae79
-  data.tar.gz: f8669bbf17aee7ae33de15d805a78c4a68d9c6e9
+  metadata.gz: 53f98382ab9c2fd449cf66a1673e1b7a3e502191
+  data.tar.gz: 60dc13bf847cf6d804be7affbb1e11d7dcda4c4a
 SHA512:
-  metadata.gz: 169c05ea02c10f6538635768fd765e5a404fff2064caf99729352467906f43b0cf9f653a5eee17225100c54eff3c581ad5bdc04501f6161104fb5d9d5976502c
-  data.tar.gz: b8458c9b0397be15abb7942e9679538204b0ff349170bccb2628aef9c75774b27a802dab654c54d795f1355fd98e231b26bfb309b200b13062b38d3301200c40
+  metadata.gz: 0fe508ade4e79f2ea574ed58cbd915c61d51c323e901f8ee8d7b8e5290470613230e4d19cbf9502f8e2f9e5394138e1b21ba6926ca69f5b1ccca0b2ff7d9cf3c
+  data.tar.gz: 62c45debd3a88b8502c0cafb13a0a57e58f6398350f862334de3e3176faf5162cdfd9412da91957accb1a2183ae331c0f4ebdbb571de3feb3a087a8bf3db9f6c

data/README.md

@@ -707,6 +707,7 @@ c. Update your `before_deploy` step in `.travis.yml` to update the `known_hosts`
  * **timeout**: Optional. The function execution time at which Lambda should terminate the function. Defaults to 3 (seconds).
  * **memory_size**: Optional. The amount of memory in MB to allocate to this Lambda. Defaults to 128.
  * **runtime**: Optional. The Lambda runtime to use. Defaults to `node`.
+ * **publish**: If `true`, a [new version](http://docs.aws.amazon.com/lambda/latest/dg/versioning-intro.html#versioning-intro-publish-version) of the Lambda function will be created instead of replacing the code of the existing one.
 
 #### Examples:
 

data/lib/dpl/provider/lambda.rb

@@ -9,7 +9,7 @@ module DPL
       requires 'rubyzip', load: 'zip'
 
       def lambda
-        @lambda ||= ::Aws::LambdaPreview::Client.new(lambda_options)
+        @lambda ||= ::Aws::Lambda::Client.new(lambda_options)
       end
 
       def lambda_options
@@ -20,27 +20,67 @@ module DPL
       end
 
       def push_app
-        # Options defined at
-        #   https://docs.aws.amazon.com/sdkforruby/api/Aws/LambdaPreview/Client.html
-        #   https://docs.aws.amazon.com/lambda/latest/dg/API_CreateFunction.html
-        response = lambda.upload_function({
-          function_name:  options[:name]           || option(:function_name),
-          description:    options[:description]    || default_description,
-          timeout:        options[:timeout]        || default_timeout,
-          memory_size:    options[:memory_size]    || deafult_memory_size,
-          role:           option(:role),
-          handler:        handler,
-          function_zip:   function_zip,
-          runtime:        options[:runtime]        || default_runtime,
-          mode:           default_mode,
-        })
-
-        log "Uploaded lambda: #{response.function_name}."
-      rescue ::Aws::LambdaPreview::Errors::ServiceException => exception
+
+        # The original LambdaPreview client supported create/update in one call
+        # To keep compatibility we try to fetch the function and then decide
+        # whether to update the code or create a new function
+
+        function_name = options[:name] || option(:function_name)
+
+        response = lambda.list_functions
+
+        if response.functions.any? { |function| function.function_name == function_name }
+
+          log "Function #{function_name} already exists, updating."
+
+          # Options defined at
+          #   https://docs.aws.amazon.com/sdkforruby/api/Aws/Lambda/Client.html#update_function_configuration-instance_method
+          response = lambda.update_function_configuration({
+              function_name:  function_name,
+              description:    options[:description]    || default_description,
+              timeout:        options[:timeout]        || default_timeout,
+              memory_size:    options[:memory_size]    || default_memory_size,
+              role:           option(:role),
+              handler:        handler,
+              runtime:        options[:runtime]        || default_runtime,
+          })
+
+
+          log "Updated configuration of function: #{response.function_name}."
+
+          # Options defined at
+          #   https://docs.aws.amazon.com/sdkforruby/api/Aws/Lambda/Client.html#update_function_code-instance_method
+          response = lambda.update_function_code({
+            function_name:  options[:name] || option(:function_name),
+            zip_file:       function_zip,
+            publish:        publish,
+          })
+
+          log "Updated code of function: #{response.function_name}."
+        else
+          # Options defined at
+          #   https://docs.aws.amazon.com/lambda/latest/dg/API_CreateFunction.html
+          response = lambda.create_function({
+            function_name:  options[:name]           || option(:function_name),
+            description:    options[:description]    || default_description,
+            timeout:        options[:timeout]        || default_timeout,
+            memory_size:    options[:memory_size]    || default_memory_size,
+            role:           option(:role),
+            handler:        handler,
+            code: {
+              zip_file:     function_zip,
+            },
+            runtime:        options[:runtime]        || default_runtime,
+            publish:        publish,
+          })
+
+          log "Created lambda: #{response.function_name}."
+        end
+      rescue ::Aws::Lambda::Errors::ServiceException => exception
         error(exception.message)
-      rescue ::Aws::LambdaPreview::Errors::InvalidParameterValueException => exception
+      rescue ::Aws::Lambda::Errors::InvalidParameterValueException => exception
         error(exception.message)
-      rescue ::Aws::LambdaPreview::Errors::ResourceNotFoundException => exception
+      rescue ::Aws::Lambda::Errors::ResourceNotFoundException => exception
         error(exception.message)
       end
 
@@ -111,10 +151,6 @@ module DPL
         'nodejs'
       end
 
-      def default_mode
-        'event'
-      end
-
       def default_timeout
         3 # seconds
       end
@@ -123,7 +159,7 @@ module DPL
         "Deploy build #{context.env['TRAVIS_BUILD_NUMBER']} to AWS Lambda via Travis CI"
       end
 
-      def deafult_memory_size
+      def default_memory_size
         128
       end
 
@@ -131,6 +167,10 @@ module DPL
         'index'
       end
 
+      def publish
+        !!options[:publish]
+      end
+
       def random_chars(count=8)
         (36**(count-1) + rand(36**count - 36**(count-1))).to_s(36)
       end

data/spec/provider/lambda_spec.rb

@@ -53,7 +53,7 @@ describe DPL::Provider::Lambda do
 
   describe '#lambda' do
     example do
-      expect(Aws::LambdaPreview::Client).to receive(:new).with(client_options).once
+      expect(Aws::Lambda::Client).to receive(:new).with(client_options).once
       provider.lambda
     end
   end
@@ -66,6 +66,16 @@ describe DPL::Provider::Lambda do
       handler_name: 'handler'
     }
 
+    list_functions_response = {
+      functions: [
+        { function_name: 'test-function' }
+      ]
+    }
+
+    empty_list_functions_response = {
+        functions: [ ]
+    }
+
     example_response = {
       function_name: 'test-function',
       role: 'some-role',
@@ -77,20 +87,37 @@ describe DPL::Provider::Lambda do
       provider.stub(:options) { old_options.merge(lambda_options) }
     end
 
-    context 'with a successful response' do
+    context 'by creating a new function' do
+      before do
+        provider.lambda.stub_responses(:list_functions, empty_list_functions_response)
+        provider.lambda.stub_responses(:create_function, example_response)
+      end
+
+      example do
+        expect(provider).to receive(:log).with(/Created lambda: #{lambda_options[:function_name]}\./)
+        provider.push_app
+      end
+    end
+
+    context 'by updating an existing function' do
       before do
-        provider.lambda.stub_responses(:upload_function, example_response)
+        provider.lambda.stub_responses(:list_functions, list_functions_response)
+        provider.lambda.stub_responses(:update_function_configuration, example_response)
+        provider.lambda.stub_responses(:update_function_code, example_response)
       end
 
       example do
-        expect(provider).to receive(:log).with(/Uploaded lambda: #{lambda_options[:function_name]}\./)
+        expect(provider).to receive(:log).with(/Function #{lambda_options[:function_name]} already exists, updating\./)
+        expect(provider).to receive(:log).with(/Updated configuration of function: #{lambda_options[:function_name]}\./)
+        expect(provider).to receive(:log).with(/Updated code of function: #{lambda_options[:function_name]}\./)
         provider.push_app
       end
     end
 
     context 'with a ServiceException response' do
       before do
-        provider.lambda.stub_responses(:upload_function, 'ServiceException')
+        provider.lambda.stub_responses(:list_functions, 'ResourceNotFoundException')
+        provider.lambda.stub_responses(:create_function, 'ServiceException')
       end
 
       example do
@@ -101,7 +128,7 @@ describe DPL::Provider::Lambda do
 
     context 'with a InvalidParameterValueException response' do
       before do
-        provider.lambda.stub_responses(:upload_function, 'InvalidParameterValueException')
+        provider.lambda.stub_responses(:list_functions, 'InvalidParameterValueException')
       end
 
       example do
@@ -112,7 +139,8 @@ describe DPL::Provider::Lambda do
 
     context 'with a ResourceNotFoundException response' do
       before do
-        provider.lambda.stub_responses(:upload_function, 'ResourceNotFoundException')
+        provider.lambda.stub_responses(:list_functions, 'ResourceNotFoundException')
+        provider.lambda.stub_responses(:create_function, 'ResourceNotFoundException')
       end
 
       example do
@@ -320,12 +348,6 @@ describe DPL::Provider::Lambda do
     end
   end
 
-  describe '#default_mode' do
-    example do
-      expect(provider.default_mode).to eq('event')
-    end
-  end
-
   describe '#default_timeout' do
     example do
       expect(provider.default_timeout).to eq(3)
@@ -348,9 +370,26 @@ describe DPL::Provider::Lambda do
     end
   end
 
-  describe '#deafult_memory_size' do
+  describe '#default_memory_size' do
     example do
-      expect(provider.deafult_memory_size).to eq(128)
+      expect(provider.default_memory_size).to eq(128)
+    end
+  end
+
+  describe '#publish' do
+    context 'is default turned off' do
+      example do
+        expect(provider.publish).to eq(false)
+      end
+    end
+    context 'can be turned on' do
+      before do
+        expect(provider.options).to receive(:[]).with(:publish).and_return(true)
+      end
+
+      example do
+        expect(provider.publish).to eq(true)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.30.travis.1843.3
+  version: 1.8.30.travis.1849.3
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec