prima-twig 0.34.2 → 0.34.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d29e5e47cfdc63bc1bb336ed8cdbadbf4553e04f
-  data.tar.gz: 36ab8b43ff06844898f43425233eb1a58d9be6ed
+  metadata.gz: ed959d3bfd3095221f0b4604ef99aa4d693b072c
+  data.tar.gz: 8f3dc8f766d9be743bfd1542a24a50198b43f547
 SHA512:
-  metadata.gz: 30be37a00870ae231faca584e8e8427f1e8836f9a284b0775b14bf9d3727282eaa6b1f39d0aae19467437f3aef9f8a4ecebed0b23c40c3eb0f47477c1c9b38ce
-  data.tar.gz: 3c69f04f590ac193790ab24d6562b5f54cd83c45d312f3bd31e455e52356722e26cc8ab162a6d2172f3500650ffebed2d48b56afca9b6cdb198ab39c625439c1
+  metadata.gz: a6d2cf4c82c3c8b2ce2d96c2bd79badaff4aa40c0b6251bbbe39d951404e863b007107c395a4e62964987bcdf50aa7064746471a4e20d75a670280ce3bf66dca
+  data.tar.gz: 7c511d17627c06f05ad3c9d655f90be6449d15fedbbc98d34eb0009107ccd18990cf54b0a429353ea43b4f5f739d3f0075a1f001e68849f8030c8c248344d2e3

data/bin/twig-deploy

@@ -12,7 +12,6 @@ require 'erb'
 require 'base64'
 require 'rubyflare'
 require 'pp'
-require 'pry'
 
 def help_content
   <<-HELP
@@ -65,8 +64,7 @@ class Review
       when "parameters"
         reload_parameters!
       else
-        deploy_current! args[0]
-        # stop_if true, [:wrong_args, ['parameters']]
+        stop_if true, [:wrong_args, ['parameters']]
       end
     else
       deploy_revision!
@@ -146,70 +144,6 @@ class Review
     exec_step "terminal-notifier -message 'Deploy terminato'" if which 'terminal-notifier'
   end
 
-  def deploy_current!(project_name)
-    binding.pry
-    stop_if @prima.head_detached?, :detached_head
-    stop_if @prima.repo_has_modified_files?, "Non posso deployare con file non commitati"
-
-    output "Recupero degli artifacts in corso, attendi qualche secondo...".yellow
-    artifacts = get_artifacts(project_name)[0..49]
-
-    artifact_rev = choose do |menu|
-      menu.prompt = 'Scegli la release da deployare: '.cyan
-      menu.shell  = true
-
-      artifacts.each do |v|
-        title = @prima.reduce_size(v[:branch], 100)
-        commit_msg = @prima.reduce_size(v[:commit_msg], 250)
-        msg = "#{title} #{v[:created_at].strftime('%d/%m/%Y %H:%M:%S')} #{v[:rev]} #{commit_msg}".light_blue
-        menu.choice(msg) {v[:rev]}
-      end
-    end
-
-    user = `git config user.name`.delete "\n"
-    artifact = artifacts.select {|v| v[:rev] ==  artifact_rev}.first
-
-    do_deploy! artifact_rev, project_name, false
-
-    mail = Mail.new do
-      from     'deploy@prima.it'
-      to       'deploy@prima.it'
-      subject  "#{user} ha effettuato il deploy della revision #{artifact[:rev]}"
-    end
-
-    commit_msg = clean_commit_message(artifact[:commit_msg])
-
-    body = "## Deploy in produzione effettuato con successo\n\n"
-    body << "Data: #{Time.now.strftime('%d/%m/%Y %H:%M:%S')}\n\n"
-    body << "Utente: #{user}\n\n"
-    body << "Revision: [#{artifact[:rev]}](https://github.com/primait/#{project_name}/commit/#{artifact[:rev]}) del #{artifact[:created_at].strftime('%d/%m/%Y %H:%M:%S')}\n\n"
-    body << "Branch: [#{artifact[:branch]}](https://github.com/primait/#{project_name}/tree/#{artifact[:branch]})\n\n"
-    body << "Commit: #{commit_msg.gsub(/_/, '\_')}\n\n"
-
-    htmlBody = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new).render body
-
-    html_part = Mail::Part.new do
-      content_type 'text/html; charset=UTF-8'
-      body htmlBody
-    end
-    text_part = Mail::Part.new do
-      body htmlBody.gsub(/<br\s?\/?>/, "\r\n").gsub(/<\/?[^>]*>/, '')
-    end
-
-    mail.html_part = html_part
-    mail.text_part = text_part
-
-    opts = {address: 'email-smtp.eu-west-1.amazonaws.com', port: '587'}
-    opts[:user_name] = @prima.config['aws_username']
-    opts[:password] = @prima.config['aws_password']
-
-    mail.delivery_method(:smtp, opts)
-    mail.deliver
-
-    exec_step "git checkout master"
-    exec_step "terminal-notifier -message 'Deploy terminato'" if which 'terminal-notifier'
-  end
-
   def reload_parameters!
     artifact_rev = ''
     resp = @cf.describe_stacks({
@@ -250,27 +184,6 @@ class Review
     wait_for_stack_ready(stack_name_cron) unless stack_ready?(stack_name_cron)
   end
 
-  def do_deploy!(artifact_rev, project_name, reload_parameters=false)
-    binding.pry
-    deploy_command = "deploy/set_artifact_version #{artifact_rev}"
-
-    output "Il comando per il deploy sara': #{deploy_command}".yellow
-    confirm_message = "Sei sicuro di voler effettuare il deploy in produzione?"
-
-    exit unless @prima.yesno confirm_message.blue
-
-    # exec_step "git fetch"
-    # exec_step "git checkout #{artifact_rev}"
-    exec_step deploy_command
-
-    # stack_name_web = 'ecs-task-web-production'
-    # stack_name_consumer = 'ecs-task-consumer-production'
-    # stack_name_cron = 'ecs-task-consumer-production'
-    # wait_for_stack_ready(stack_name_web) unless stack_ready?(stack_name_web)
-    # wait_for_stack_ready(stack_name_consumer) unless stack_ready?(stack_name_consumer)
-    # wait_for_stack_ready(stack_name_cron) unless stack_ready?(stack_name_cron)
-  end
-
   def get_artifacts
     artifacts = []
     resp = @s3.list_objects(bucket: @s3_bucket, prefix: 'prima')
@@ -286,21 +199,6 @@ class Review
     artifacts.sort_by { |v| v[:created_at] }.reverse
   end
 
-  def get_artifacts(project_name)
-    artifacts = []
-    resp = @s3.list_objects(bucket: @s3_bucket, prefix: "microservices/#{project_name}")
-    resp.contents.each do |s3_object|
-      rev = s3_object.key.match("#{project_name}\\/\\d+\\.\\d+\\.\\d+.tar.gz$").to_s 
-      if rev
-        object = @s3.head_object(bucket: @s3_bucket, key: s3_object.key)
-        commit_msg = ''
-        commit_msg = Base64.decode64(object.metadata['commit_msg']).strip if object.metadata.has_key? 'commit_msg'
-        artifacts << {rev: rev, created_at: object.last_modified, branch: object.metadata['branch'], commit_msg: commit_msg } if object.metadata.has_key? 'branch'
-      end
-    end
-    artifacts.sort_by { |v| v[:created_at] }.reverse
-  end
-
   def launch_paparatzinger(job_name)
     @s3.get_object(
       response_target: '/tmp/paparatzinger_twig.yml',

data/lib/prima_aws_client.rb

@@ -24,7 +24,13 @@ module PrimaAwsClient
     loop do
       print '.'.yellow; STDOUT.flush
       options = next_token != '' ? { next_token: next_token } : {}
-      resp = cf_client.describe_stacks(options)
+      begin
+        resp = cf_client.describe_stacks(options)
+      rescue Aws::CloudFormation::Errors::Throttling => e
+        output 'Throttling, retrying in 15 seconds'.red
+        sleep 15
+        resp = cf_client.describe_stacks(options)
+      end
       stacks += resp.stacks
       break unless resp.next_token
       next_token = resp.next_token
@@ -35,57 +41,89 @@ module PrimaAwsClient
   end
 
   def create_stack(stack_name, stack_body, parameters = [], tags = [])
-    cf_client.create_stack(
-      stack_name: stack_name,
-      template_body: stack_body,
-      parameters: parameters,
-      tags: tags,
-      capabilities: ['CAPABILITY_IAM'],
-      on_failure: 'ROLLBACK'
-    )
-    output "La creazione dello stack #{stack_name} è stata avviata".green
+    begin
+      cf_client.create_stack(
+        stack_name: stack_name,
+        template_body: stack_body,
+        parameters: parameters,
+        tags: tags,
+        capabilities: ['CAPABILITY_IAM'],
+        on_failure: 'ROLLBACK'
+      )
+    rescue Aws::CloudFormation::Errors::Throttling => e
+      output 'Throttling, retrying in 15 seconds'.red
+      sleep 15
+      create_stack(stack_name, stack_body, parameters = [], tags = [])
+    else
+      output "La creazione dello stack #{stack_name} è stata avviata".green
+    end
   end
 
   def update_stack(stack_name, template_body, parameters = [], tags = [])
-    cf_client.update_stack(
-      stack_name: stack_name,
-      template_body: template_body,
-      parameters: parameters,
-      tags: tags,
-      capabilities: ['CAPABILITY_IAM']
-    )
-  rescue Aws::CloudFormation::Errors::ValidationError => e
-    raise e
-  else
-    output "L'update dello stack #{stack_name} è stato avviato".green
+    begin
+      cf_client.update_stack(
+        stack_name: stack_name,
+        template_body: template_body,
+        parameters: parameters,
+        tags: tags,
+        capabilities: ['CAPABILITY_IAM']
+      )
+    rescue Aws::CloudFormation::Errors::Throttling => e
+      output 'Throttling, retrying in 15 seconds'.red
+      sleep 15
+      update_stack(stack_name, template_body, parameters = [], tags = [])
+    rescue Aws::CloudFormation::Errors::ValidationError => e
+      raise e
+    else
+      output "L'update dello stack #{stack_name} è stato avviato".green
+    end
   end
 
   def update_stack_url(stack_name, template_url, parameters = [], tags = [])
-    cf_client.update_stack(
-      stack_name: stack_name,
-      template_url: template_url,
-      parameters: parameters,
-      tags: tags,
-      capabilities: ['CAPABILITY_IAM']
-    )
-  rescue Aws::CloudFormation::Errors::ValidationError => e
-    raise e
-  else
-    output "L'update dello stack #{stack_name} è stato avviato".green
+    begin
+      cf_client.update_stack(
+        stack_name: stack_name,
+        template_url: template_url,
+        parameters: parameters,
+        tags: tags,
+        capabilities: ['CAPABILITY_IAM']
+      )
+    rescue Aws::CloudFormation::Errors::Throttling => e
+      output 'Throttling, retrying in 15 seconds'.red
+      sleep 15
+      update_stack_url(stack_name, template_url, parameters = [], tags = [])
+    rescue Aws::CloudFormation::Errors::ValidationError => e
+      raise e
+    else
+      output "L'update dello stack #{stack_name} è stato avviato".green
+    end
   end
 
   def stack_exists?(stack_name)
-    cf_client.describe_stacks(stack_name: stack_name)
-  rescue Aws::CloudFormation::Errors::ValidationError => e
-    return false if e.message.include? 'does not exist'
-    raise e
-  else
-    true
+    begin
+      cf_client.describe_stacks(stack_name: stack_name)
+    rescue Aws::CloudFormation::Errors::Throttling => e
+      output 'Throttling, retrying in 15 seconds'.red
+      sleep 15
+      stack_exists?(stack_name)
+    rescue Aws::CloudFormation::Errors::ValidationError => e
+      return false if e.message.include? 'does not exist'
+      raise e
+    else
+      true
+    end
   end
 
   def delete_stack(stack_name)
-    cf_client.delete_stack(stack_name: stack_name)
-    output "Stack #{stack_name} spenta con successo\n".green
+    begin
+      cf_client.delete_stack(stack_name: stack_name)
+    rescue Aws::CloudFormation::Errors::Throttling => e
+      output 'Throttling, retrying in 15 seconds'.red
+      sleep 15
+      delete_stack(stack_name)
+    else
+      output "Stack #{stack_name} spenta con successo\n".green
+    end
   end
 
   def wait_for_stack_ready(stack_name, failed_statuses = ['CREATE_FAILED', 'ROLLBACK_IN_PROGRESS', 'ROLLBACK_FAILED', 'DELETE_IN_PROGRESS', 'DELETE_FAILED', 'DELETE_COMPLETE', 'UPDATE_ROLLBACK_FAILED', 'UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS'])
@@ -106,23 +144,52 @@ module PrimaAwsClient
   end
 
   def get_stack_tags(name)
-    resp = cf_client.describe_stacks(stack_name: name)
-    resp.stacks[0].tags
+    begin
+      resp = cf_client.describe_stacks(stack_name: name)
+    rescue Aws::CloudFormation::Errors::Throttling => e
+      output 'Throttling, retrying in 15 seconds'.red
+      sleep 15
+      get_stack_tags(name)
+    else
+      resp.stacks[0].tags
+    end
   end
 
   def get_stack_parameters(name)
-    resp = cf_client.describe_stacks(stack_name: name)
-    resp.stacks[0].parameters
+    begin
+      resp = cf_client.describe_stacks(stack_name: name)
+    rescue Aws::CloudFormation::Errors::Throttling => e
+      output 'Throttling, retrying in 15 seconds'.red
+      sleep 15
+      get_stack_parameters(name)
+    else
+      resp.stacks[0].parameters
+    end
   end
 
   def get_stack_outputs(name)
-    resp = cf_client.describe_stacks(stack_name: name)
-    resp.stacks[0].outputs
+    begin
+      resp = cf_client.describe_stacks(stack_name: name)
+    rescue Aws::CloudFormation::Errors::Throttling => e
+      output 'Throttling, retrying in 15 seconds'.red
+      sleep 15
+      get_stack_outputs(name)
+    else
+      resp.stacks[0].outputs
+    end
   end
 
   def get_stack_template(name)
-    resp = cf_client.get_template(stack_name: name)
-    resp.template_body
+    begin
+      resp = cf_client.get_template(stack_name: name)
+    rescue Aws::CloudFormation::Errors::Throttling => e
+      output 'Throttling, retrying in 15 seconds'.red
+      sleep 15
+      get_stack_template(name)
+    else
+      resp.template_body
+    end
+
   end
 
   def stack_ready?(stack_name, failed_statuses = ['CREATE_FAILED', 'ROLLBACK_IN_PROGRESS', 'ROLLBACK_FAILED', 'DELETE_IN_PROGRESS', 'DELETE_FAILED', 'DELETE_COMPLETE', 'UPDATE_ROLLBACK_FAILED', 'UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS'])
@@ -165,7 +232,13 @@ module PrimaAwsClient
     loop do
       print '.'.yellow; STDOUT.flush
       options = next_token != '' ? { export_name: export_name, next_token: next_token } : {export_name: export_name}
-      resp = cf_client.list_imports(options)
+      begin
+        resp = cf_client.list_imports(options)
+      rescue Aws::CloudFormation::Errors::Throttling => e
+        output 'Throttling, retrying in 15 seconds'.red
+        sleep 15
+        resp = cf_client.list_imports(options)
+      end
       stacks += resp.imports
       break unless resp.next_token
       next_token = resp.next_token

metadata

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