swaggerless 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d694d07f97c1af61e3c9ae6711123dbf7256d1e4
-  data.tar.gz: 9d5618bdf56253b8c8924673ebf9431ede719e8e
+  metadata.gz: 6a596bd778896068d191ed0e6005a6aa09decd43
+  data.tar.gz: 4f419c8aeebf5264c0db03388d57aecb593b061e
 SHA512:
-  metadata.gz: f04f394a5a902379f3ed2acf25bbb3d1b6edd8da3dcbabacb9f8f1cb3e8e8fd785457d81d51c6b8138ff6bbc0f111033c2726bdc662f64164bf541388a19d752
-  data.tar.gz: 3b76780b95ee2f581b21a4be4953dcea1e8f2ce61724ea32739015f0673e58e7e828942c0715c046c52c51b9b08c5f839d77169bc3f50fcb46d5c1087a5e73e0
+  metadata.gz: c75f5ac8c1d2c077f72f1ff83941f0b6c83d014980b4256837125f2cdc6920bd9638dc3c58b3ba67c4d84a3ed718c437b6ae2c54c8b730010c4201b813882cad
+  data.tar.gz: 13a6c99d9526d9fedefc9d089b5bf7d3f33f6b4296a2ab2a3c7cc4210978692aeb40f6e12cc8aeae47f99475615e5af75717746003f80011ef39eeffadaa1545

data/lib/swaggerless/cleaner.rb

@@ -0,0 +1,78 @@
+require "aws-sdk"
+
+module Swaggerless
+
+  class Cleaner
+
+    def initialize(account, region)
+      @region = region
+      @account = account
+      @api_gateway_client = Aws::APIGateway::Client.new(region: @region)
+      @lambda_client = Aws::Lambda::Client.new(region: @region)
+      @swaggerExtractor = Swaggerless::SwaggerExtractor.new();
+    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
+
+      if api
+        used_deployments = Hash.new
+        response = @api_gateway_client.get_stages({rest_api_id: api.id})
+        response.item.each do |stage|
+          puts "Deployment #{stage.deployment_id} used by #{stage.stage_name}"
+          used_deployments[stage.deployment_id] = stage.stage_name
+        end
+        response = @api_gateway_client.get_deployments({rest_api_id: api.id, limit: 500})
+        time_threshold = Time.now
+        response.items.each do |deployment|
+          puts "Deployment #{deployment.id} is not used and old enough to be pruned"
+          if used_deployments[deployment.id] == nil and Time.at(deployment.created_date) < time_threshold
+            @api_gateway_client.delete_deployment({rest_api_id: api.id, deployment_id: deployment.id})
+          end
+        end
+
+        response = @api_gateway_client.get_deployments({rest_api_id: api.id, limit: 500})
+        lambda_liases_used = Hash.new
+        response.items.each do |deployment|
+          first_char = deployment.description.rindex(":")
+          if first_char
+            func_alias = deployment.description[deployment.description.rindex(":")+2..-1]
+            puts "Lambda alias #{func_alias} still used by deployment #{deployment.id}"
+            lambda_liases_used[func_alias] = deployment.id
+          end
+        end
+
+        configured_lambdas = @swaggerExtractor.get_lambda_map(swagger)
+        configured_lambdas.each do |functionName, value|
+          lambda_versions_used = Hash.new
+          resp = @lambda_client.list_aliases({function_name: functionName, max_items: 500 })
+          resp.aliases.each do |funcAlias|
+            if lambda_liases_used[funcAlias.name] == nil then
+              puts "Deleting alias #{funcAlias.name} for lambda function #{functionName}"
+              @lambda_client.delete_alias({function_name: functionName, name: funcAlias.name})
+            else
+              puts "Lambda version #{funcAlias.function_version} still used by function deployment #{functionName}"
+              lambda_versions_used[funcAlias.function_version] = funcAlias.name
+            end
+
+          end
+
+          resp = @lambda_client.list_versions_by_function({function_name: functionName, max_items: 500})
+          resp.versions.each do |lambda|
+            if lambda.version != "$LATEST" and lambda_versions_used[lambda.version] == nil
+              puts "Deleting lambda version #{lambda.version} of function #{functionName}"
+              @lambda_client.delete_function({function_name: functionName, qualifier: lambda.version})
+            end
+
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/swaggerless/deployer.rb

@@ -12,6 +12,7 @@ module Swaggerless
       @output_path = 'output'
       @verbose = false;
       @function_alias = get_current_package_alias
+      @swaggerExtractor = Swaggerless::SwaggerExtractor.new();
     end
 
     def create_lambda_package(directory, outputName)
@@ -22,16 +23,6 @@ module Swaggerless
       return swagger["info"]["title"].gsub(/\s+/, '_')
     end
 
-    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[AMZ_APIGATEWAY_AUTHORIZER] != nil then
@@ -61,7 +52,7 @@ module Swaggerless
     end
 
     def deploy_lambdas_and_update_uris(lambda_role_arn, swagger)
-      lambdas_configs = get_lambda_map(swagger)
+      lambdas_configs = @swaggerExtractor.get_lambda_map(swagger)
       deployed_operations = Hash.new
       swagger["paths"].each do |path, path_config|
         path_config.each do |method, method_config|
@@ -142,7 +133,7 @@ module Swaggerless
       while true do
         begin
           puts "Creating API Gateway Deployment"
-          @api_gateway_client.create_deployment({rest_api_id: api_id, stage_name: @env, description: "Automated deployment of #{@env}", variables: {"env" => @env }});
+          @api_gateway_client.create_deployment({rest_api_id: api_id, stage_name: @env, description: "Automated deployment of #{@env} using lambda: #{@function_alias}", variables: {"env" => @env }});
           url = "https://#{api_id}.execute-api.#{@region}.amazonaws.com/#{@env}/"
           puts "API available at #{url}"
           return url;
@@ -154,55 +145,6 @@ 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/swaggerextractor.rb

@@ -0,0 +1,68 @@
+require "aws-sdk"
+
+module Swaggerless
+
+  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'
+
+  class SwaggerExtractor
+
+    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)
+          elsif method_config[EXT_LAMBDA_NAME]
+            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
+
+    private
+
+    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.2"
+  VERSION = "0.1.3"
 end

data/lib/tasks/swaggerless.rake

@@ -29,7 +29,7 @@ namespace :swaggerless do
     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"
+    puts "Setting ENV[apiUrl] to point to the deployed API"
   end
 
   desc 'Package the project for AWS Lambda'
@@ -54,4 +54,11 @@ namespace :swaggerless do
     FileUtils.rm_rf('output')
   end
 
+  desc 'Clean AWS resources'
+  task :clean_aws_resources do
+    swagger_content = File.read(@swaggerSpecFile)
+    swagger = YAML.load(swagger_content)
+    Swaggerless::Cleaner.new(@awsAccount, @awsRegion).clean_unused_deployments(swagger)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swaggerless
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Rafal Nowosielski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,8 +93,10 @@ files:
 - README.md
 - Rakefile
 - lib/swaggerless.rb
+- lib/swaggerless/cleaner.rb
 - lib/swaggerless/deployer.rb
 - lib/swaggerless/packager.rb
+- lib/swaggerless/swaggerextractor.rb
 - lib/swaggerless/version.rb
 - lib/tasks/swaggerless.rake
 - swaggerless.gemspec