swaggerless 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1512b9d9d029261974bcaf339643955248d045ac
-  data.tar.gz: 5fbfa3e56463e5f30c4fa2ff56e247b2069b44f2
+  metadata.gz: b470ab830a269ae86c58935b56f8f77b69dc533e
+  data.tar.gz: 92a6d081e5ae87547a0e2e5ed2a7a4e1a71bf078
 SHA512:
-  metadata.gz: bc62dd7eaa7fdc62ea7daacf11f2187364a5ba5a4b8c56ed0ad3f5459857c904f65e614f166a8c25ecafeee3bdf314154fa0552ccc6f492df8647cc24f057049
-  data.tar.gz: b19139e3cfa3e88e79e77aae15c59cf53eb0cccfb8da9d026a7371b3dc64a40563d1ca163a1967ff59c53412f5c4e437b3de87de9a4b7466fc03eb3900a5509a
+  metadata.gz: 5a27cfff8adfccbeef49741e172aed6e61bd5649e0f088d044488b97eab4e0ea5e79fb9bd015afe42881d42762b139c96f7b5a3a37428487b55679ea846deaa4
+  data.tar.gz: 9e8b10444659019a60131bafbaf8eb1f8a4b49359a98ee0e0a862227de982189c95e3ddf8dda77938e924cc9d04ca9b7960d309f56e6f65c9be0e4831b0ea0ba

data/lib/swaggerless/cleaner.rb

@@ -12,6 +12,12 @@ module Swaggerless
       @swaggerExtractor = Swaggerless::SwaggerExtractor.new();
     end
 
+    def remove_stage(swagger, stage_to_remove)
+      apis = @api_gateway_client.get_rest_apis(limit: 500).data
+      api = apis.items.select { |a| a.name == swagger['info']['title'] }.first
+      @api_gateway_client.delete_stage({rest_api_id: api.id, stage_name: stage_to_remove})
+    end
+
     def clean_unused_deployments(swagger)
       apis = @api_gateway_client.get_rest_apis(limit: 500).data
       api = apis.items.select { |a| a.name == swagger['info']['title'] }.first
@@ -44,9 +50,11 @@ module Swaggerless
         end
 
         configured_lambdas = @swaggerExtractor.get_lambda_map(swagger)
-        configured_lambdas.each do |functionName, value|
+        configured_lambdas.each do |functionName, config|
           lambda_versions_used = Hash.new
-
+          if config[:handler] == nil
+            next
+          end
           begin
             resp = @lambda_client.list_aliases({function_name: functionName, max_items: 500 })
             resp.aliases.each do |funcAlias|

data/lib/swaggerless/deployer.rb

@@ -1,4 +1,5 @@
 require "aws-sdk"
+require 'digest/sha1'
 
 module Swaggerless
 
@@ -13,6 +14,7 @@ module Swaggerless
       @verbose = false;
       @function_alias = get_current_package_alias
       @swaggerExtractor = Swaggerless::SwaggerExtractor.new();
+      @cloudwatch_client = Aws::CloudWatchLogs::Client.new();
       @lambda_client = Aws::Lambda::Client.new(region: @region)
     end
 
@@ -25,14 +27,15 @@ module Swaggerless
     end
 
     def deploy_authoirizers_and_update_authorizers_uri(lambda_role_arn, swagger)
+      lambdas_configs = @swaggerExtractor.get_lambda_map(swagger)
       swagger["securityDefinitions"].each do |securityDefinitionName, securityDefinition|
         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
+          if securityDefinition[EXT_LAMBDA_NAME] and securityDefinition[EXT_LAMBDA_HANDLER] then
+            config = lambdas_configs[securityDefinition[EXT_LAMBDA_NAME]]
+            securityDefinition[AMZ_APIGATEWAY_AUTHORIZER]["authorizerUri"] =
+                deploy_lambda_and_attach_log_forwarder(lambda_role_arn, securityDefinition, config)
+          elsif securityDefinition[EXT_LAMBDA_NAME]
             securityDefinition[AMZ_APIGATEWAY_AUTHORIZER]["authorizerUri"] = "arn:aws:apigateway:#{@region}:lambda:path/2015-03-31/functions/arn:aws:lambda:#{@region}:#{@account}:function:#{authorizer}/invocations"
           end
           policy_exists = false
@@ -59,8 +62,8 @@ module Swaggerless
           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],
-                config[:runtime], config[:handler], config[:timeout])
+              deployed_operations[method_config[EXT_LAMBDA_NAME]] =
+                  deploy_lambda_and_attach_log_forwarder(lambda_role_arn, method_config, config)
             end
             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]]
@@ -77,6 +80,45 @@ module Swaggerless
       end
     end
 
+    def deploy_lambda_and_attach_log_forwarder(lambda_role_arn, lambda_obj, config)
+      lambda_arn = deploy_lambda(lambda_role_arn, lambda_obj[EXT_LAMBDA_NAME], config[:description], config[:runtime], config[:handler], config[:timeout])
+      if config[:log_forwarder]
+        attach_log_forwarder(lambda_obj[EXT_LAMBDA_NAME], config[:log_forwarder])
+      end
+      return lambda_arn
+    end
+
+    def attach_log_forwarder(lambda_name, log_forwarder)
+      permissionStatementId = Digest::SHA1.hexdigest "logs_#{lambda_name}_to_#{log_forwarder}"
+      begin
+        @lambda_client.remove_permission({function_name: "arn:aws:lambda:#{@region}:#{@account}:function:#{log_forwarder}",
+          statement_id: permissionStatementId})
+      rescue Aws::Lambda::Errors::ResourceNotFoundException => e
+      end
+
+      @lambda_client.add_permission({function_name: "arn:aws:lambda:#{@region}:#{@account}:function:#{log_forwarder}",
+        statement_id: permissionStatementId,
+        action: "lambda:InvokeFunction",
+        principal: "logs.#{@region}.amazonaws.com", source_arn: "arn:aws:logs:#{@region}:#{@account}:log-group:/aws/lambda/#{lambda_name}:*",
+        source_account: "#{@account}" })
+
+      begin
+        resp = @cloudwatch_client.describe_log_groups({ log_group_name_prefix: "/aws/lambda/#{lambda_name}", limit: 1 })
+        if resp.log_groups.length == 0
+          @cloudwatch_client.create_log_group({log_group_name: "/aws/lambda/#{lambda_name}"})
+        end
+        resp = @cloudwatch_client.describe_subscription_filters({log_group_name: "/aws/lambda/#{lambda_name}"})
+        if resp.subscription_filters.length > 0
+          resp.subscription_filters.each do |filter|
+          @cloudwatch_client.delete_subscription_filter({log_group_name: "/aws/lambda/#{lambda_name}", filter_name: filter.filter_name})
+          end
+        end
+        @cloudwatch_client.put_subscription_filter({ log_group_name: "/aws/lambda/#{lambda_name}",
+          filter_name: log_forwarder, filter_pattern: '',
+          destination_arn: "arn:aws:lambda:#{@region}:#{@account}:function:#{log_forwarder}"})
+      end
+    end
+
     def deploy_lambda(lambda_role_arn, function_name, summary, runtime, handler, timeout)
       puts "Deploying #{function_name}"
       runtime ||= 'nodejs4.3'

data/lib/swaggerless/swaggerextractor.rb

@@ -6,6 +6,7 @@ module Swaggerless
   EXT_LAMBDA_HANDLER = 'x-amazon-lambda-handler'
   EXT_LAMBDA_TIMEOUT = 'x-amazon-lambda-timeout'
   EXT_LAMBDA_RUNTIME = 'x-amazon-lambda-runtime'
+  EXT_LAMBDA_LOG_FORWARDER = 'x-amazon-lambda-log-forwarder'
 
   AMZ_APIGATEWAY_AUTHORIZER = 'x-amazon-apigateway-authorizer'
 
@@ -50,6 +51,7 @@ module Swaggerless
       if to[:handler] == nil then to[:handler] = from[:handler] end
       if to[:timeout] == nil then to[:timeout] = from[:timeout] end
       if to[:runtime] == nil then to[:runtime] = from[:runtime] end
+      if to[:log_forwarder] == nil then to[:log_forwarder] = from[:log_forwarder] end
     end
 
     def is_lambda_config_correct(l1, l2)
@@ -57,14 +59,16 @@ module Swaggerless
       fill_in_config_gaps(l1,l2)
       return (l1[:handler] == l2[:handler] and
           l1[:timeout] == l2[:timeout] and
-          l1[:runtime] == l2[:runtime])
+          l1[:runtime] == l2[:runtime] and
+          l1[:log_forwarder] == l2[:log_forwarder])
     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] || method_config[SWGR_DESCRIPTION]}
+        description: method_config[SWGR_SUMMARY] || method_config[SWGR_DESCRIPTION],
+        log_forwarder: method_config[EXT_LAMBDA_LOG_FORWARDER]}
     end
 
   end

data/lib/swaggerless/version.rb

@@ -1,3 +1,3 @@
 module Swaggerless
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/tasks/swaggerless.rake

@@ -61,4 +61,15 @@ namespace :swaggerless do
     Swaggerless::Cleaner.new(@awsAccount, @awsRegion).clean_unused_deployments(swagger)
   end
 
+  task :delete_stage, [ :environment ] => [ :clean ] do |t, args|
+    swagger_content = File.read(@swaggerSpecFile)
+    swagger = YAML.load(swagger_content)
+    Swaggerless::Cleaner.new(@awsAccount, @awsRegion).remove_stage(swagger, args[:environment].gsub(/[^a-zA-Z0-9_]/, "_"))
+  end
+
+  desc 'Remove stage and cleanup'
+  task :delete, [ :environment ] => [ :clean, :delete_stage, :clean_aws_resources ] do |t, args|
+  end
+
+
 end

metadata

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