prima-twig 0.31.53 → 0.31.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa90a2b38ef23d274dce670d9e3bacc283e1b71d
-  data.tar.gz: dd2d32f363225a3e810c1fcd5461957b645a9df2
+  metadata.gz: 6c262be2280c84f31191af9e87cd45177be1ab29
+  data.tar.gz: 06243f4e861fe812731ddc26f12c6973fc88f774
 SHA512:
-  metadata.gz: '0599e3f7e2591d702001c6974561e242afcf900cdc860692d60465890b28e07e025fcf0a9b58c628ca7e6d9f7d744dbfe61f158e1de69dca448020d9b2758124'
-  data.tar.gz: 739c82fcd848385b31b7ad2b9161330837394d0badd8467c09fe9ca93cb573ed2e31c6fc0ce7cd94b55ee9f919aadc3405eb218f2e0d3a1c1aaffdacdcdac496
+  metadata.gz: 1d54266727a239f145a442d9210760ed69e6a5397630dc96af1d276aaa2d2f3b4987efe8ce61ac7998967948a886a7ba15011fde44d9850e020c985dcf6eea7c
+  data.tar.gz: 1a136911820beda715f1f54be5378bda91d7cff3ba7842eb6289bccb34d3467b0f47a6e495ae6319709415d87b102e3ac5138693d592bdbd4ba428d60ce65ccf

data/bin/twig-feature

@@ -26,7 +26,7 @@ class Release
     @asg = Aws::AutoScaling::Client.new
     @s3_bucket = 'prima-artifacts'
     @artifact_path = '/tmp/prima-artifact.zip'
-    @import_db_task = 'arn:aws:ecs:eu-west-1:001575623345:task-definition/ecs-task-db-restore-TaskDefinitionDbRestore-AN2BFXMKDLCZ:1'
+    @import_db_task = 'arn:aws:ecs:eu-west-1:001575623345:task-definition/ecs-task-db-restore2-TaskDefinitionDbRestore-1NKCQ2WEKOGK5:1'
     @dns_record_identifier = nil
     @ecs_cluster_name = nil
     @deploy_update = false

data/bin/twig-update-ami

@@ -19,13 +19,21 @@ class TwigUpdateAmi
   end
 
   def execute!(args)
-    update_amis args[0], args[1], args[2]
+    if args[3] == 'staging'
+      update_amis args[0], args[1], args[2], true
+    else
+      update_amis args[0], args[1], args[2], false
+    end
   end
 
   private
 
-  def update_amis(ami_id, ami_name, ami_description)
+  def update_amis(ami_id, ami_name, ami_description, only_staging)
     @instances['amis'].each do |ami|
+      if only_staging and ami['json'] != 'ecs.json'
+        output "skipping #{ami['json']} because only_staging enabled".yellow
+        next
+      end
       output 'updating instance definition'.light_green
       Dir.chdir 'ami'
       update_instance_name(ami_id, ami_name, ami_description, ami['json'])
@@ -34,6 +42,10 @@ class TwigUpdateAmi
       Dir.chdir '..'
       output 'new ami id: ' + new_ami_id
       ami['stacks'].each do |stack|
+        if only_staging and not stack['stack_name'].include?('allinone-staging')
+          output "skipping #{stack['stack_name']} because only_staging enabled".yellow
+          next
+        end
         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'])
@@ -42,12 +54,16 @@ class TwigUpdateAmi
           update_stack_url(stack['stack_name'], stack['template_url'], get_stack_parameters(stack['stack_name']))
         end
       end
-      unless ami['batch_compute_environments'].nil?
+      unless ami['batch_compute_environments'].nil? or only_staging
         ami['batch_compute_environments'].each do |ce|
           update_batch_compute_environment(ce, new_ami_id)
         end
       end
       ami['stacks'].each do |stack|
+        if only_staging and not stack['stack_name'].include?('allinone-staging')
+          output "skipping #{stack['stack_name']} because only_staging enabled".yellow
+          next
+        end
         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
@@ -115,7 +131,7 @@ 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[/#{stack['label']}[0-9]?+/]
+    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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.31.53
+  version: 0.31.54
 platform: ruby
 authors:
 - Matteo Giachino
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: The Prima twig toolbelt