prima-twig 0.31.38 → 0.31.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e33b92c795fca48960912187e6aa226d3def6a3f
-  data.tar.gz: bb0997960aa2e39af5caf8bafbcda27adecb02f0
+  metadata.gz: aaaea2c9fc1c40f894ba17ab9554f38cf758fdc6
+  data.tar.gz: 4126caf4f83e8dc427f7e20d0041d3f97b47669e
 SHA512:
-  metadata.gz: d68395a4b9df1a139129788df0aa9acf2b5815b0a2c8c4b3048458e6c8a523edf747d0965fbf2d0c0e70d524cdfd550ea6914f7ac845f6325f9f390ff78d3e60
-  data.tar.gz: 7aed21132a0b9f7691eec0089835a5120d0851ee85dc0d03cde19f9169dbcc3cf8e7ad4b278507df91ce0eb9b16cf4a2f875f3d8737b049589708b9eb248b7f1
+  metadata.gz: 444c4fca18efa7dbc437c8d104d34180e3132d04b3ae8c8e8aa0b039d7beacec93f07e10b9f66b1f91062458299d63d1f1c6ffecc26a2937809164bf4fed3e45
+  data.tar.gz: 7ab01fe2946eb802b310a9cfce1a3aa94ee6307fa06a1e674afb74663638bc476cbd338fbc0c6cbde24a4cf2d2995c0f80c8ba2115372f6259722e43129cb20f

data/bin/twig-update-ami

@@ -25,28 +25,32 @@ class TwigUpdateAmi
   private
 
   def update_amis(ami_id, ami_name, ami_description)
-    @instances['stacks'].each do |instance|
+    @instances['amis'].each do |ami|
       output 'updating instance definition'.light_green
       Dir.chdir 'ami'
-      update_instance_name(ami_id, ami_name, ami_description, instance['json'])
+      update_instance_name(ami_id, ami_name, ami_description, ami['json'])
       output 'running packer update (this could take some time)'.light_green
-      new_ami_id = update_packer instance['json']
+      new_ami_id = update_packer ami['json']
       Dir.chdir '..'
       output 'new ami id: ' + new_ami_id
-      instance['stacks'].each do |stack|
+      ami['stacks'].each do |stack|
         output 'updating ' + stack['yaml_filename'] + ' and copying onto s3'
         update_yml_files(new_ami_id, stack['yaml_filename'])
         copy_yml_files_to_s3(stack['yaml_filename'], stack['s3_key'])
         output 'updating stack on cloudformation'
-        update_stack_url(stack['stack_name'], stack['template_url'], get_stack_parameters(stack['stack_name'])) if stack['stack_name']
+        if stack['stack_name'] and stack_exists?(stack['stack_name'])
+          update_stack_url(stack['stack_name'], stack['template_url'], get_stack_parameters(stack['stack_name']))
+        end
       end
-      unless instance['batch_compute_environments'].nil?
-        instance['batch_compute_environments'].each do |ce|
+      unless ami['batch_compute_environments'].nil?
+        ami['batch_compute_environments'].each do |ce|
           update_batch_compute_environment(ce, new_ami_id)
         end
       end
-      instance['stacks'].each do |stack|
-        wait_for_stack_ready(stack['stack_name'], ['CREATE_FAILED', 'ROLLBACK_IN_PROGRESS', 'ROLLBACK_FAILED', 'DELETE_IN_PROGRESS', 'DELETE_FAILED', 'DELETE_COMPLETE', 'UPDATE_ROLLBACK_FAILED', 'UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS', 'UPDATE_ROLLBACK_COMPLETE', 'ROLLBACK_COMPLETE'])
+      ami['stacks'].each do |stack|
+        if stack['stack_name'] and stack_exists?(stack['stack_name'])
+          wait_for_stack_ready(stack['stack_name'], ['CREATE_FAILED', 'ROLLBACK_IN_PROGRESS', 'ROLLBACK_FAILED', 'DELETE_IN_PROGRESS', 'DELETE_FAILED', 'DELETE_COMPLETE', 'UPDATE_ROLLBACK_FAILED', 'UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS', 'UPDATE_ROLLBACK_COMPLETE', 'ROLLBACK_COMPLETE'])
+        end
       end
     end
   end
@@ -64,7 +68,7 @@ class TwigUpdateAmi
   end
 
   def update_packer(json_filename)
-    execute_command "packer build -machine-readable ./#{json_filename} | tee build.log"
+    execute_command "packer build  -var datadog_apikey=`biscuit get -f ../configs/secrets/common.yml common_production_apikey_datadog` -machine-readable ./#{json_filename} | tee build.log"
     `grep 'artifact,0,id' build.log | cut -d, -f6 | cut -d: -f2`.sub(/\n/, '')
   end
 
@@ -111,9 +115,9 @@ class TwigUpdateAmi
     file_content = File.read stack['yaml_filename']
     file_content.gsub!(/(\w+:\s+)!(\w+)/i, '\1QuaCeraUnPuntoEsclamativo\2')
     file_content_original = file_content.clone
-    old_ce_name = file_content[/BatchComputeEnvironment[0-9]?+/]
-    new_ce_version = old_ce_name.sub('BatchComputeEnvironment', '').to_i + 1
-    new_ce_name = 'BatchComputeEnvironment' + new_ce_version.to_s
+    old_ce_name = file_content[/#{stack['label']}[0-9]?+/]
+    new_ce_version = old_ce_name.sub(stack['label'], '').to_i + 1
+    new_ce_name = stack['label'] + new_ce_version.to_s
     file_content.gsub!(old_ce_name, new_ce_name)
     File.open stack['yaml_filename'] + 'new', 'w' do |f|
       f.write file_content
@@ -129,6 +133,10 @@ class TwigUpdateAmi
 
     output 'updating stack on cloudformation, (step 1)'
     copy_yml_files_to_s3(stack['yaml_filename'], stack['s3_key'])
+    if not stack['stack_name'] or not stack_exists?(stack['stack_name'])
+      return false
+    end
+
     update_stack_url(stack['stack_name'], stack['template_url'], get_stack_parameters(stack['stack_name']))
     wait_for_stack_ready(stack['stack_name'], ['CREATE_FAILED', 'ROLLBACK_IN_PROGRESS', 'ROLLBACK_FAILED', 'DELETE_IN_PROGRESS', 'DELETE_FAILED', 'DELETE_COMPLETE', 'UPDATE_ROLLBACK_FAILED', 'UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS', 'UPDATE_ROLLBACK_COMPLETE', 'ROLLBACK_COMPLETE'])
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.31.38
+  version: 0.31.39
 platform: ruby
 authors:
 - Matteo Giachino
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk