lambda-version-manager 0.0.13 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 956f8eec69ae5cd6730d7e4a61a5dd98e90fa8af
-  data.tar.gz: cf2597c815b9a37eeb5778fec66fe2810b716435
+  metadata.gz: a06023537b8e81252217196c3273da36f59c5dff
+  data.tar.gz: aab71c5d45d1a99e9dabd484dd154783b983144b
 SHA512:
-  metadata.gz: a9bcbf3f8e310b63db6b1151bc9eba8d51f3888a492d8a5121a319bafd348766315d7327b22bb9160ed0e026a9b3f1931bd3a5e365dd2d7ee61a176f75ad457f
-  data.tar.gz: 5a45b8da5fa4bd410ffad070b1ded3b91beaa17edf0db64728a1c9640e6c36c77f38459f889701aca8b0e8c0ac4066fd2b69c20a8d4676a1b21c24518ee8b910
+  metadata.gz: 64103478875e2d14a67baec6327a3f7a942fbebfef6be5f2d7bbaa7e937c01a28e48860955d202c3a280603ee14ba2ab8b6bcdd279c69a1c0c57d3e51f331342
+  data.tar.gz: '087c08623d652cc936344007c5808dacaa01ea05ae2a1348c8d9a5a5c41b1ea872ddbd537ea248dbf247693eef9d48a750e5e127329dea32c3633c2c0c4b9332'

data/bin/lambda-version-manager

@@ -13,29 +13,20 @@ class GeneratorCLI < ::Thor
   option 'artifact', banner: 'ARTIFACT', type: :string, desc: 'Deploy lambdas that use this artifact'
   option 'lambda', banner: 'LAMBDA', type: :string, desc: 'Deploy lambdas with this name'
   option 'account', banner: 'ACCOUNT', type: :string, desc: 'Account to deploy to', :required => true
-  option 'version_map_file', banner: 'VERSION_MAP_FILE', type: :string, desc: 'A java properties file mapping artifacts to update to version'
+  option 'deploy_all', banner: 'DEPLOY_ALL', type: :boolean, desc: 'Ignore the history therefore deploy everything included in the filter', default: false
 
   def deploy
     opts = validate_deploy(options)
-    if opts['version_map_file']
-      #for each x=y pair we need to call
-      File.readlines(options['version_map_file']).each do |line|
-        array = line.split("=")
-        deployer = Deployer.new(opts['project_path'], opts['account'], array[0].strip)
-        deployer.deploy(opts['environments'])
-      end
-    else
-      deployer = Deployer.new(opts['project_path'], opts['account'], opts['artifact'], opts['lambda'])
-      deployer.deploy(opts['environments'])
-    end
+    deployer = Deployer.new(opts['deploy_all'], opts['project_path'], opts['account'], opts['artifact'], opts['lambda'])
+    deployer.deploy(opts['environments'])
   end
 
   desc 'update_project', 'Update the versions'
   option 'project_path', banner: 'PROJECT_PATH', type: :string, desc: 'Path to the lambda version mappings project'
   option 'artifact', banner: 'ARTIFACT', type: :string, desc: 'Deploy lambdas that use this artifact'
   option 'version', banner: 'VERSION', type: :string, desc: 'Version of the new artifact'
-  option 'version_map_file', banner: 'VERSION_MAP_FILE', type: :string, desc: 'A java properties file mapping artifacts to update to version'
   option 'accounts', banner: 'ACCOUNT', type: :array, desc: 'Account to deploy to', :required => true
+  option 'sha1', banner: 'SHA1', type: :string, desc: 'SHA1 of the artifact'
 
   def update_project
     opts = validate_project_update(options)
@@ -54,31 +45,21 @@ class GeneratorCLI < ::Thor
       end
     end
 
-
-    if opts['version_map_file']
-      #for each artifact=version pair we need to call
-      File.readlines(opts['version_map_file']).each do |line|
-        array = line.split("=")
-        updated_files = project.update_by_artifact(lambda_env_map, array[0].strip, array[1].strip)
-        lambda_env_map = updated_files
-      end
-    else
-      lambda_env_map = project.update_by_artifact(lambda_env_map, opts['artifact'], opts['version'])
-    end
+    lambda_env_map = project.update_by_artifact(lambda_env_map, opts['artifact'], opts['version'], opts['sha1'])
     project.write_new_files(lambda_env_map)
   end
 
   no_commands do
     def validate_project_update(options)
-      unless options['version_map_file'] || (options['version'] && (options['lambda'] || options['artifact']))
-        raise 'Either a file must be specified or a version and lambda or artifact.'
+      unless options['version'] && (options['lambda'] || options['artifact'])
+        raise 'Either a version and lambda or artifact must be specified.'
       end
       options.dup
     end
 
     def validate_deploy(options)
-      unless options['version_map_file'] || options['environments'] || options['lambda'] || options['artifact']
-        raise 'Either a file must be specified or a environment or lambda or artifact.'
+      unless options['environments'] || options['lambda'] || options['artifact']
+        raise 'Either a environment or lambda or artifact must be specified.'
       end
       options.dup
     end

data/lib/deployer.rb

@@ -9,8 +9,10 @@ class Deployer
   attr_accessor :lambda
   attr_accessor :artifact
   attr_accessor :environments
+  attr_accessor :deploy_all
 
-  def initialize(project_path, account, artifact=nil, lambda=nil)
+  def initialize(deploy_all, project_path, account, artifact=nil, lambda=nil)
+    @deploy_all = deploy_all
     @project_path  = project_path
     @account = account
     @project = Project.new("#{project_path}")
@@ -48,12 +50,18 @@ class Deployer
     env_region_map = project.env_region_map
     #Filter by account as the primary owner of envs
     lambda_env_map = project.get_lambdas
-    lambda_env_map = diff_projects(lambda_env_map)
+    unless deploy_all
+      lambda_env_map = diff_projects(lambda_env_map)
+      if lambda_env_map.empty?
+        puts "No lambdas have been changed, skipping deploy"
+        return
+      end
+    end
     lambda_env_map = get_deployable_lambdas(lambda_env_map)
     environments ||= project.environments
     account_env_map.each do |env|
       #IF users has specified environments, skip if the environment is not a user specified one
-      next unless !environments.nil? && environments.include?(env)
+      next unless !environments.nil? && environments.include?(env) && !lambda_env_map[env].nil?
       lambda_env_map[env].each do |lambda_name, properties|
         client = Client.new(env_region_map[env])
 
@@ -66,8 +74,8 @@ class Deployer
         puts "S3 Key:  #{s3_key}"
         client.update_function_code(lambda_name,s3_bucket,s3_key)
       end
+      archive_project(env)
     end
-    archive_project
   end
 
 
@@ -88,13 +96,10 @@ class Deployer
     end
   end
 
-  def archive_project
-    if Dir.exist?("#{project_path}/.history/")
-      FileUtils.remove_dir("#{project_path}/.history/environments")
-      FileUtils.remove_dir("#{project_path}/.history/config")
-    end
+  def archive_project(environment)
+    FileUtils.mkpath("#{project_path}/.history/")
     FileUtils.copy_entry("#{project_path}/config","#{project_path}/.history/config")
-    FileUtils.copy_entry("#{project_path}/environments","#{project_path}/.history/environments")
+    FileUtils.copy_entry("#{project_path}/environments/#{environment}.yaml","#{project_path}/.history/environments/#{environment}.yaml")
   end
 
   def parse_archive
@@ -103,13 +108,15 @@ class Deployer
   end
 
   def diff_projects(new_project)
-    unless Dir.exist?("#{project_path}/.history/")
-      return new_project
-    end
     historic = parse_archive
     historic.each do |environment, lambdas|
       lambdas.each do |lambda, configs|
-        if new_project[environment][lambda].eql?(configs)
+        next if new_project[environment][lambda].nil?
+        if new_project[environment][lambda].has_key?('sha1')
+          if configs.has_key?('sha1')  && (configs['sha1'] == new_project[environment][lambda]['sha1'])
+            new_project[environment].delete(lambda)
+          end
+        elsif new_project[environment][lambda].eql?(configs)
           new_project[environment].delete(lambda)
         end
       end

data/lib/project.rb

@@ -45,13 +45,14 @@ class Project
   end
 
 
+
   def write_new_files(lambda_env_map)
     lambda_env_map.each do |env, contents|
       File.write("#{project_path}/environments/#{env}.yaml", contents.to_yaml)
     end
   end
 
-  def update_by_artifact(lambda_env_map, artifact, version)
+  def update_by_artifact(lambda_env_map, artifact, version, sha1=nil)
     #iterate through all lambdas and update the ones with version changes
     lambda_env_map.each do |env, lambda|
       pp env
@@ -59,6 +60,7 @@ class Project
       lambda.each do |lambda_name, properties|
         if properties['artifact_name'] == artifact
           properties['version'] = version
+          properties['sha1'] = sha1 unless sha1.nil?
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lambda-version-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.18
 platform: ruby
 authors:
 - Bryan Call