prima-twig 0.39.21 → 0.39.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 10da4b461ac5211077e083f78d1541ac9059c76d
-  data.tar.gz: a65e8f184c49aae54c8d58179c7fec3e11557d0d
+SHA256:
+  metadata.gz: 9d79cb6c8547f4f27a6f6e170d3656cee4d7f6f11ebb7b2ee05e67d89099723f
+  data.tar.gz: 0f36d2b236d7505a38139b567493f8312d20b28dfd0ed5d0fbe9231e08a2847e
 SHA512:
-  metadata.gz: 32d19206bb2c346affcd1d1a423c7ab6aa237b6712e9fb2b6f07108636a676c7b7dd22f22106edcb1ac58d67dc9a143bb60e290824f0055730da98a197078616
-  data.tar.gz: 30976d6fb6ceac81f16c7b70d013fc7e512b88fc6838da25585b1b3aed96667565226d88fd1d49423f48b9e61ab9a379ec4062d4ae3e3646b5d4599d4df884d6
+  metadata.gz: ea59ec0200d64481f69071412c06b7a9a1dd1574924512e2772588bc41d53c460a5a29713d82d5aa57f11ed2fe04ae8f4b2217729c1eac631f272c5125918564
+  data.tar.gz: 39eed3b688c3cb5c38bd55786378ebaa5a90650bcd97115bdaa518898889db34c8b1df2ce9a82e5022f8e1b0c22f0a0d70798893cb5678664c0cd12092d5e2fb

data/bin/twig-feature

@@ -598,9 +598,9 @@ class Release
       output "Stack ancora attivi: #{stacks_to_delete.length.to_s}. Attendo altri 10 secondi per eliminare il cluster ECS"
     end
 
-    delete_stack(cluster_stack_name)
-    delete_stack(@base_stack_name_alb + env_hash[3..8])
-    delete_stack(@base_stack_name_alb_ws + env_hash[3..8])
+    delete_stack(cluster_stack_name) if stack_exists?(cluster_stack_name)
+    delete_stack(@base_stack_name_alb + env_hash[3..8]) if stack_exists?(@base_stack_name_alb + env_hash[3..8])
+    delete_stack(@base_stack_name_alb_ws + env_hash[3..8]) if stack_exists?(@base_stack_name_alb_ws + env_hash[3..8])
     `git checkout master && git push origin --delete ${DRONE_BRANCH}`
     output "Finito!".green
 
@@ -1932,7 +1932,7 @@ class Release
       if minimal
         [
           'docker-compose build web',
-          "docker-compose run -w $PWD -u root -e WS_ENDPOINT=#{ws_endpoint} -e GRAPHQL_ENDPOINT=#{frontend_endpoint} -e MIX_ENV=staging -e HOSTNAME_PATTERN=https://#{crash_qa_host} web \
+          "docker-compose run -w $PWD -u root -e WS_ENDPOINT=#{ws_endpoint} -e GRAPHQL_ENDPOINT=#{frontend_endpoint} -e MIX_ENV=staging -e ENV_HASH=#{deploy_id} -e HOSTNAME_PATTERN=https://#{crash_qa_host} web \
           '-c' 'sed -i \"s/crash-staging.prima.it/#{crash_qa_host}/g\" config/staging.exs && \
           mix local.hex --force && mix hex.info && \
           mix deps.get && \
@@ -1979,7 +1979,7 @@ class Release
       [
         'mv docker-compose-ci.yml docker-compose.yml',
         'docker-compose build web',
-        "docker-compose run -w $PWD -e WS_ENDPOINT=#{ws_endpoint} -e GRAPHQL_ENDPOINT=#{frontend_endpoint} -e MIX_ENV=qa web \
+        "docker-compose run -w $PWD -e WS_ENDPOINT=#{ws_endpoint} -e GRAPHQL_ENDPOINT=#{frontend_endpoint} -e ENV_HASH=#{deploy_id} -e MIX_ENV=qa web \
         '-c' 'sed -i \"s/web-qa-host/#{web_qa_host}/g\" config/qa.exs && \
         sed -i \"s/crash-qa-host/#{crash_qa_host}/g\" config/qa.exs && \
         mix local.hex --force && mix hex.info && \
@@ -2634,17 +2634,20 @@ class Release
   end
 
   def import_redis_crash(qa_ip_address)
-    output "Importo dump di Redis da staging\n".yellow
+    output "Importo chiavi di Redis da staging\n".yellow
 
+    prefixes = ['CODICI', 'fun_with_flags']
     redis_qa = Redis.new(:url => "redis://#{qa_ip_address}:6379/10")
-
-    return unless redis_qa.keys('CODICI').empty?
-
     redis_staging = Redis.new(:url => 'redis://staging.cache-1.prima.it:6379/10')
 
-    dump_staging = redis_staging.dump 'CODICI'
-
-    redis_qa.restore 'CODICI', 0, dump_staging
+    prefixes.each do |prefix|
+      redis_staging.keys("#{prefix}*").each do |key|
+        next unless redis_qa.keys(key).empty?
+        output "Importo #{key} dal Redis di staging\n".yellow
+        dump_staging = redis_staging.dump key
+        redis_qa.restore key, 0, dump_staging
+      end
+    end
   end
 
   def import_dbs(ip_address)

data/bin/twig-update-ami

@@ -15,67 +15,61 @@ class TwigUpdateAmi
     exec "gem update prima-twig && twig update-ami #{ARGV.join ' '}" unless `gem outdated`.lines.grep(/^prima-twig \(.*\)/).empty?
     @s3 = Aws::S3::Client.new
     @s3_bucket = 'prima-deploy'
-    @instances = JSON.parse File.read('../twig-binaries/cloudformation.json')
+    @instances_production = JSON.parse File.read('../twig-binaries/cloudformation_prod.json')
+    @instances_staging = JSON.parse File.read('../twig-binaries/cloudformation_staging.json')
   end
 
   def execute!(args)
     if args[3] == 'staging'
-      update_amis args[0], args[1], args[2], true
+      update_amis args[0], args[1], args[2], [@instances_staging]
     else
-      update_amis args[0], args[1], args[2], false
+      update_amis args[0], args[1], args[2],  [@instances_production] #[@instances_staging, @instances_production]
     end
   end
 
   private
 
-  def update_amis(ami_id, ami_name, ami_description, only_staging)
-    @instances['amis'].each do |ami|
-      if only_staging and ami['json'] != 'ecs-allinone.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'])
-      output 'running packer update (this could take some time)'.light_green
-      new_ami_id = update_packer ami['json']
-      Dir.chdir '..'
-      output 'new ami id: ' + new_ami_id
-      stop_if new_ami_id.to_s.empty?, 'Failed to generate AMI!'
-      ami['stacks'].each do |stack|
-        if only_staging and not stack['stack_name'].include?('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'])
-        output 'updating stack on cloudformation'
-        if stack['stack_name'] and stack_exists?(stack['stack_name'])
-          stack_parameters = get_stack_parameters(stack['stack_name'])
-          stack_parameters.each do |param|
-            if param.parameter_key.eql?('DesiredCapacity')
-              desired_capacity = get_desired_capacity(stack['stack_name'])
-              desired_capacity.nil? ? break : param.parameter_value.sub!(/[0-9]+/, desired_capacity.to_s)
-              break
+  def update_amis(ami_id, ami_name, ami_description, instances)
+    instances.each do |instance_class|
+      instance_class['amis'].each do |ami|
+        output 'updating instance definition'.light_green
+        Dir.chdir 'ami'
+        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 ami['json']
+        Dir.chdir '..'
+        output 'new ami id: ' + new_ami_id
+        stop_if new_ami_id.to_s.empty?, 'Failed to generate AMI!'
+        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'
+          if stack['stack_name'] and stack_exists?(stack['stack_name'])
+            stack_parameters = get_stack_parameters(stack['stack_name'])
+            stack_parameters.each do |param|
+              if param.parameter_key.eql?('DesiredCapacity')
+                desired_capacity = get_desired_capacity(stack['stack_name'])
+                desired_capacity.nil? ? break : param.parameter_value.sub!(/[0-9]+/, desired_capacity.to_s)
+                break
+              end
             end
+            update_stack_url(stack['stack_name'], stack['template_url'], stack_parameters)
+          else
+            output "skipping #{stack['yaml_filename']} because is not active on cloudformation"
           end
-          update_stack_url(stack['stack_name'], stack['template_url'], stack_parameters)
         end
-      end
 
-      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
+        unless ami['batch_compute_environments'].nil?
+          ami['batch_compute_environments'].each do |ce|
+            update_batch_compute_environment(ce, new_ami_id)
+          end
         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'])
+
+        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
@@ -112,9 +106,7 @@ class TwigUpdateAmi
 
   def update_yml_files(ami_id, yaml_filename)
     file_content = File.read yaml_filename
-
     file_content.sub!(/ami-[0-9a-z]{8,17}/, ami_id)
-
     File.open yaml_filename, 'w' do |f|
       f.write file_content
     end
@@ -179,6 +171,11 @@ class TwigUpdateAmi
     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'])
 
     output "retrieving the list of stacks that are currently using the stack #{stack['stack_name']}"
+    if stack['stack_name'].include?('staging')
+      job_stacks = list_import_stacks old_ce_name + '-staging'
+    else
+      job_stacks = list_import_stacks old_ce_name + '-production'
+    end
     job_stacks = list_import_stacks old_ce_name + '-production'
     job_stacks.each do |job_stack_name|
       output "updating the stack #{job_stack_name} to use to the new compute environment"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.39.21
+  version: 0.39.22
 platform: ruby
 authors:
 - Matteo Giachino
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-09-05 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.7.7
 signing_key: 
 specification_version: 4
 summary: The Prima twig toolbelt