swaggerless 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac0529a937e46f94bfb72982270ee109f4f51ed8
-  data.tar.gz: 56c3a3dd40f15fa239e89a709154356416b773c8
+  metadata.gz: d694d07f97c1af61e3c9ae6711123dbf7256d1e4
+  data.tar.gz: 9d5618bdf56253b8c8924673ebf9431ede719e8e
 SHA512:
-  metadata.gz: f9e344c8fc698771e4fe05c1d078874ae934e1e75f558b6513c3675ebf1fedcaa30098757517e4b2f99f112b71fb0563ce68a6135b30ba1734727d36258dbed7
-  data.tar.gz: abba001f296c2fab5d1a578c745f7f910812093e8acd2564c1d14afb203242eed001051de5a841c9221c96acd0aa09bf00f0c519e96bab5d3c42af8f9cd13a23
+  metadata.gz: f04f394a5a902379f3ed2acf25bbb3d1b6edd8da3dcbabacb9f8f1cb3e8e8fd785457d81d51c6b8138ff6bbc0f111033c2726bdc662f64164bf541388a19d752
+  data.tar.gz: 3b76780b95ee2f581b21a4be4953dcea1e8f2ce61724ea32739015f0673e58e7e828942c0715c046c52c51b9b08c5f839d77169bc3f50fcb46d5c1087a5e73e0

data/lib/swaggerless/deployer.rb

@@ -8,8 +8,9 @@ module Swaggerless
       @env = env
       @region = region
       @account = account
-      @apiGatewayClient = Aws::APIGateway::Client.new(region: @region)
-      @outputPath = 'output'
+      @api_gateway_client = Aws::APIGateway::Client.new(region: @region)
+      @output_path = 'output'
+      @verbose = false;
       @function_alias = get_current_package_alias
     end
 
@@ -21,40 +22,59 @@ module Swaggerless
       return swagger["info"]["title"].gsub(/\s+/, '_')
     end
 
-    def update_authorizer_uri(swagger)
+    EXT_LAMBDA_NAME = 'x-amazon-lambda-name'
+    EXT_LAMBDA_HANDLER = 'x-amazon-lambda-handler'
+    EXT_LAMBDA_TIMEOUT = 'x-amazon-lambda-timeout'
+    EXT_LAMBDA_RUNTIME = 'x-amazon-lambda-runtime'
+
+    AMZ_APIGATEWAY_AUTHORIZER = 'x-amazon-apigateway-authorizer'
+
+    SWGR_OPERATION_ID = 'operationId'
+    SWGR_SUMMARY = 'summary'
+
+    def deploy_authoirizers_and_update_authorizers_uri(lambda_role_arn, swagger)
       swagger["securityDefinitions"].each do |securityDefinitionName, securityDefinition|
-        if securityDefinition['x-amazon-apigateway-authorizer'] != nil then
-          authorizer = securityDefinition['x-amazon-apigateway-authorizer-lambda']
-          securityDefinition['x-amazon-apigateway-authorizer']["authorizerUri"] = "arn:aws:apigateway:#{@region}:lambda:path/2015-03-31/functions/arn:aws:lambda:#{@region}:#{@account}:function:#{authorizer}/invocations"
-          lambdaClient = Aws::Lambda::Client.new(region: @region)
+        if securityDefinition[AMZ_APIGATEWAY_AUTHORIZER] != nil then
+          authorizer = securityDefinition[EXT_LAMBDA_NAME]
+          if securityDefinition[EXT_LAMBDA_NAME] then
+            securityDefinition[AMZ_APIGATEWAY_AUTHORIZER]["authorizerUri"] = deploy_lambda(lambda_role_arn, securityDefinition[EXT_LAMBDA_NAME],
+              "Authorizer for #{swagger["info"]["title"]}", securityDefinition[EXT_LAMBDA_RUNTIME], securityDefinition[EXT_LAMBDA_HANDLER],
+                                                                                           securityDefinition[EXT_LAMBDA_TIMEOUT])
+          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 = lambdaClient.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
-            lambdaClient.add_permission({function_name: "arn:aws:lambda:#{@region}:#{@account}:function:#{authorizer}",
-              statement_id: "API_2_#{authorizer}", action: "lambda:*", principal: 'apigateway.amazonaws.com'})
+            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
       end
     end
 
-    def deploy_lambdas_and_update_integration_uris(lambda_role_arn, swagger)
-      deployedOperations = Hash.new
+    def deploy_lambdas_and_update_uris(lambda_role_arn, swagger)
+      lambdas_configs = get_lambda_map(swagger)
+      deployed_operations = Hash.new
       swagger["paths"].each do |path, path_config|
         path_config.each do |method, method_config|
-          if method_config['operationId'] then
-            if deployedOperations[method_config['operationId']] == nil then
-              function_name = Deployer.get_service_prefix(swagger) + "_" + method_config['operationId'].split(".").last
-              deployedOperations[method_config['operationId']] =
-                  deploy_lambda(lambda_role_arn, function_name, method_config["summary"], method_config['x-amazon-lambda-runtime'] || 'nodejs4.3',
-                                method_config['operationId'], method_config['x-amazon-lambda-timeout'] || 5)
+          if method_config[SWGR_OPERATION_ID] or 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],
+                config[:runtime], config[:handler], config[:timeout])
             end
-            method_config['x-amazon-apigateway-integration']['uri'] = deployedOperations[method_config['operationId']]
+            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"
           end
         end
       end
@@ -62,46 +82,48 @@ module Swaggerless
 
     def deploy_lambda(lambda_role_arn, function_name, summary, runtime, handler, timeout)
       puts "Deploying #{function_name}"
-      lambdaClient = Aws::Lambda::Client.new(region: @region)
+      runtime ||= 'nodejs4.3'
+      timeout ||= 5
+      lambda_client = Aws::Lambda::Client.new(region: @region)
       begin
-        lambdaClient.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
-        lambdaResponse = nil
-        zipFileContent = File.read(File.join(@outputPath,"#{@function_alias}.zip"))
+        lambda_response = nil
+        zip_file_content = File.read(File.join(@output_path, "#{@function_alias}.zip"))
         begin
-          lambdaClient.get_function({function_name: function_name})
-          lambdaResponse = lambdaClient.update_function_code({function_name: function_name, zip_file: zipFileContent, publish: true})
-          lambdaClient.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}"
-          lambdaResponse = lambdaClient.create_function({function_name: function_name, runtime: runtime, role: lambda_role_arn, handler: handler, code: { zip_file: zipFileContent }, 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}"
-        aliasResp = lambdaClient.create_alias({function_name: function_name, name: @function_alias, function_version: lambdaResponse.version, description: "Deployment of new version on " +  Time.now.inspect})
-        lambdaClient.add_permission({function_name: aliasResp.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
 
     def get_current_package_alias
-      zipFiles = Dir["#{@outputPath}/*.zip"]
+      zipFiles = Dir["#{@output_path}/*.zip"]
       if zipFiles.length == 0 then
         raise 'No package in the output folder. Unable to continue.'
       elsif zipFiles.length == 0
         raise 'Multiple package in the output folder. Unable to continue.'
       end
-      return File.basename(zipFiles.first, '.zip')
+      File.basename(zipFiles.first, '.zip')
     end
 
     def create_api_gateway(swagger)
       puts "Creating API Gateway"
-      apis = @apiGatewayClient.get_rest_apis(limit: 500).data
+      apis = @api_gateway_client.get_rest_apis(limit: 500).data
       api = apis.items.select { |a| a.name == swagger['info']['title'] }.first
 
       if api then
-        resp = @apiGatewayClient.put_rest_api({rest_api_id: api.id, mode: "overwrite", fail_on_warnings: true, body: swagger.to_yaml})
+        resp = @api_gateway_client.put_rest_api({rest_api_id: api.id, mode: "overwrite", fail_on_warnings: true, body: swagger.to_yaml})
       else
-        resp = @apiGatewayClient.import_rest_api({fail_on_warnings: true, body: swagger.to_yaml})
+        resp = @api_gateway_client.import_rest_api({fail_on_warnings: true, body: swagger.to_yaml})
       end
 
       if resp.warnings then
@@ -114,14 +136,16 @@ module Swaggerless
     end
 
     def create_api_gateway_deployment(lambda_role_arn, swagger)
-      deploy_lambdas_and_update_integration_uris(lambda_role_arn, swagger)
-      update_authorizer_uri(swagger)
-      apiId = self.create_api_gateway(swagger);
+      deploy_lambdas_and_update_uris(lambda_role_arn, swagger)
+      deploy_authoirizers_and_update_authorizers_uri(lambda_role_arn, swagger)
+      api_id = self.create_api_gateway(swagger);
       while true do
         begin
           puts "Creating API Gateway Deployment"
-          @apiGatewayClient.create_deployment({rest_api_id: apiId, stage_name: @env, description: "Automated deployment of #{@env}", variables: { "env" => @env }});
-          break
+          @api_gateway_client.create_deployment({rest_api_id: api_id, stage_name: @env, description: "Automated deployment of #{@env}", variables: {"env" => @env }});
+          url = "https://#{api_id}.execute-api.#{@region}.amazonaws.com/#{@env}/"
+          puts "API available at #{url}"
+          return url;
         rescue Aws::APIGateway::Errors::TooManyRequestsException => e
           STDERR.puts 'WARNING: Got TooManyRequests response from API Gateway. Waiting for a second.'
           sleep(1)
@@ -130,6 +154,55 @@ module Swaggerless
 
     end
 
+    private
+
+    def get_lambda_map(swagger)
+      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)
+            unless is_lambda_config_correct(stored_version, encountered_version) then
+              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)
+          else
+            lambdas_map[method_config[EXT_LAMBDA_NAME]] = build_lambda_config_hash(method_config)
+          end
+        end
+      end
+
+      swagger["securityDefinitions"].each do |securityDefinitionName, securityDefinition|
+        if securityDefinition[AMZ_APIGATEWAY_AUTHORIZER] != nil then
+          if lambdas_map[securityDefinition[EXT_LAMBDA_NAME]] then
+            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
+        end
+      end
+      return lambdas_map
+    end
+
+    def is_lambda_config_correct(l1, l2)
+      return (l1['handler'] == l2['handler'] and
+              l1['timeout'] == l2['timeout'] and
+               l1['runtime'] == l2['runtime'])
+    end
+
+    def build_lambda_config_hash(method_config)
+      { handler: method_config[EXT_LAMBDA_HANDLER],
+        timeout: method_config[EXT_LAMBDA_TIMEOUT],
+        runtime: method_config[EXT_LAMBDA_RUNTIME],
+        description: method_config[SWGR_SUMMARY]}
+    end
+
   end
 
 end

data/lib/swaggerless/version.rb

@@ -1,3 +1,3 @@
 module Swaggerless
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/tasks/swaggerless.rake

@@ -3,50 +3,55 @@ require "json"
 require "swaggerless"
 require 'fileutils'
 
-desc 'Deploys to an environment specified as parameter'
-task :deploy, [ :environment ] => [ :clean, :package ] do |t, args|
-  puts "Deploying API Gateway"
-  if not @swaggerSpecFile then
-    @swaggerSpecFile = 'swagger.yaml'
-    STDERR.puts("Swagger file not configured. Trying default ('#{@swaggerSpecFile}'). Set @swaggerSpecFile to point to swagger yaml file if you use different file name")
+namespace :swaggerless do
+
+  desc 'Deploys to an environment specified as parameter'
+  task :deploy, [ :environment ] => [ :clean, :package ] do |t, args|
+    puts "Deploying API Gateway"
+    if not @swaggerSpecFile then
+      @swaggerSpecFile = 'swagger.yaml'
+      STDERR.puts("Swagger file not configured. Trying default ('#{@swaggerSpecFile}'). Set @swaggerSpecFile to point to swagger yaml file if you use different file name")
+    end
+
+    if not @lambdaRoleArn then
+      raise "Unable to continue. Please configue @lambdaRoleArn in the Rakefile"
+    end
+
+    if not @awsRegion then
+      @awsRegion = ENV['AWS_REGION'] || 'eu-west-1'
+      STDERR.puts("AWS Region is not configured. Trying default ('#{@awsRegion}'). Set @awsRegion to point to swagger yaml file if you use different file name")
+    end
+
+    if not @awsAccount then
+      raise "Unable to continue. Please configue @awsAccount in the Rakefile"
+    end
+
+    swagger_content = File.read(@swaggerSpecFile)
+    swagger = YAML.load(swagger_content)
+    ENV["apiUrl"] = Swaggerless::Deployer.new(@awsAccount, @awsRegion, args[:environment].gsub(/[^a-zA-Z0-9_]/, "_")).create_api_gateway_deployment(@lambdaRoleArn, swagger)
+    puts "Setting $apiUrl environment variable to point to the deployed API"
   end
 
-  if not @lambdaRoleArn then
-    raise "Unable to continue. Please configue @lambdaRoleArn in the Rakefile"
-  end
-
-  if not @awsRegion then
-    @awsRegion = ENV['AWS_REGION'] || 'eu-west-1'
-    STDERR.puts("AWS Region is not configured. Trying default ('#{@awsRegion}'). Set @awsRegion to point to swagger yaml file if you use different file name")
-  end
+  desc 'Package the project for AWS Lambda'
+  task :package do
+    puts "Packaging"
 
-  if not @awsAccount then
-    raise "Unable to continue. Please configue @awsAccount in the Rakefile"
-  end
+    FileUtils.mkdir_p 'output'
 
-  swagger_content = File.read(@swaggerSpecFile)
-  swagger = YAML.load(swagger_content)
-  Swaggerless::Deployer.new(@awsAccount, @awsRegion, args[:environment].gsub(/[^a-zA-Z0-9_]/, "_")).create_api_gateway_deployment(@lambdaRoleArn, swagger)
-end
+    if not @packageDir then
+      @packageDir = 'src'
+      STDERR.puts("Package directory not configured. Trying default ('#{@packageDir}'). Set @packageDir to point to the directory that should be packaged for AWS Lambda")
+    end
 
-desc 'Package the project for AWS Lambda'
-task :package do
-  puts "Packaging"
-
-  FileUtils.mkdir_p 'output'
-
-  if not @packageDir then
-    @packageDir = 'src'
-    STDERR.puts("Package directory not configured. Trying default ('#{@packageDir}'). Set @packageDir to point to the directory that should be packaged for AWS Lambda")
+    swagger_content = File.read(@swaggerSpecFile)
+    swagger = YAML.load(swagger_content)
+    servicePrefix = Swaggerless::Deployer.get_service_prefix(swagger)
+    Swaggerless::Packager.new(@packageDir, "output/#{servicePrefix}").write
   end
 
-  swagger_content = File.read(@swaggerSpecFile)
-  swagger = YAML.load(swagger_content)
-  servicePrefix = Swaggerless::Deployer.get_service_prefix(swagger)
-  Swaggerless::Packager.new(@packageDir, "output/#{servicePrefix}").write
-end
+  desc 'Clean'
+  task :clean do
+    FileUtils.rm_rf('output')
+  end
 
-desc 'Clean'
-task :clean do
-  FileUtils.rm_rf('output')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swaggerless
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Rafal Nowosielski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler