dpl 1.7.12.travis.734.4 → 1.7.12.travis.742.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTdkMjZlMmE4NjI2MzhiODZiN2Y0NDUzOGQ0OWNlZDY0NzQ2NzA1Mg==
+    NTA2ZjVlMzYxNWY4YWJhOTc0MDYyNTkyYTRlZjQ3YWRmODljYjY4Mw==
   data.tar.gz: !binary |-
-    OWZjMmRhYTI5N2QyY2MxNTAwMDUxMjI2ZjdiZjY2YTkwMTIyOTI3OQ==
+    YWRkNzBiMDZhN2ZhZDdhMDM5YTFlYjQwM2E4ZmQyMGU2YzdkNTBjMQ==
 SHA512:
   metadata.gz: !binary |-
-    ODFlODEzMThmZjU2NGEyMTMwNmNlZjE5NGYxNDZjZWQ3Yjg2ZmY0MmJhZjAw
-    YjEwOTE4MmFhMmYyZGExODk2ZTA4YTg2OGI0ZmViNDAzZmI0MmEyOTZiZDA4
-    OWQyNmU5Y2M1MTA2YTA0NTdjYTA3ZTBkNWE0NDFlMmFlNmFkYTQ=
+    NmUwZWY2NWZlOTgwZDQyYjQyZWNmMGFmYmE2MjAyMDBiYjFjMWM1Yzc5NmUz
+    NzE2MzBkNDI0ZTY4NzI2YTIzMjdiZjg2OTc4NzE3MGVlZmI0Nzk0MWE5MTg0
+    ZTk3YmFkMTI2NWY2MGZlMzQwOGU5NGJhNjg1ZGRjMjRiZjJmZGE=
   data.tar.gz: !binary |-
-    ZmYzMzQ5MTI0N2YxMjlmM2E3NzE4NmY1YzY1NTRmZGViOTViNzA0N2JhZjFk
-    MWE0MWU2ZDEzMzlmYjQ5MmFjODQ2MWQwNzZlNWZlOWM1YjE1ODBiZThjM2Vi
-    NmNjMGRlYzc4ZjQ4ZWNiMTU2ZjEzYTc4NDdjZDQ2Yzk0ODBlYTQ=
+    ODUzM2RiMmIwNmVhYjkzZDczOTNhZWZlYWUwODQ0OTI2MDdkMzYzYTliYjc3
+    ZTBhYmM2ZTQ2ZWZhZDVjYTFjZTUwOGIzYjMzYjZmMzQ1NjA0YmNjYmExZmRk
+    ZmZjMjlhZTIwOTE1NTc0NTlhZDIzY2FhOGU0NzljOGI2M2RjM2M=

data/Gemfile

@@ -31,7 +31,12 @@ group :sss do
 end
 
 group :code_deploy do
-  gem 'aws-sdk', '2.0.13.pre'
+  gem 'aws-sdk', '>= 2.0.18.pre'
+end
+
+group :lambda do
+  gem 'aws-sdk', '>= 2.0.18.pre'
+  gem 'rubyzip'
 end
 
 group :cloud_files do

data/README.md

@@ -32,6 +32,7 @@ Dpl supports the following providers:
 * [Puppet Forge](#puppet-forge)
 * [packagecloud](#packagecloud)
 * [Chef Supermarket](#chef-supermarket)
+* [Lambda](#lambda)
 
 ## Installation:
 
@@ -456,3 +457,38 @@ For accounts using two factor authentication, you have to use an oauth token as
 
     dpl --provider=chef-supermarket --user-id=chef --client-key=.travis/client.pem --cookbook-category=Others
 
+### Lambda:
+
+#### Options: 
+
+ * **function_name**: Required. The name of the Lambda being created / updated.
+ * **role**: Required. The ARN of the IAM role to assign to this Lambda function.
+ * **handler_name**: Required. The function that Lambda calls to begin execution. For NodeJS, it is exported function for the module.
+ * **module_name**: Optional. The name of the module that exports the handler. Defaults to `index`.
+ * **zip**: Optional. Either a path to an existing packaged (zipped) Lambda, a directory to package, or a single file to package. Defaults to `Dir.pwd`.
+ * **description**: Optional. The description of the Lambda being created / updated. Defaults to "Deploy build #{context.env['TRAVIS_BUILD_NUMBER']} to AWS Lambda via Travis CI"
+ * **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.
+
+#### Examples:
+
+Deploy contents of current working directory using default module:
+```
+    dpl --provider="lambda" \
+        --access_key_id="${AWS_ACCESS_KEY}" \
+        --secret_access_key="${AWS_SECRET_KEY}" \
+        --function_name="test-lambda" \
+        --role="${AWS_LAMBDA_ROLE}" \
+        --handler_name="handler";
+```
+Deploy contents of a specific directory using specific module name:
+```
+    dpl --provider="lambda" \
+        --access_key_id="${AWS_ACCESS_KEY}" \
+        --secret_access_key="${AWS_SECRET_KEY}" \
+        --function_name="test-lambda" \
+        --role="${AWS_LAMBDA_ROLE}" \
+        --zip="${TRAVIS_BUILD_DIR}/dist"  \
+        --module_name="copy" \
+        --handler_name="handler";
+```

data/lib/dpl/provider.rb

@@ -18,6 +18,7 @@ module DPL
     autoload :CloudControl, 'dpl/provider/cloudcontrol'
     autoload :CloudFoundry, 'dpl/provider/cloud_foundry'
     autoload :CodeDeploy,   'dpl/provider/code_deploy'
+    autoload :Lambda,       'dpl/provider/lambda'
     autoload :PyPI,         'dpl/provider/pypi'
     autoload :Divshot,      'dpl/provider/divshot'
     autoload :CloudFiles,   'dpl/provider/cloud_files'

data/lib/dpl/provider/code_deploy.rb

@@ -6,10 +6,7 @@ module DPL
       requires 'aws-sdk', pre: true
 
       def code_deploy
-        @code_deploy ||= begin
-          Aws.add_service('CodeDeploy', api: File.expand_path("../CodeDeploy.api.json", __FILE__)) unless defined? Aws::CodeDeploy
-          Aws::CodeDeploy::Client.new(code_deploy_options)
-        end
+        @code_deploy ||= Aws::CodeDeploy::Client.new(code_deploy_options)
       end
 
       def code_deploy_options

data/lib/dpl/provider/lambda.rb

@@ -0,0 +1,142 @@
+require 'json'
+require 'tempfile'
+require 'fileutils'
+
+module DPL
+  class Provider
+    class Lambda < Provider
+      requires 'aws-sdk', pre: true
+      requires 'rubyzip', load: 'zip'
+
+      def lambda
+        @lambda ||= ::Aws::Lambda::Client.new(lambda_options)
+      end
+
+      def lambda_options
+        {
+          region:      options[:region] || 'us-east-1',
+          credentials: ::Aws::Credentials.new(option(:access_key_id), option(:secret_access_key))
+        }
+      end
+
+      def push_app
+        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:        default_runtime,
+          mode:           default_mode
+        })
+
+        log "Uploaded lambda: #{response.function_name}."
+      rescue ::Aws::Lambda::Errors::ServiceException => exception
+        error(exception.message)
+      rescue ::Aws::Lambda::Errors::InvalidParameterValueException => exception
+        error(exception.message)
+      rescue ::Aws::Lambda::Errors::ResourceNotFoundException => exception
+        error(exception.message)
+      end
+
+      def handler
+        module_name = options[:module_name] || default_module_name
+        handler_name = option(:handler_name)
+
+        "#{module_name}.#{handler_name}"
+      end
+
+      def function_zip
+        target_zip_path = File.absolute_path(options[:zip] || Dir.pwd)
+        dest_file_path = output_file_path
+
+        if File.directory?(target_zip_path)
+          zip_directory(dest_file_path, target_zip_path)
+        elsif File.file?(target_zip_path)
+          zip_file(dest_file_path, target_zip_path)
+        else
+          error('Invalid zip option. If set, must be path to directory, js file, or a zip file.')
+        end
+
+        File.new(dest_file_path)
+      end
+
+      def zip_file(dest_file_path, target_file_path)
+        if File.extname(target_file_path) == '.zip'
+          # Just copy it to the destination right away, since it is already a zip.
+          FileUtils.cp(target_file_path, dest_file_path)
+          dest_file_path
+        else
+          # Zip up the file.
+          src_directory_path = File.dirname(target_file_path)
+          files = [ target_file_path ]
+
+          create_zip(dest_file_path, src_directory_path, files)
+        end
+      end
+
+      def zip_directory(dest_file_path, target_directory_path)
+        files = Dir[File.join(target_directory_path, '**', '**')]
+        create_zip(dest_file_path, target_directory_path, files)
+      end
+
+      def create_zip(dest_file_path, src_directory_path, files)
+        Zip::File.open(dest_file_path, Zip::File::CREATE) do |zipfile|
+          files.each do |file|
+            zipfile.add(file.sub(src_directory_path + File::SEPARATOR, ''), file)
+          end
+        end
+
+        dest_file_path
+      end
+
+      def needs_key?
+        false
+      end
+
+      def check_auth
+        log "Using Access Key: #{option(:access_key_id)[-4..-1].rjust(20, '*')}"
+      end
+ 
+      def output_file_path
+        @output_file_path ||= '/tmp/' + random_chars(8) + '-lambda.zip'
+      end
+
+      def default_runtime
+        'nodejs'
+      end
+
+      def default_mode
+        'event'
+      end
+
+      def default_timeout
+        3 # seconds
+      end
+
+      def default_description
+        "Deploy build #{context.env['TRAVIS_BUILD_NUMBER']} to AWS Lambda via Travis CI"
+      end
+
+      def deafult_memory_size
+        128
+      end
+
+      def default_module_name
+        'index'
+      end
+
+      def random_chars(count=8)
+        (36**(count-1) + rand(36**count - 36**(count-1))).to_s(36)
+      end
+
+      def cleanup
+      end
+
+      def uncleanup
+      end
+    end
+  end
+end

data/spec/provider/lambda_spec.rb

@@ -0,0 +1,372 @@
+require 'spec_helper'
+require 'aws-sdk'
+require 'dpl/error'
+require 'dpl/provider'
+require 'dpl/provider/lambda'
+
+describe DPL::Provider::Lambda do
+
+  subject :provider do
+    described_class.new(DummyContext.new, :access_key_id => 'qwertyuiopasdfghjklz', :secret_access_key => 'qwertyuiopasdfghjklzqwertyuiopasdfghjklz')
+  end
+
+  describe '#lambda_options' do
+    context 'without region' do
+      example do
+        options = provider.lambda_options
+        expect(options[:region]).to eq('us-east-1')
+      end
+    end
+
+    context 'with region' do
+      example do
+        region = 'us-west-1'
+        provider.options.update(:region => region)
+        options = provider.lambda_options
+        expect(options[:region]).to eq(region)
+      end
+    end
+  end
+end
+
+describe DPL::Provider::Lambda do
+  access_key_id = 'someaccesskey'
+  secret_access_key = 'somesecretaccesskey'
+  region = 'us-east-1'
+
+  client_options = {
+    stub_responses: true,
+    region: region,
+    credentials: Aws::Credentials.new(access_key_id, secret_access_key)
+  }
+
+  subject :provider do
+    described_class.new(DummyContext.new, {
+      access_key_id: access_key_id,
+      secret_access_key: secret_access_key
+    })
+  end
+
+  before :each do
+    provider.stub(:lambda_options).and_return(client_options)
+  end
+
+  describe '#lambda' do
+    example do
+      expect(Aws::Lambda::Client).to receive(:new).with(client_options).once
+      provider.lambda
+    end
+  end
+
+  describe '#push_app' do
+    lambda_options = {
+      function_name: 'test-function',
+      role: 'some-role',
+      module_name: 'index',
+      handler_name: 'handler'
+    }
+
+    example_response = {
+      function_name: 'test-function',
+      role: 'some-role',
+      handler: 'index.handler'
+    }
+
+    before(:each) do
+      old_options = provider.options
+      provider.stub(:options) { old_options.merge(lambda_options) }
+    end
+
+    context 'with a successful response' do
+      before do
+        provider.lambda.stub_responses(:upload_function, example_response)
+      end
+
+      example do
+        expect(provider).to receive(:log).with(/Uploaded lambda: #{lambda_options[:function_name]}\./)
+        provider.push_app
+      end
+    end
+
+    context 'with a ServiceException response' do
+      before do
+        provider.lambda.stub_responses(:upload_function, 'ServiceException')
+      end
+
+      example do
+        expect(provider).to receive(:error).once
+        provider.push_app
+      end
+    end
+
+    context 'with a InvalidParameterValueException response' do
+      before do
+        provider.lambda.stub_responses(:upload_function, 'InvalidParameterValueException')
+      end
+
+      example do
+        expect(provider).to receive(:error).once
+        provider.push_app
+      end
+    end
+
+    context 'with a ResourceNotFoundException response' do
+      before do
+        provider.lambda.stub_responses(:upload_function, 'ResourceNotFoundException')
+      end
+
+      example do
+        expect(provider).to receive(:error).once
+        provider.push_app
+      end
+    end
+  end
+
+  describe "#handler" do
+    context "without a module name" do
+      module_name = 'index'
+      handler_name = 'HandlerName'
+      expected_handler = "#{module_name}.#{handler_name}"
+
+      before do
+        expect(provider.options).to receive(:[]).with(:module_name).and_return(nil)
+        expect(provider.options).to receive(:fetch).with(:handler_name).and_return(handler_name)
+      end
+
+      example do
+        expect(provider.handler).to eq(expected_handler)
+      end
+    end
+
+    context "with a module name" do
+      module_name = 'ModuleName'
+      handler_name = 'HandlerName'
+      expected_handler = "#{module_name}.#{handler_name}"
+
+      before do
+        expect(provider.options).to receive(:[]).with(:module_name).and_return(module_name)
+        expect(provider.options).to receive(:fetch).with(:handler_name).and_return(handler_name)
+      end
+
+      example do
+        expect(provider.handler).to eq(expected_handler)
+      end
+    end
+  end
+
+  describe '#function_zip' do
+    context 'when zip is not specified' do
+      path = Dir.pwd
+      output_file_path = '/some/path.zip'
+
+      before do
+        expect(provider.options).to receive(:[]).with(:zip).and_return(nil)
+        expect(provider).to receive(:output_file_path).and_return(output_file_path)
+        expect(File).to receive(:directory?).with(path).and_return(true)
+        expect(provider).to receive(:zip_directory).with(output_file_path, path)
+        expect(File).to receive(:new).with(output_file_path)
+      end
+
+      example do
+        provider.function_zip
+      end
+    end
+
+    context 'when zip is a file path' do
+      path = '/some/file/path.zip'
+      output_file_path = '/some/path.zip'
+
+      before do
+        expect(provider.options).to receive(:[]).with(:zip).and_return(path)
+        expect(provider).to receive(:output_file_path).and_return(output_file_path)
+        expect(File).to receive(:directory?).with(path).and_return(false)
+        expect(File).to receive(:file?).with(path).and_return(true)
+        expect(provider).to receive(:zip_file).with(output_file_path, path)
+        expect(File).to receive(:new).with(output_file_path)
+      end
+
+      example do
+        provider.function_zip
+      end
+    end
+
+    context 'when zip is a directory' do
+      path = '/some/dir/path'
+      output_file_path = '/some/path.zip'
+
+      before do
+        expect(provider.options).to receive(:[]).with(:zip).and_return(path)
+        expect(provider).to receive(:output_file_path).and_return(output_file_path)
+        expect(File).to receive(:directory?).with(path).and_return(true)
+        expect(provider).to receive(:zip_directory).with(output_file_path, path)
+        expect(File).to receive(:new).with(output_file_path)
+      end
+
+      example do
+        provider.function_zip
+      end
+    end
+
+    context 'with an invalid zip option' do
+      path = '/some/file/path.zip'
+      output_file_path = '/some/path.zip'
+      error = 'Invalid zip option. If set, must be path to directory, js file, or a zip file.'
+
+      before do
+        expect(provider.options).to receive(:[]).with(:zip).and_return(path)
+        expect(provider).to receive(:output_file_path).and_return(output_file_path)
+        expect(File).to receive(:directory?).with(path).and_return(false)
+        expect(File).to receive(:file?).with(path).and_return(false)
+      end
+
+      example do
+        expect { provider.function_zip }.to raise_error(DPL::Error, error)
+      end
+    end
+  end
+
+  describe '#zip_file' do
+    dest = '/some/path/to/write.zip'
+
+    context 'when zip is a file path' do
+      dir = '/some/target'
+      target = File.join(dir, 'file.js')
+
+      before do
+        expect(File).to receive(:extname).with(target).and_return('.js')
+        expect(provider).to receive(:create_zip).with(dest, dir, [ target ])
+      end
+
+      example do
+        provider.zip_file(dest, target)
+      end
+    end
+
+    context 'when zip is an existing zip file' do
+      dir = '/some/target'
+      target = File.join(dir, 'file.js')
+
+      before do
+        expect(File).to receive(:extname).with(target).and_return('.zip')
+        expect(FileUtils).to receive(:cp).with(target, dest)
+      end
+
+      example do
+        provider.zip_file(dest, target)
+      end
+    end
+  end
+
+  describe '#zip_directory' do
+    dest = '/some/path/to/write.zip'
+    target = '/some/dir'
+    glob = File.join(target, '**', '**')
+    files = %w[ 'one' 'two' ]
+
+    before do
+      expect(Dir).to receive(:[]).with(glob).and_return(files)
+      expect(provider).to receive(:create_zip).with(dest, target, files)
+    end
+
+    example do
+      provider.zip_directory(dest, target)
+    end
+  end
+
+  describe '#create_zip' do
+    dest = '/some/dest.zip'
+    src = '/some/src/dir'
+    file_one = 'one.js'
+    file_two = 'two.js'
+    files = [
+      File.join(src, file_one),
+      File.join(src, file_two)
+    ]
+
+    before do
+      zip_file = double(Zip::File)
+      expect(Zip::File).to receive(:open).with(dest, Zip::File::CREATE).and_yield(zip_file)
+      expect(zip_file).to receive(:add).once.with(file_one, File.join(src, file_one))
+      expect(zip_file).to receive(:add).once.with(file_two, File.join(src, file_two))
+    end
+
+    example do
+      provider.create_zip(dest, src, files)
+    end
+  end
+
+  describe '#needs_key?' do
+    example do
+      expect(provider.needs_key?).to eq(false)
+    end
+  end
+
+  describe '#check_auth' do
+    example do
+      expect(provider).to receive(:log).with("Using Access Key: #{access_key_id[-4..-1].rjust(20, '*')}")
+      provider.check_auth
+    end
+  end
+
+  describe '#output_file_path' do
+    example do
+      expect(provider.output_file_path).to match(/tmp\/\w{8}\-lambda\.zip/)
+    end
+  end
+
+  describe '#default_runtime' do
+    example do
+      expect(provider.default_runtime).to eq('nodejs')
+    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)
+    end
+  end
+
+  describe '#default_description' do
+    build_number = 2
+
+    before do
+      provider.context.env.stub(:[]).with('TRAVIS_BUILD_NUMBER').and_return(build_number)
+    end
+
+    let(:build_number) { provider.context.env['TRAVIS_BUILD_NUMBER'] }
+
+    example do
+      expect(provider.default_description).to eq(
+        "Deploy build #{build_number} to AWS Lambda via Travis CI"
+      )
+    end
+  end
+
+  describe '#deafult_memory_size' do
+    example do
+      expect(provider.deafult_memory_size).to eq(128)
+    end
+  end
+
+  describe '#random_chars' do
+    context 'without specifying count' do
+      example do
+        expect(provider.random_chars.length).to eq(8)
+      end
+    end
+
+    context 'with specified count' do
+      count = 4
+      example do
+        expect(provider.random_chars(count).length).to eq(count)
+      end
+    end
+  end
+
+end