lambda-version-manager 0.0.14 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b74f08aa1f3d28d495ce5ed45725e11fdd99233
-  data.tar.gz: 81d3e4031ea100cd5713242ca6273a6c93a9d35c
+  metadata.gz: fd802fb143d6d2fe85fe2e5964ccce86f796300c
+  data.tar.gz: 84aee5400d772dc1945a208a0cf8405f478b7883
 SHA512:
-  metadata.gz: 2e7d3aabd312942d9edd74d22247abcb104c0bf7e8a6c20c5efdb8fc7836f4b0c8714759e267714d50b1ed9bbce383585e0e1f7e17ac417f2cfb46ec56396186
-  data.tar.gz: b7744d9a396c49c9c17fc0ea77c203bfd3b4df9c452d48ed714243014403be1172cd8ec2eaf0b523ef738cefeebe3b8f7b3407272af676ef1c8269e34e4f19fe
+  metadata.gz: e02245ccddaf83685e8bf01d2964c6e5147bcf4a5a8334e7118ebc8714ae2614ee0f9d10fdc504f76bd4ad477ec58546cfe4e36c93eb3449719d96f3492da40f
+  data.tar.gz: 62eb53f6b482acf97fa591bfe73f67c0f8815b1618dcbb6ac1fd166260ef7215429482e247d172c72416d93d15b35d5059561579a51abbbc361d402b28057841

data/bin/lambda-version-manager

@@ -13,30 +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['deploy_all'], opts['project_path'], opts['account'], array[0].strip)
-        deployer.deploy(opts['environments'])
-      end
-    else
-      deployer = Deployer.new(opts['deploy_all'], 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)
@@ -55,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

@@ -61,7 +61,7 @@ class Deployer
     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])
 
@@ -111,7 +111,12 @@ class Deployer
     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

@@ -14,7 +14,7 @@ class Project
   def get_lambdas
     lambdas = {}
     environments.keys.each do |env|
-      lambdas[env] = YAML.load_file("#{project_path}/environments/#{env}.yaml")
+      lambdas[env] = YAML.load_file("#{project_path}/environments/#{env}.yaml") if File.exist?("#{project_path}/environments/#{env}.yaml")
     end
     lambdas
   end
@@ -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.14
+  version: 0.0.19
 platform: ruby
 authors:
 - Bryan Call