dpl 1.8.43.travis.2280.5 → 1.8.43.travis.2283.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 336c29967990e23fe9b833a5f85ab135a4f3aac6
-  data.tar.gz: a3d36f23459eb95b83dfad5a9657eaa512a4cdc4
+  metadata.gz: ed76725b0159655c032234e61b2b7d2ed74e80d2
+  data.tar.gz: 1994bde72ede5e6d8366342db093268b1715e321
 SHA512:
-  metadata.gz: d5d8b4c209fcd879736f57adcab464adb56be6f8a683e08123aede9494874b580f1ed1a5b5e1f984cfffe3e7eb561487a672877e4366842c9c7b2e93f05a10f1
-  data.tar.gz: 0ab12f8b19c674387b4e8140048b5de4dc4751bff674f8411c30607eea7f537f0f4454d989b02948cdb3e445ba502dbc7cf620421b650b5aee565f357938363c
+  metadata.gz: 189c488bc73a7ad414f662815be6443ca20240a2add040b9f8f1cc629a31942cc10d3de991b66c642a778be29febb7266c2cfe7296216755b76844cf7bda4e02
+  data.tar.gz: ca43bdcc921666271590c89adf03128749af2a6e9b4e7a1b5d16f30e717802d328dae62ca23cf67c86e37a319055f5cdf10abe8544bc35b572c0ecdf907865e0

data/Gemfile

@@ -33,16 +33,16 @@ group :rubygems do
 end
 
 group :sss do
-  gem 'aws-sdk', '~> 2.6.32', '< 3.0'
+  gem 'aws-sdk', '~> 2.10.39', '< 3.0'
   gem 'mime-types'
 end
 
 group :code_deploy do
-  gem 'aws-sdk', '~> 2.6.32', '< 3.0'
+  gem 'aws-sdk', '~> 2.10.39', '< 3.0'
 end
 
 group :lambda do
-  gem 'aws-sdk', '~> 2.6.32', '< 3.0'
+  gem 'aws-sdk', '~> 2.10.39', '< 3.0'
   gem 'rubyzip', '~> 1.1'
 end
 
@@ -63,7 +63,7 @@ group :gcs do
 end
 
 group :elastic_beanstalk do
-  gem 'aws-sdk', '~> 2.6.32', '< 3.0'
+  gem 'aws-sdk', '~> 2.10.39', '< 3.0'
   gem 'rubyzip', '~> 1.1'
 end
 
@@ -96,5 +96,5 @@ group :deis do
 end
 
 group :opsworks do
-  gem 'aws-sdk', '~> 2.6.32', '< 3.0'
+  gem 'aws-sdk', '~> 2.10.39', '< 3.0'
 end

data/README.md

@@ -1,6 +1,6 @@
 # Dpl [![Build Status](https://travis-ci.org/travis-ci/dpl.svg?branch=master)](https://travis-ci.org/travis-ci/dpl) [![Code Climate](https://codeclimate.com/github/travis-ci/dpl.png)](https://codeclimate.com/github/travis-ci/dpl) [![Gem Version](https://badge.fury.io/rb/dpl.png)](http://badge.fury.io/rb/dpl) [![Coverage Status](https://coveralls.io/repos/travis-ci/dpl/badge.svg?branch=master&service=github)](https://coveralls.io/github/travis-ci/dpl?branch=master)
 
-## Writing and Testing a New Deployment Provider and new functionalities
+## Writing and Testing a New Deployment Provider and new functionality
 
 See [TESTING.md](TESTING.md).
 
@@ -714,6 +714,17 @@ For accounts using two factor authentication, you have to use an oauth token as
  * **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.
+ * **subnet_ids**: Optional. List of subnet IDs to be added to the function. Needs the `ec2:DescribeSubnets` and `ec2:DescribeVpcs` permission for the user of the access/secret key to work.
+ * **security_group_ids**: Optional. List of security group IDs to be added to the function. Needs the `ec2:DescribeSecurityGroups` and `ec2:DescribeVpcs` permission for the user of the access/secret key to work.
+ * **dead_letter_arn**: Optional. ARN to an SNS or SQS resource used for the dead letter queue. [More about DLQs here](https://docs.aws.amazon
+ .com/lambda/latest/dg/dlq.html).
+ * **tracing_mode**: Optional. "Active" or "PassThrough" only. Default is "PassThrough".  Needs the `xray:PutTraceSegments` and `xray:PutTelemetryRecords` on the role for this to work. [More on 
+ Active Tracing here](https://docs.aws.amazon.com/lambda/latest/dg/lambda-x-ray.html).
+ * **environment_variables**: Optional. List of Environment Variables to add to the function, needs to be in the format of `KEY=VALUE`. Can be encrypted for added security.
+ * **kms_key_arn**: Optional. KMS key ARN to use to encrypt `environment_variables`.
+ * **function_tags**: Optional. List of tags to add to the function, needs to be in the format of `KEY=VALUE`. Can be encrypted for added security.
+ 
+ For a list of all [permissions for Lambda, please refer to the documentation](https://docs.aws.amazon.com/lambda/latest/dg/lambda-api-permissions-ref.html).
 
 #### Examples:
 

data/dpl.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.0.0'
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'json', '1.8.1'
+  s.add_development_dependency 'json', '1.8.3'
   s.add_development_dependency 'tins', '~> 1.6.0', '>= 1.6.0'
   s.add_development_dependency 'coveralls'
 

data/lib/dpl/provider/lambda.rb

@@ -14,8 +14,8 @@ module DPL
 
       def lambda_options
         {
-          region:      options[:region] || 'us-east-1',
-          credentials: ::Aws::Credentials.new(option(:access_key_id), option(:secret_access_key))
+            region:      options[:region] || 'us-east-1',
+            credentials: ::Aws::Credentials.new(option(:access_key_id), option(:secret_access_key))
         }
       end
 
@@ -26,53 +26,71 @@ module DPL
         # 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 }
+        
+        begin
+          response = lambda.get_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,
-          })
-
+	                      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,
+	                      vpc_config:           vpc_config,
+	                      environment:          environment_variables,
+	                      dead_letter_config:   dead_letter_arn,
+	                      kms_key_arn:          options[:kms_key_arn] || default_kms_key_arn,
+	                      tracing_config:       tracing_mode
+	                    })
 
           log "Updated configuration of function: #{response.function_name}."
 
+          if function_tags
+            log "Add tags to function #{response.function_name}."
+            response = lambda.tag_resource({
+						              resource: response.function_arn,
+						              tags: function_tags
+						            })
+          end
+
           # 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,
-          })
+                                                   function_name:  options[:name] || option(:function_name),
+                                                   zip_file:       function_zip,
+                                                   publish:        publish
+                                               })
 
           log "Updated code of function: #{response.function_name}."
-        else
+        rescue ::Aws::Lambda::Errors::ResourceNotFoundException
+          log "Function #{function_name} does not exist, creating."
           # 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,
-          })
+		                    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,
+		                    vpc_config:           vpc_config,
+		                    environment:          environment_variables,
+		                    dead_letter_config:   dead_letter_arn,
+		                    kms_key_arn:          options[:kms_key_arn] || default_kms_key_arn,
+		                    tracing_config:       tracing_mode,
+		                    tags:                 function_tags
+		                  })
 
           log "Created lambda: #{response.function_name}."
         end
@@ -147,6 +165,30 @@ module DPL
         @output_file_path ||= '/tmp/' + random_chars(8) + '-lambda.zip'
       end
 
+      def vpc_config
+        options[:subnet_ids] && options[:security_group_ids] ? { :subnet_ids => Array(options[:subnet_ids]), :security_group_ids => Array(options[:security_group_ids]) } : nil
+      end
+
+      def environment_variables
+        options[:environment_variables] ? { :variables => split_string_array_to_hash(options[:environment_variables]) } : nil
+      end
+
+      def dead_letter_arn
+        options[:dead_letter_arn] ? { :target_arn => options[:dead_letter_arn]} : nil
+      end
+
+      def tracing_mode
+        options[:tracing_mode] ? { :mode => options[:tracing_mode]} : nil
+      end
+
+      def default_kms_key_arn
+        nil
+      end
+
+      def function_tags
+        options[:function_tags] ? split_string_array_to_hash(options[:function_tags]) : nil
+      end
+
       def default_runtime
         'nodejs'
       end
@@ -171,6 +213,15 @@ module DPL
         !!options[:publish]
       end
 
+      def split_string_array_to_hash(arr, delimiter="=")
+        variables = {}
+        Array(arr).map do |val|
+          keyval = val.split(delimiter)
+          variables[keyval[0]] = keyval[1]
+        end
+        variables
+      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

@@ -66,18 +66,19 @@ describe DPL::Provider::Lambda do
       handler_name: 'handler'
     }
 
-    list_functions_response = {
-      functions: [
-        { function_name: 'test-function' }
-      ]
-    }
-
-    empty_list_functions_response = {
-        functions: [ ]
+    example_get_function_response = {
+      code: {
+        location: 'location',
+        repository_type: 's3',
+      },
+      configuration: {
+        function_name: 'test-function'
+      }
     }
 
     example_response = {
       function_name: 'test-function',
+      function_arn: 'arn:lambda:region:account-id:function:test-function',
       role: 'some-role',
       handler: 'index.handler'
     }
@@ -89,11 +90,13 @@ describe DPL::Provider::Lambda do
 
     context 'by creating a new function' do
       before do
-        provider.lambda.stub_responses(:list_functions, empty_list_functions_response)
+        provider.lambda.stub_responses(:get_function, 'ResourceNotFoundException')
         provider.lambda.stub_responses(:create_function, example_response)
       end
 
       example do
+
+        expect(provider).to receive(:log).with(/Function #{lambda_options[:function_name]} does not exist, creating\./)
         expect(provider).to receive(:log).with(/Created lambda: #{lambda_options[:function_name]}\./)
         provider.push_app
       end
@@ -101,14 +104,32 @@ describe DPL::Provider::Lambda do
 
     context 'by updating an existing function' do
       before do
-        provider.lambda.stub_responses(:list_functions, list_functions_response)
+        provider.lambda.stub_responses(:get_function, example_get_function_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(/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 'by updating an existing function with new tags' do
+      before do
+        lambda_options[:function_tags] = [ 'TAG_KEY=some-value' ]
+        provider.lambda.stub_responses(:get_function, example_get_function_response)
         provider.lambda.stub_responses(:update_function_configuration, example_response)
+        provider.lambda.stub_responses(:tag_resource)
         provider.lambda.stub_responses(:update_function_code, example_response)
       end
 
       example do
         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(/Add tags to function #{lambda_options[:function_name]}\./)
         expect(provider).to receive(:log).with(/Updated code of function: #{lambda_options[:function_name]}\./)
         provider.push_app
       end
@@ -116,7 +137,7 @@ describe DPL::Provider::Lambda do
 
     context 'with a ServiceException response' do
       before do
-        provider.lambda.stub_responses(:list_functions, 'ResourceNotFoundException')
+        provider.lambda.stub_responses(:get_function, 'ResourceNotFoundException')
         provider.lambda.stub_responses(:create_function, 'ServiceException')
       end
 
@@ -128,7 +149,7 @@ describe DPL::Provider::Lambda do
 
     context 'with a InvalidParameterValueException response' do
       before do
-        provider.lambda.stub_responses(:list_functions, 'InvalidParameterValueException')
+        provider.lambda.stub_responses(:get_function, 'InvalidParameterValueException')
       end
 
       example do
@@ -139,7 +160,7 @@ describe DPL::Provider::Lambda do
 
     context 'with a ResourceNotFoundException response' do
       before do
-        provider.lambda.stub_responses(:list_functions, 'ResourceNotFoundException')
+        provider.lambda.stub_responses(:get_function, 'ResourceNotFoundException')
         provider.lambda.stub_responses(:create_function, 'ResourceNotFoundException')
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.43.travis.2280.5
+  version: 1.8.43.travis.2283.5
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement