swaggerless 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a596bd778896068d191ed0e6005a6aa09decd43
-  data.tar.gz: 4f419c8aeebf5264c0db03388d57aecb593b061e
+  metadata.gz: 877151d9ab0dbe93d6ff7b28cec271aa7b49e114
+  data.tar.gz: dde2af502d75aa20bbbc8e24cc699c390bc73b07
 SHA512:
-  metadata.gz: c75f5ac8c1d2c077f72f1ff83941f0b6c83d014980b4256837125f2cdc6920bd9638dc3c58b3ba67c4d84a3ed718c437b6ae2c54c8b730010c4201b813882cad
-  data.tar.gz: 13a6c99d9526d9fedefc9d089b5bf7d3f33f6b4296a2ab2a3c7cc4210978692aeb40f6e12cc8aeae47f99475615e5af75717746003f80011ef39eeffadaa1545
+  metadata.gz: d6dc71afc0b92c7cf60668b91c5c5babfc6e583cb37557483c7f6b6163cfe822dd0ef6ade4dd99c41658000c535bf92ab04f9071b0e0b9d8ca69c75f861fe6d2
+  data.tar.gz: 224e708bf3ac7bbf71b21cfb0c4b1a02dd5c1db59d2fbb08acff52fe0a5993b4fa32aac714007b13afbee0f027b67bffd236e71d74bdeeccd7d34860afe47ce0

data/lib/swaggerless/cleaner.rb

@@ -26,8 +26,8 @@ module Swaggerless
         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
+            puts "Deployment #{deployment.id} is not used and old enough to be pruned"
             @api_gateway_client.delete_deployment({rest_api_id: api.id, deployment_id: deployment.id})
           end
         end
@@ -46,25 +46,30 @@ module Swaggerless
         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
+          begin
+            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
 
-          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
 
+            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
+          rescue Aws::Lambda::Errors::ResourceNotFoundException
+            puts "Function #{functionName} does not exist and will be skipped"
           end
 
         end

data/lib/swaggerless/swaggerextractor.rb

@@ -11,6 +11,7 @@ module Swaggerless
 
   SWGR_OPERATION_ID = 'operationId'
   SWGR_SUMMARY = 'summary'
+  SWGR_DESCRIPTION = 'description'
 
   class SwaggerExtractor
 
@@ -21,10 +22,11 @@ module Swaggerless
           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
+            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)
+            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
@@ -32,14 +34,14 @@ module Swaggerless
       end
 
       swagger["securityDefinitions"].each do |securityDefinitionName, securityDefinition|
-        if securityDefinition[AMZ_APIGATEWAY_AUTHORIZER] != nil then
-          if lambdas_map[securityDefinition[EXT_LAMBDA_NAME]] then
+        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)
+            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
@@ -50,17 +52,23 @@ module Swaggerless
 
     private
 
+    def fill_in_config_gaps(to, from)
+      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
+    end
+
     def is_lambda_config_correct(l1, l2)
-      return (l1['handler'] == l2['handler'] and
-          l1['timeout'] == l2['timeout'] and
-          l1['runtime'] == l2['runtime'])
+      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]}
+        description: method_config[SWGR_SUMMARY] || method_config[SWGR_DESCRIPTION]}
     end
 
   end

data/lib/swaggerless/version.rb

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

metadata

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