swaggerless 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 877151d9ab0dbe93d6ff7b28cec271aa7b49e114
-  data.tar.gz: dde2af502d75aa20bbbc8e24cc699c390bc73b07
+  metadata.gz: d8548560a65b15f31c57f4529df4e0b98f6aceec
+  data.tar.gz: feb6bdc1b1bf5d0708c94451acc3c40ff0203e7e
 SHA512:
-  metadata.gz: d6dc71afc0b92c7cf60668b91c5c5babfc6e583cb37557483c7f6b6163cfe822dd0ef6ade4dd99c41658000c535bf92ab04f9071b0e0b9d8ca69c75f861fe6d2
-  data.tar.gz: 224e708bf3ac7bbf71b21cfb0c4b1a02dd5c1db59d2fbb08acff52fe0a5993b4fa32aac714007b13afbee0f027b67bffd236e71d74bdeeccd7d34860afe47ce0
+  metadata.gz: 9ff5e011f8f121b9080bb17b1d3f2c8a5053ba94876da350e38d6cec3d40eeb0f2ce204f7b21ea51a93553728999cc0da963650a44b71f9381a76721469a42ba
+  data.tar.gz: 77017ee7f6560138928f12e6e972f0e524c4a81cd7d72d07dac851b2001c366eae303c0475093994ec8d8664edfb8feeeb13d0db4950e12882f5d9273d6931ca

data/lib/swaggerless/deployer.rb

@@ -13,6 +13,7 @@ module Swaggerless
       @verbose = false;
       @function_alias = get_current_package_alias
       @swaggerExtractor = Swaggerless::SwaggerExtractor.new();
+      @lambda_client = Aws::Lambda::Client.new(region: @region)
     end
 
     def create_lambda_package(directory, outputName)
@@ -34,17 +35,16 @@ module Swaggerless
           else
             securityDefinition[AMZ_APIGATEWAY_AUTHORIZER]["authorizerUri"] = "arn:aws:apigateway:#{@region}:lambda:path/2015-03-31/functions/arn:aws:lambda:#{@region}:#{@account}:function:#{authorizer}/invocations"
           end
-          lambda_client = Aws::Lambda::Client.new(region: @region)
           policy_exists = false
           begin
-            existing_policies = lambda_client.get_policy(function_name: authorizer).data
+            existing_policies = @lambda_client.get_policy(function_name: authorizer).data
             existing_policy = JSON.parse(existing_policies.policy)
             policy_exists = existing_policy['Statement'].select { |s| s['Sid'] == "API_2_#{authorizer}" }.any?
           rescue Aws::Lambda::Errors::ResourceNotFoundException
             policy_exists = false
           end
           unless policy_exists
-            lambda_client.add_permission({function_name: "arn:aws:lambda:#{@region}:#{@account}:function:#{authorizer}",
+            @lambda_client.add_permission({function_name: "arn:aws:lambda:#{@region}:#{@account}:function:#{authorizer}",
                                           statement_id: "API_2_#{authorizer}", action: "lambda:*", principal: 'apigateway.amazonaws.com'})
           end
         end
@@ -56,7 +56,7 @@ module Swaggerless
       deployed_operations = Hash.new
       swagger["paths"].each do |path, path_config|
         path_config.each do |method, method_config|
-          if method_config[SWGR_OPERATION_ID] or method_config[EXT_LAMBDA_HANDLER] then
+          if method_config[EXT_LAMBDA_HANDLER] then
             if deployed_operations[method_config[EXT_LAMBDA_NAME]] == nil
               config = lambdas_configs[method_config[EXT_LAMBDA_NAME]]
               deployed_operations[method_config[EXT_LAMBDA_NAME]] = deploy_lambda(lambda_role_arn, method_config[EXT_LAMBDA_NAME], config[:description],
@@ -65,7 +65,13 @@ module Swaggerless
             puts "Updating swagger with integration uri for #{method} #{path}: #{deployed_operations[method_config[EXT_LAMBDA_NAME]]}" unless not @verbose
             method_config['x-amazon-apigateway-integration']['uri'] = deployed_operations[method_config[EXT_LAMBDA_NAME]]
           elsif method_config[EXT_LAMBDA_NAME] then
-            method_config['x-amazon-apigateway-integration']['uri'] = "arn:aws:apigateway:#{@region}:lambda:path/2015-03-31/functions/arn:aws:lambda:#{@region}:#{@account}:function:#{method_config[EXT_LAMBDA_NAME]}/invocations"
+            if lambdas_configs[method_config[EXT_LAMBDA_NAME] == nil]
+              external_lambda_arn = "arn:aws:apigateway:#{@region}:lambda:path/2015-03-31/functions/arn:aws:lambda:#{@region}:#{@account}:function:#{method_config[EXT_LAMBDA_NAME]}/invocations"
+              method_config['x-amazon-apigateway-integration']['uri'] = external_lambda_arn
+              puts "Adding integration to lambda that is external (#{external_lambda_arn}) to the project. Make sure to grant permissions so that API Gateway can call it."
+            else
+              method_config['x-amazon-apigateway-integration']['uri'] = "arn:aws:apigateway:#{@region}:lambda:path/2015-03-31/functions/arn:aws:lambda:#{@region}:#{@account}:function:#{method_config[EXT_LAMBDA_NAME]}:#{@function_alias}/invocations"
+            end
           end
         end
       end
@@ -75,23 +81,22 @@ module Swaggerless
       puts "Deploying #{function_name}"
       runtime ||= 'nodejs4.3'
       timeout ||= 5
-      lambda_client = Aws::Lambda::Client.new(region: @region)
       begin
-        lambda_client.get_alias({function_name: function_name, name: @function_alias})
+        @lambda_client.get_alias({function_name: function_name, name: @function_alias})
       rescue Aws::Lambda::Errors::ResourceNotFoundException
         lambda_response = nil
         zip_file_content = File.read(File.join(@output_path, "#{@function_alias}.zip"))
         begin
-          lambda_client.get_function({function_name: function_name})
-          lambda_response = lambda_client.update_function_code({function_name: function_name, zip_file: zip_file_content, publish: true})
-          lambda_client.update_function_configuration({function_name: function_name, runtime: runtime, role: lambda_role_arn, handler: handler, description: summary, timeout: timeout})
+          @lambda_client.get_function({function_name: function_name})
+          lambda_response = @lambda_client.update_function_code({function_name: function_name, zip_file: zip_file_content, publish: true})
+          @lambda_client.update_function_configuration({function_name: function_name, runtime: runtime, role: lambda_role_arn, handler: handler, description: summary, timeout: timeout})
         rescue Aws::Lambda::Errors::ResourceNotFoundException
           puts "Creating new function #{function_name}"
-          lambda_response = lambda_client.create_function({function_name: function_name, runtime: runtime, role: lambda_role_arn, handler: handler, code: {zip_file: zip_file_content }, description: summary, publish: true, timeout: timeout})
+          lambda_response = @lambda_client.create_function({function_name: function_name, runtime: runtime, role: lambda_role_arn, handler: handler, code: {zip_file: zip_file_content }, description: summary, publish: true, timeout: timeout})
         end
         puts "Creating alias #{@function_alias}"
-        alias_resp = lambda_client.create_alias({function_name: function_name, name: @function_alias, function_version: lambda_response.version, description: "Deployment of new version on " +  Time.now.inspect})
-        lambda_client.add_permission({function_name: alias_resp.alias_arn, statement_id: "API_2_#{function_name}_#{@function_alias}", action: "lambda:*", principal: 'apigateway.amazonaws.com'})
+        alias_resp = @lambda_client.create_alias({function_name: function_name, name: @function_alias, function_version: lambda_response.version, description: "Deployment of new version on " +  Time.now.inspect})
+        @lambda_client.add_permission({function_name: alias_resp.alias_arn, statement_id: "API_2_#{function_name}_#{@function_alias}", action: "lambda:*", principal: 'apigateway.amazonaws.com'})
       end
       return "arn:aws:apigateway:#{@region}:lambda:path/2015-03-31/functions/arn:aws:lambda:#{@region}:#{@account}:function:#{function_name}:#{@function_alias}/invocations"
     end
@@ -111,7 +116,7 @@ module Swaggerless
       apis = @api_gateway_client.get_rest_apis(limit: 500).data
       api = apis.items.select { |a| a.name == swagger['info']['title'] }.first
 
-      if api then
+      if api
         resp = @api_gateway_client.put_rest_api({rest_api_id: api.id, mode: "overwrite", fail_on_warnings: true, body: swagger.to_yaml})
       else
         resp = @api_gateway_client.import_rest_api({fail_on_warnings: true, body: swagger.to_yaml})

data/lib/swaggerless/swaggerextractor.rb

@@ -9,7 +9,6 @@ module Swaggerless
 
   AMZ_APIGATEWAY_AUTHORIZER = 'x-amazon-apigateway-authorizer'
 
-  SWGR_OPERATION_ID = 'operationId'
   SWGR_SUMMARY = 'summary'
   SWGR_DESCRIPTION = 'description'
 
@@ -19,37 +18,32 @@ module Swaggerless
       lambdas_map = Hash.new
       swagger["paths"].each do |path, path_config|
         path_config.each do |method, method_config|
-          if lambdas_map[method_config[EXT_LAMBDA_NAME]] then
-            stored_version = lambdas_map[method_config[EXT_LAMBDA_NAME]];
-            encountered_version = build_lambda_config_hash(method_config)
-            fill_in_config_gaps(stored_version, encountered_version)
-            unless is_lambda_config_correct(stored_version, encountered_version)
-              raise "Lambda #{method_config[EXT_LAMBDA_NAME]} mentioned multiple times in configuration with different settings"
-            end
-            lambdas_map[method_config[EXT_LAMBDA_NAME]][:description] = 'Part of ' + Deployer.get_service_prefix(swagger)
-          elsif method_config[EXT_LAMBDA_NAME]
-            lambdas_map[method_config[EXT_LAMBDA_NAME]] = build_lambda_config_hash(method_config)
-          end
+          process_lambda_config(lambdas_map, method_config, swagger)
         end
       end
 
       swagger["securityDefinitions"].each do |securityDefinitionName, securityDefinition|
         if securityDefinition[AMZ_APIGATEWAY_AUTHORIZER] != nil
-          if lambdas_map[securityDefinition[EXT_LAMBDA_NAME]]
-            stored_version = lambdas_map[securityDefinition[AMZ_APIGATEWAY_AUTHORIZER][EXT_LAMBDA_NAME]];
-            encountered_version = build_lambda_config_hash(securityDefinition[AMZ_APIGATEWAY_AUTHORIZER])
-            unless is_lambda_config_correct(stored_version, encountered_version)
-              raise "Lambda #{method_config[EXT_LAMBDA_NAME]} mentioned multiple times in configuration with different settings"
-            end
-            lambdas_map[securityDefinition[EXT_LAMBDA_NAME]][:description] = 'Part of ' + Deployer.get_service_prefix(swagger)
-          else
-            lambdas_map[securityDefinition[EXT_LAMBDA_NAME]] = build_lambda_config_hash(securityDefinition)
-          end
+          process_lambda_config(lambdas_map, securityDefinition, swagger)
         end
       end
       return lambdas_map
     end
 
+    def process_lambda_config(lambdas_map, objContainingLambdaConfig, swagger)
+      if lambdas_map[objContainingLambdaConfig[EXT_LAMBDA_NAME]]
+        stored_version = lambdas_map[objContainingLambdaConfig[EXT_LAMBDA_NAME]];
+        encountered_version = build_lambda_config_hash(objContainingLambdaConfig)
+        fill_in_config_gaps(stored_version, encountered_version)
+        unless is_lambda_config_correct(stored_version, encountered_version)
+          raise "Lambda #{objContainingLambdaConfig[EXT_LAMBDA_NAME]} mentioned multiple times in configuration with different settings"
+        end
+        lambdas_map[objContainingLambdaConfig[EXT_LAMBDA_NAME]][:description] = 'Part of ' + Deployer.get_service_prefix(swagger)
+      elsif objContainingLambdaConfig[EXT_LAMBDA_NAME]
+        lambdas_map[objContainingLambdaConfig[EXT_LAMBDA_NAME]] = build_lambda_config_hash(objContainingLambdaConfig)
+      end
+    end
+
     private
 
     def fill_in_config_gaps(to, from)
@@ -59,6 +53,8 @@ module Swaggerless
     end
 
     def is_lambda_config_correct(l1, l2)
+      fill_in_config_gaps(l2,l1)
+      fill_in_config_gaps(l1,l2)
       return (l1[:handler] == l2[:handler] and
           l1[:timeout] == l2[:timeout] and
           l1[:runtime] == l2[:runtime])

data/lib/swaggerless/version.rb

@@ -1,3 +1,3 @@
 module Swaggerless
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swaggerless
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Rafal Nowosielski