lambda_wrap 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e374a4047a1194f4a9d9560b42e09794691d7ebf
-  data.tar.gz: ee654729cd74b622d9b1c27b48585a4b03d6a51b
+SHA256:
+  metadata.gz: dcab068ec4b93c5c11e66bdd0686aad997b52e48573e5e581f8363c56dbc96f0
+  data.tar.gz: 267570d242c1343f5c1d9197272eecdce1f9ce658cf73c960791c4a83afb8674
 SHA512:
-  metadata.gz: 722fb9afe90bdc427027616710ce4dfbef4974d22dec8c5f313c66c08ae51d351d4dc539adf90236b32881ff0969d7c22c5ee75f3c1d4e8b364e43ecca862dda
-  data.tar.gz: 969059746ef50dcee55025ea9eba72075f95c48864fe2568d89d687765d0ceab9add4dc55431d216d11f12fbdd2392ea419ad5dbded268404fb1ee4d45af7706
+  metadata.gz: 78708a6551a1ff4296d156b941489e5782163e01f79ba96ffca23cbc1af9abc609ae8fc9c835b8de01908a6d7ad54247bf4df1e103361f4af79ab69bc1186a2a
+  data.tar.gz: 1d5c73b0c6054339e74f6566937a2e18064443c23f68085ab900d505a2ecd820f6a43167ef9eea3546729581e7fa0b54378879ac50aade775eb72e768d2a3c2e

data/lib/lambda_wrap/api_gateway_manager.rb

@@ -39,20 +39,20 @@ module LambdaWrap
       api_id = get_id_for_api(@api_name)
       service_response =
         if api_id
-          @client.put_rest_api(
+          options = {
             fail_on_warnings: false, mode: @import_mode, rest_api_id:
-            api_id, body: File.open(@path_to_swagger_file, 'rb').read
-          )
+            api_id, body: File.binread(@path_to_swagger_file)
+          }
+          @client.put_rest_api(options)
         else
-          @client.import_rest_api(
+          options = {
             fail_on_warnings: false,
-            body: File.open(@path_to_swagger_file, 'rb').read
-          )
+            body: File.binread(@path_to_swagger_file)
+          }
+          @client.import_rest_api(options)
         end
 
-      if service_response.nil? || service_response.id.nil?
-        raise "Failed to create API gateway with name #{@api_name}"
-      end
+      raise "Failed to create API gateway with name #{@api_name}" if service_response.nil? || service_response.id.nil?
 
       if api_id
         "Created API Gateway Object: #{@api_name} having id #{service_response.id}"
@@ -92,7 +92,10 @@ module LambdaWrap
       super
       api_id = get_id_for_api(@api_name)
       if api_id
-        @client.delete_rest_api(rest_api_id: api_id)
+        options = {
+          rest_api_id: api_id
+        }
+        @client.delete_rest_api(options)
         puts "Deleted API: #{@api_name} ID:#{api_id}"
       else
         puts "API Gateway Object #{@api_name} not found. Nothing to delete."
@@ -108,7 +111,10 @@ module LambdaWrap
     private
 
     def delete_stage(api_id, env)
-      @client.delete_stage(rest_api_id: api_id, stage_name: env)
+      options = {
+        rest_api_id: api_id, stage_name: env
+      }
+      @client.delete_stage(options)
       puts 'Deleted API gateway stage ' + env
     rescue Aws::APIGateway::Errors::NotFoundException
       puts "API Gateway stage #{env} does not exist. Nothing to delete."
@@ -118,17 +124,16 @@ module LambdaWrap
       deployment_description = "Deploying API #{@api_name} v#{@api_version}\
         to Environment:#{environment_options.name}"
       stage_description = "#{environment_options.name} - #{environment_options.description}"
-      @client.create_deployment(
+      options = {
         rest_api_id: api_id, stage_name: environment_options.name,
         stage_description: stage_description, description: deployment_description,
         cache_cluster_enabled: false, variables: environment_options.variables
-      )
+      }
+      @client.create_deployment(options)
     end
 
     def extract_specification(file_path)
-      unless File.exist?(file_path)
-        raise ArgumentError, "Open API Spec (Swagger) File does not exist: #{file_path}!"
-      end
+      raise ArgumentError, "Open API Spec (Swagger) File does not exist: #{file_path}!" unless File.exist?(file_path)
       spec = Psych.load_file(file_path)
       raise ArgumentError, 'LambdaWrap only supports swagger v2.0' unless spec['swagger'] == '2.0'
       raise ArgumentError, 'Invalid Title field in the OAPISpec' unless spec['info']['title'] =~ /[A-Za-z0-9]{1,1024}/
@@ -138,12 +143,11 @@ module LambdaWrap
     def get_id_for_api(api_name)
       response = nil
       loop do
-        response =
-          if !response || response.position.nil?
-            @client.get_rest_apis(limit: 500)
-          else
-            @client.get_rest_apis(limit: 500, position: response.position)
-          end
+        options = {
+          limit: 500
+        }
+        options[:position] = response.position unless !response || response.position.nil?
+        response = @client.get_rest_apis(options)
         api = response.items.detect { |item| item.name == api_name }
         return api.id if api
         return if response.items.empty? || response.position.nil? || response.position.empty?

data/lib/lambda_wrap/dynamo_db_manager.rb

@@ -213,7 +213,10 @@ module LambdaWrap
     def retrieve_table_details(full_table_name)
       table_details = nil
       begin
-        table_details = @client.describe_table(table_name: full_table_name).table
+        options = {
+          table_name: full_table_name
+        }
+        table_details = @client.describe_table(options).table
       rescue Aws::DynamoDB::Errors::ResourceNotFoundException
         puts "Table #{full_table_name} does not exist."
       end
@@ -309,11 +312,12 @@ module LambdaWrap
       puts "Updating Provisioned Throughtput for #{full_table_name}"
       puts "Setting Read Capacity Units From: #{old_read} To: #{@read_capacity_units}"
       puts "Setting Write Capacty Units From: #{old_write} To: #{@write_capacity_units}"
-      @client.update_table(
+      options = {
         table_name: full_table_name,
         provisioned_throughput: { read_capacity_units: @read_capacity_units,
                                   write_capacity_units: @write_capacity_units }
-      )
+      }
+      @client.update_table(options)
     end
 
     def build_global_index_deletes_array(current_global_indexes)
@@ -325,10 +329,11 @@ module LambdaWrap
 
     def delete_global_index(full_table_name, index_to_delete)
       puts "Deleting Global Secondary Index: #{index_to_delete} from Table: #{full_table_name}"
-      @client.update_table(
+      options = {
         table_name: full_table_name,
         global_secondary_index_updates: [{ delete: { index_name: index_to_delete } }]
-      )
+      }
+      @client.update_table(options)
     end
 
     # Looks through the list current of Global Secondary Indexes and builds an array if the Provisioned Throughput
@@ -363,10 +368,12 @@ module LambdaWrap
         end
       )
 
-      @client.update_table(
+      options = {
         table_name: full_table_name,
         global_secondary_index_updates: global_secondary_index_updates.map { |index| { update: index } }
-      )
+      }
+
+      @client.update_table(options)
     end
 
     def build_new_global_indexes_array(current_global_indexes)
@@ -383,22 +390,24 @@ module LambdaWrap
     def create_global_indexes(full_table_name, new_global_secondary_indexes)
       puts "Creating new Global Indexes for Table: #{full_table_name}"
       puts(new_global_secondary_indexes.map { |index| index[:index_name].to_s })
-      @client.update_table(
+      options = {
         table_name: full_table_name,
         global_secondary_index_updates: new_global_secondary_indexes.map { |index| { create: index } }
-      )
+      }
+      @client.update_table(options)
     end
 
     def create_table(full_table_name)
       puts "Creating table #{full_table_name}..."
-      @client.create_table(
+      options = {
         table_name: full_table_name, attribute_definitions: @attribute_definitions,
         key_schema: @key_schema,
         provisioned_throughput: { read_capacity_units: @read_capacity_units,
                                   write_capacity_units: @write_capacity_units },
         local_secondary_indexes: @local_secondary_indexes,
         global_secondary_indexes: @global_secondary_indexes
-      )
+      }
+      @client.create_table(options)
       # Wait 60 seconds because "DescribeTable uses an eventually consistent query"
       puts 'Sleeping for 60 seconds...'
       Kernel.sleep(60)
@@ -415,7 +424,10 @@ module LambdaWrap
       else
         # Wait up to 30m
         wait_until_table_available(full_table_name, 5, 360) if table_details.table_status != 'ACTIVE'
-        @client.delete_table(table_name: full_table_name)
+        options = {
+          table_name: full_table_name
+        }
+        @client.delete_table(options)
       end
     end
 
@@ -427,12 +439,13 @@ module LambdaWrap
       tables = []
       response = nil
       loop do
-        response =
-          if !response || response.last_evaluated_table_name.nil? || response.last_evaluated_table_name.empty?
-            @client.list_tables(limit: 100)
-          else
-            @client.list_tables(limit: 100, exclusive_start_table_name: response.last_evaluated_table_name)
-          end
+        options = {
+          limit: 100
+        }
+        unless !response || response.last_evaluated_table_name.nil? || response.last_evaluated_table_name.empty?
+          options[:exclusive_start_table_name] = response.last_evaluated_table_name
+        end
+        response = @client.list_tables(options)
         tables.concat(response.table_names)
         if response.table_names.empty? || response.last_evaluated_table_name.nil? ||
            response.last_evaluated_table_name.empty?

data/lib/lambda_wrap/lambda_manager.rb

@@ -24,7 +24,7 @@ module LambdaWrap
     # @option options [Integer] :timeout (30) The function execution time at which Lambda should terminate the function.
     # @option options [Integer] :memory_size (128) The amount of memory, in MB, your Lambda function is given. Lambda
     #  uses this memory size to infer the amount of CPU and memory allocated to your function. The value must be a
-    #  multiple of 64MB. Minimum: 128, Maximum: 1536.
+    #  multiple of 64MB. Minimum: 128, Maximum: 3008.
     # @option options [Array<String>] :subnet_ids ([]) If your Lambda function accesses resources in a VPC, you provide
     #  this parameter identifying the list of subnet IDs. These must belong to the same VPC. You must provide at least
     #  one security group and one subnet ID to configure VPC access.
@@ -79,7 +79,7 @@ nodejs4.3, nodejs6.10, java8, python2.7, python3.6, dotnetcore1.0, or nodejs4.3-
       @timeout = options_with_defaults[:timeout]
 
       unless (options_with_defaults[:memory_size] % 64).zero? && (options_with_defaults[:memory_size] >= 128) &&
-             (options_with_defaults[:memory_size] <= 1536)
+             (options_with_defaults[:memory_size] <= 3008)
         raise ArgumentError, 'Invalid Memory Size.'
       end
       @memory_size = options_with_defaults[:memory_size]
@@ -156,7 +156,8 @@ nodejs4.3, nodejs6.10, java8, python2.7, python3.6, dotnetcore1.0, or nodejs4.3-
       if lambda_details.nil?
         puts 'No Lambda to delete.'
       else
-        @client.delete_function(function_name: @lambda_name)
+        options = { function_name: @lambda_name }
+        @client.delete_function(options)
         puts "Lambda #{@lambda_name} and all Versions & Aliases have been deleted."
       end
       true
@@ -172,7 +173,8 @@ nodejs4.3, nodejs6.10, java8, python2.7, python3.6, dotnetcore1.0, or nodejs4.3-
     def retrieve_lambda_details
       lambda_details = nil
       begin
-        lambda_details = @client.get_function(function_name: @lambda_name).configuration
+        options = { function_name: @lambda_name }
+        lambda_details = @client.get_function(options).configuration
       rescue Aws::Lambda::Errors::ResourceNotFoundException, Aws::Lambda::Errors::NotFound
         puts "Lambda #{@lambda_name} does not exist."
       end
@@ -182,12 +184,12 @@ nodejs4.3, nodejs6.10, java8, python2.7, python3.6, dotnetcore1.0, or nodejs4.3-
     def create_lambda
       puts "Creating New Lambda Function: #{@lambda_name}...."
       puts "Runtime Engine: #{@runtime}, Timeout: #{@timeout}, Memory Size: #{@memory_size}."
-
-      lambda_version = @client.create_function(
+      options = {
         function_name: @lambda_name, runtime: @runtime, role: @role_arn, handler: @handler,
-        code: { zip_file: File.open(@path_to_zip_file, 'rb').read }, description: @description, timeout: @timeout,
+        code: { zip_file: File.binread(@path_to_zip_file) }, description: @description, timeout: @timeout,
         memory_size: @memory_size, vpc_config: @vpc_configuration, publish: true
-      ).version
+      }
+      lambda_version = @client.create_function(options).version
       puts "Successfully created Lambda: #{@lambda_name}!"
       lambda_version
     end
@@ -200,45 +202,47 @@ nodejs4.3, nodejs6.10, java8, python2.7, python3.6, dotnetcore1.0, or nodejs4.3-
 #{@vpc_configuration[:security_group_ids]}"
       end
 
-      @client.update_function_configuration(
+      options = {
         function_name: @lambda_name, role: @role_arn, handler: @handler, description: @description, timeout: @timeout,
         memory_size: @memory_size, vpc_config: @vpc_configuration, runtime: @runtime
-      )
+      }
+
+      @client.update_function_configuration(options)
 
       puts "Successfully updated Lambda configuration for #{@lambda_name}"
     end
 
     def update_lambda_code
       puts "Updating Lambda Code for #{@lambda_name}...."
-
-      response = @client.update_function_code(
+      options = {
         function_name: @lambda_name,
-        zip_file: File.open(@path_to_zip_file, 'rb').read,
+        zip_file: File.binread(@path_to_zip_file),
         publish: true
-      )
+      }
+
+      response = @client.update_function_code(options)
 
       puts "Successully updated Lambda #{@lambda_name} code to version: #{response.version}"
       response.version
     end
 
     def create_alias(func_version, alias_name, alias_description)
+      options = {
+        function_name: @lambda_name, name: alias_name, function_version: func_version,
+        description: alias_description || 'Alias managed by LambdaWrap'
+      }
       if alias_exist?(alias_name)
-        @client.update_alias(
-          function_name: @lambda_name, name: alias_name, function_version: func_version,
-          description: alias_description || 'Alias managed by LambdaWrap'
-        )
+        @client.update_alias(options)
       else
-        @client.create_alias(
-          function_name: @lambda_name, name: alias_name, function_version: func_version,
-          description: alias_description || 'Alias managed by LambdaWrap'
-        )
+        @client.create_alias(options)
       end
       puts "Created Alias: #{alias_name} for Lambda: #{@lambda_name} v#{func_version}."
     end
 
     def remove_alias(alias_name)
       puts "Deleting Alias: #{alias_name} for #{@lambda_name}"
-      @client.delete_alias(function_name: @lambda_name, name: alias_name)
+      options = { function_name: @lambda_name, name: alias_name }
+      @client.delete_alias(options)
     end
 
     def cleanup_unused_versions
@@ -250,7 +254,8 @@ nodejs4.3, nodejs6.10, java8, python2.7, python3.6, dotnetcore1.0, or nodejs4.3-
 
       function_versions_to_be_deleted.each do |version|
         puts "Deleting function version: #{version}."
-        @client.delete_function(function_name: @lambda_name, qualifier: version)
+        options = { function_name: @lambda_name, qualifier: version }
+        @client.delete_function(options)
       end
 
       puts "Cleaned up #{function_versions_to_be_deleted.length} unused versions."
@@ -260,12 +265,13 @@ nodejs4.3, nodejs6.10, java8, python2.7, python3.6, dotnetcore1.0, or nodejs4.3-
       function_versions = []
       response = nil
       loop do
-        response =
-          if !response || response.next_marker.nil? || response.next_marker.empty?
-            @client.list_versions_by_function(function_name: @lambda_name)
-          else
-            @client.list_versions_by_function(function_name: @lambda_name, marker: response.next_marker)
-          end
+        options = {
+          function_name: @lambda_name
+        }
+        unless !response || response.next_marker.nil? || response.next_marker.empty?
+          options[:marker] = response.next_marker
+        end
+        response = @client.list_versions_by_function(options)
         function_versions.concat(response.versions.map(&:version))
         if response.next_marker.nil? || response.next_marker.empty?
           return function_versions.reject { |v| v == '$LATEST' }
@@ -277,7 +283,13 @@ nodejs4.3, nodejs6.10, java8, python2.7, python3.6, dotnetcore1.0, or nodejs4.3-
       aliases = []
       response = nil
       loop do
-        response = invoke_client_method_with_optional_marker(response, :list_aliases)
+        options = {
+          function_name: @lambda_name
+        }
+        unless !response || response.next_marker.nil? || response.next_marker.empty?
+          options[:marker] = response.next_marker
+        end
+        response = @client.list_aliases(options)
         aliases.concat(response.aliases)
         return aliases if response.aliases.empty? || response.next_marker.nil? || response.next_marker.empty?
       end
@@ -291,13 +303,5 @@ nodejs4.3, nodejs6.10, java8, python2.7, python3.6, dotnetcore1.0, or nodejs4.3-
     def alias_exist?(alias_name)
       retrieve_all_aliases.detect { |a| a.name == alias_name }
     end
-
-    def invoke_client_method_with_optional_marker(response, method_symbol)
-      if !response || response.next_marker.nil? || response.next_marker.empty?
-        @client.send(method_symbol, function_name: @lambda_name)
-      else
-        @client.send(method_symbol, function_name: @lambda_name, marker: response.next_marker)
-      end
-    end
   end
 end

data/lib/lambda_wrap/version.rb

@@ -1,4 +1,4 @@
 module LambdaWrap
   # @!visibility private
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lambda_wrap
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Markus Thurner
@@ -10,36 +10,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '2'
 description: |-
   This gem wraps the AWS SDK to simplify deployment of AWS \
                         Lambda functions backed by API Gateway and DynamoDB.
@@ -69,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Easy deployment of AWS Lambda functions and dependencies.