prima-twig 1.2.2 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 375cff1dcb6c293a35af2cbed16c3d2868c8e02df37fc6dd9daaa3cc86b9bf9b
-  data.tar.gz: e7fd3d93fc6a856eb504290ba8c1498121b0c900ba35be697033a3fcde833aae
+  metadata.gz: dca7d3d6359bd512ce34021d35d023a917507ae1004de5f758abe3f70f6f1c10
+  data.tar.gz: 14221958e4695b6ff58ac68a3c332f9b735ad2ca99093f72eaad8d1ffe4989a3
 SHA512:
-  metadata.gz: 06a6dd7bf5686f6bc466728dfd0916987e9b0c537133ea521d6faaeae57e5409208785428f03e6a34a7e6654cb93be7a648c91960f014d011293025e5682793b
-  data.tar.gz: '009485acbc7e40d0fc4d1a0c03c9f730ee5f0704ea15b48f228f926a1af82d5b772021d706c54b29424e509cd52904c6457e9b3cdfe670764760135cc5eb4194'
+  metadata.gz: e2d5a682591fee449f6e62e2c7dc07bb9cb5b9fe6cf3ad265698daf5f484df20b6d77d84ca4edd279191bab807849ee7a395ed734cc4e34a55ad03d9fb1233f8
+  data.tar.gz: 754189d1268adc751f5d44fa20422bba0fb712e5024560234049bf417e8d59c62d7a1fd6c02caad8e740e948fd58e448aabec7112e98336637654070d3314f71

data/bin/twig-feature

@@ -326,7 +326,7 @@ class Release
       tags.push tag_keep_data
     end
 
-    update_cluster_stack(cluster_stack_name, tags)
+    update_cluster_stack(cluster_stack_name, tags, get_stack_parameters(cluster_stack_name))
 
     output "Finito!".green
   end
@@ -581,9 +581,9 @@ class Release
     resp.load_balancers[0].dns_name
   end
 
-  def update_cluster_stack(stack_name, tags = [])
+  def update_cluster_stack(stack_name, tags = [], parameters = [])
     stack_body = get_stack_template(stack_name)
-    update_stack(stack_name, stack_body, [], tags)
+    update_stack(stack_name, stack_body, parameters, tags)
   end
 
   def choose_branch_to_deploy(project_name, select_master = false)

data/bin/twig-packer-builder

@@ -0,0 +1,84 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require_relative '../lib/prima_twig'
+require 'launchy'
+require 'yaml'
+
+class TwigPackerBuilder
+  include Command
+
+  def initialize
+    output 'Checking for new gem releases...'
+    unless `gem outdated`.lines.grep(/^prima-twig \(.*\)/).empty?
+      exec "gem update prima-twig && twig update-ami #{ARGV.join ' '}"
+    end
+    @templates_path = "#{Dir.pwd}/amis"
+  end
+
+  def execute!(args)
+    @template_name = args[0]
+    @env = args[1]
+    @country = args[2]
+
+    File.open("#{Dir.pwd}/ami_state.yml", 'r') do |f|
+      @config = YAML.load(f.read)
+    end
+
+    @country_conf = @config['countries'].detect { |country| country['name'] == @country }
+    stop_if(@country_conf.nil?, "Cannot find country #{@country} inside ami_state.yml, exiting...".red)
+
+    @ami_conf = @country_conf['amis'].detect { |ami| ami['template'] == @template_name and ami['env'] == @env }
+    stop_if(@ami_conf.nil?, "Cannot find an ami in #{@country} generated from #{@template_name} and env #{@env} inside ami_state.yml, exiting...".red)
+
+    output "Starting update process with #{@template_name} in env #{@env} in country #{@country}".light_green
+    output 'running packer (this could take some time)'.light_green
+    new_ami_id = execute_packer
+    stop_if(new_ami_id.to_s.empty?, 'Failed to generate AMI!'.red)
+
+    output "new ami id: #{new_ami_id}".light_green
+    output "ami id that can be replaced: #{@ami_conf['id']}".light_green
+    output "you can run \"aws-vault exec YOUR_CONTRY_PROFILE -- twig-update-ami #{@ami_conf['id']} #{new_ami_id}\" to update all stacks".light_green
+    output 'Done'.light_green
+  end
+
+  private
+
+  def execute_packer
+    execute_command "AWS_MAX_ATTEMPTS=90 AWS_POLL_DELAY_SECONDS=60 packer build -var env=#{@env} -var teams_mapping=#{@ami_conf['teams_mapping']} -var country=#{@country} -var aws_account=#{@country_conf['aws_account']} -machine-readable #{@templates_path}/#{@template_name} | tee build.log"
+
+    `grep 'artifact,0,id' build.log | cut -d, -f6 | cut -d: -f2`.sub(/\n/, '')
+  end
+
+  def help_content
+    <<-HELP
+
+    twig-packer-builder
+    ===========
+
+    Creates AMIs using umami's templates
+
+    Synopsis
+    --------
+
+      twig-packer-builder
+
+    Description
+    -----------
+
+      from umami main folder run
+      `aws-vault exec AWS_PROFILE_WITH_ACCESS_TO_COMMON_ACCOUNT -- twig-update-ami ${AMI_TEMPLATE} ${ENV} ${COUNTRY}`
+
+    Subcommand for Twig: <http://rondevera.github.io/twig/>
+    HELP
+  end
+
+  args = ARGV.dup
+
+  if args.include?('--help')
+    puts help_content
+    exit
+  end
+
+  TwigPackerBuilder.new.execute!(args)
+end

data/bin/twig-update-ami

@@ -1,154 +1,105 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require_relative '../lib/prima_twig.rb'
-require_relative '../lib/prima_aws_client.rb'
+require_relative '../lib/prima_twig'
+require_relative '../lib/prima_aws_client'
 require 'launchy'
-require 'json'
-require 'aws-sdk-s3'
+require 'yaml'
 
 class TwigUpdateAmi
   include Command
   include PrimaAwsClient
+
   def initialize
-    output 'Controllo se ci sono aggiornamenti da fare...'
-    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'
-    @templates_base_url = "https://s3-eu-west-1.amazonaws.com"
+    output 'Checking for new gem releases...'
+    unless `gem outdated`.lines.grep(/^prima-twig \(.*\)/).empty?
+      exec "gem update prima-twig && twig update-ami #{ARGV.join ' '}"
+    end
+    @state_path = "#{Dir.pwd}/ami_state.yml"
   end
 
   def execute!(args)
-      update_amis(args[0], args[1], args[2], args[3], args[4])
-  end
-
-  private
+    old_ami = args[0]
+    new_ami = args[1]
 
-  def update_amis(ami_template, ami_id, ami_name, ami_description, env)
-    output "updating instance definition #{ami_template}".light_green
-    Dir.chdir 'ami'
-    update_instance_name(ami_id, ami_name, ami_description, ami_template)
-    output 'running packer update (this could take some time)'.light_green
-    new_ami_id = update_packer(ami_template, env)
-    # new_ami_id = 'ami-0d8488b68731e8756'
-    Dir.chdir '..'
-    stop_if(new_ami_id.to_s.empty?, 'Failed to generate AMI!'.red)
-    output "new ami id: #{new_ami_id}"
-
-    output 'searching for ami to update...'
-    ami_mappings = JSON.parse(@s3.get_object(bucket: @s3_bucket, key: "ami/ami-mappings.json")["body"].read())
-    old_amis = update_ami_mappings(ami_mappings, ami_template, env, new_ami_id)
-    stop_if(old_amis.empty?, "No ami to update! No #{ami_template} in env #{env}, exiting".yellow)
-
-    output "retrieving stacks that uses old ami ids: #{old_amis}"
-    exports = list_exports()
-    stacks = get_stacks_from_exports(exports, old_amis)
-    stop_if(stacks.empty?, "No stack to update found! This means that ami-mapping file is not in sync, please check manually")
+    output "retrieving stacks that uses old ami #{old_ami}".light_green
+    stacks = get_stacks_from_exports(list_exports, old_ami)
+    stop_if(stacks.empty?, 'No stack to update! Please check manually'.red)
 
     stacks.each do |stack|
-      output "processing stack #{stack}"
+      output "processing stack #{stack}".light_green
       if stack.include?('qa')
-        output "skipping stack #{stack} because is a qa"
+        output "skipping stack #{stack} because is a qa".yellow
         next
       else
         stack_parameters = get_stack_parameters(stack)
-        stack_parameters = update_stack_parameters(stack_parameters, "AMIID", new_ami_id)
-        if stack.include?('batch')
-          if stack.include?('offsite-backups')
-            stack_template = File.read("./cloudformation/stacks/batch/compute-environment-offsite-backups.yml")
-          else
-            stack_template = File.read("./cloudformation/stacks/batch/compute-environment.yml")
-          end
-        else
-          stack_parameters = update_stack_parameters(stack_parameters, "DesiredCapacity", get_desired_capacity(stack).to_s)
-          stack_template = File.read("./cloudformation/stacks/asg/#{stack.to_s.split("/")[1]}.yml")
+        stack_parameters = update_stack_parameters(stack_parameters, 'AMIID', new_ami)
+        unless stack.include?('batch')
+          stack_parameters = update_stack_parameters(stack_parameters, 'DesiredCapacity', get_desired_capacity(stack).to_s)
         end
-        update_stack(stack, stack_template, stack_parameters)
+
+        update_stack_reuse_template(stack, stack_parameters)
       end
     end
 
     stacks.each do |stack|
-      if stack.include?('qa')
-        next
+      next if stack.include?('qa')
+
+      wait_for_stack_ready(stack, %w[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
+
+    output 'Saving new ami in ami_state.yml'.light_green
+    File.open(@state_path, 'r') do |f|
+      @config = YAML.load(f.read)
+    end
+
+    @config['countries'].each do |country|
+      country['amis'].each do |ami|
+        ami['id'] = new_ami if ami['id'] == old_ami
       end
-      wait_for_stack_ready(stack, ['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
 
-    output 'writing new ami mapping'
-    File.open("ami/ami-mappings.json", 'w+') do |f|
-      mapping_file = JSON.pretty_generate(ami_mappings)
-      f.write(mapping_file)
-      @s3.put_object(bucket: @s3_bucket, key: "ami/ami-mappings.json", body: mapping_file)
+    File.open(@state_path, 'w+') do |f|
+      yaml = YAML.dump(@config)
+      f.write(yaml)
     end
 
-    output 'Update finished! ( ͡° ͜ʖ ͡°)'
+    output 'Update finished! ( ͡° ͜ʖ ͡°)'.light_green
   end
 
-  def get_stacks_from_exports(exports, old_amis)
+  private
+
+  def get_stacks_from_exports(exports, old_ami)
     stacks = []
-    old_amis.each do |old_ami|
-      exports.each do |export|
-        if export.value.eql?(old_ami)
-          stacks.insert(0,export.exporting_stack_id)
-        end
-      end
+    exports.each do |export|
+      stacks.insert(0, export.exporting_stack_id) if export.value.eql?(old_ami)
     end
     stacks
   end
 
-  def update_ami_mappings(mappings, ami_template, env, new_ami_id)
-    old_values = []
-    mappings.each do |item|
-       if item['ami_template'].eql?(ami_template) and item['env'].eql?(env)
-         old_values.insert(0,item['ami_id'])
-         item['ami_id'] = new_ami_id
-       end
-     end
-    old_values.uniq
-  end
-
   def update_stack_parameters(stack_parameters, key, value)
     stack_parameters.each do |param|
-      if param.parameter_key == key
-        param.parameter_value = value
-      end
+      param.parameter_value = value if param.parameter_key == key
     end
     stack_parameters
   end
 
-  def update_instance_name(ami_id, ami_name, ami_description, ecs_json_path)
-    ecs_json = JSON.parse File.read(ecs_json_path)
-
-    ecs_json['builders'][0]['source_ami'] = ami_id
-    ecs_json['builders'][0]['ami_name'] = ami_name
-    ecs_json['builders'][0]['ami_description'] = ami_description
-
-    File.open ecs_json_path, 'w' do |f|
-      f.write(JSON.pretty_generate(ecs_json))
-    end
-  end
-
   def get_desired_capacity(stack_name)
     stack_outputs = get_stack_outputs(stack_name)
     stack_outputs.each do |out|
-      if out.export_name.include?('EC2Fleet') or out.export_name.include?('AutoScalingGroup') or out.export_name.include?('NodeGroup')
+      if out.export_name.include?('EC2Fleet') || out.export_name.include?('AutoScalingGroup') || out.export_name.include?('NodeGroup')
         return get_autoscaling_capacity(out.output_value)
       end
     end
   end
 
-  def update_packer(json_filename, env)
-    execute_command "AWS_MAX_ATTEMPTS=90 AWS_POLL_DELAY_SECONDS=60 packer build -var datadog_apikey=`biscuit get -f ../configs/secrets/common.yml common_production_apikey_datadog` -var github_token=`biscuit get -f ../configs/secrets/common.yml common_private_repo_github_token` -var drone_key=\"`biscuit get -f ../configs/secrets/common.yml drone_license_key`\" -var env=#{env} -machine-readable ./#{json_filename} | tee build.log"
-    `grep 'artifact,0,id' build.log | cut -d, -f6 | cut -d: -f2`.sub(/\n/, '')
-  end
-
   def help_content
     <<-HELP
 
     twig-update-ami
     ===========
 
-    Updates ami version and applies it to stacks on cloudformation
+    Updates AutoScalingGroups/BatchComputeEnvs with a new AMI
 
     Synopsis
     --------
@@ -158,8 +109,8 @@ class TwigUpdateAmi
     Description
     -----------
 
-      from artemide main folder run
-      `twig-update-ami ${AMI_TEMPLATE} ${AMI_ID} ${AMI_NAME} ${AMI_DESCRIPTION} ${ENV}`
+      from tsunami main folder run
+      `aws-vault exec AWS_PROFILE_WITH_ACCESS_TO_COUNTRY_ACCOUNT -- twig-update-ami ${OLD_AMI} ${NEW_AMI}`
 
     Subcommand for Twig: <http://rondevera.github.io/twig/>
     Author: Eugenio Laghi <https://github.com/eugeniolaghi>
@@ -167,13 +118,6 @@ class TwigUpdateAmi
     HELP
   end
 
-  class ::Hash
-      def deep_merge(second)
-          merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
-          self.merge(second.to_h, &merger)
-      end
-  end
-
   args = ARGV.dup
 
   if args.include?('--help')

data/lib/command.rb

@@ -64,10 +64,10 @@ module Command
 
   # executes command and returns properly colored output
   def execute_command(cmd)
-    output "Eseguo #{cmd}".yellow
+    output "Executing #{cmd}".yellow
     res = `#{cmd}`
     color = $CHILD_STATUS.exitstatus.zero? ? 'green' : 'red'
     output res.send color
-    stop_if (color == 'red'), "Errore durante la build dell'artifact".red
+    stop_if (color == 'red'), 'Error'.red
   end
 end

data/lib/prima_aws_client.rb

@@ -7,7 +7,6 @@ require 'aws-sdk-ecs'
 require 'aws-sdk-elasticloadbalancingv2'
 require 'aws-sdk-s3'
 require 'colorize'
-#
 module PrimaAwsClient
   def s3_client
     @s3 ||= Aws::S3::Client.new
@@ -48,6 +47,7 @@ module PrimaAwsClient
       end
       stacks += resp.stacks
       break unless resp.next_token
+
       next_token = resp.next_token
     end
     puts '.'.yellow; STDOUT.flush
@@ -70,6 +70,7 @@ module PrimaAwsClient
       end
       stacks += resp.stacks
       break unless resp.next_token
+
       next_token = resp.next_token
     end
     puts '.'.yellow; STDOUT.flush
@@ -92,6 +93,7 @@ module PrimaAwsClient
       end
       exports += resp.exports
       break unless resp.next_token
+
       next_token = resp.next_token
     end
     puts '.'.yellow; STDOUT.flush
@@ -108,9 +110,7 @@ module PrimaAwsClient
       on_failure: 'ROLLBACK'
     }
 
-    if role != nil then
-      cf_args.merge!(role_arn: role)
-    end
+    cf_args.merge!(role_arn: role) unless role.nil?
 
     begin
       cf_client.create_stack(cf_args)
@@ -119,7 +119,7 @@ module PrimaAwsClient
       sleep 15
       create_stack(stack_name, stack_body, parameters = [], tags = [])
     else
-      output "La creazione dello stack #{stack_name} è stata avviata".green
+      output "CloudFormation stack #{stack_name} creation started".green
     end
   end
 
@@ -132,9 +132,7 @@ module PrimaAwsClient
       capabilities: ['CAPABILITY_IAM']
     }
 
-    if role != nil then
-      cf_args.merge!(role_arn: role)
-    end
+    cf_args.merge!(role_arn: role) unless role.nil?
 
     begin
       cf_client.update_stack(cf_args)
@@ -145,7 +143,7 @@ module PrimaAwsClient
     rescue Aws::CloudFormation::Errors::ValidationError => e
       raise e
     else
-      output "L'update dello stack #{stack_name} è stato avviato".green
+      output "CloudFormation stack #{stack_name} update started".green
     end
   end
 
@@ -158,9 +156,7 @@ module PrimaAwsClient
       capabilities: ['CAPABILITY_IAM']
     }
 
-    if role != nil then
-      cf_args.merge!(role_arn: role)
-    end
+    cf_args.merge!(role_arn: role) unless role.nil?
 
     begin
       cf_client.update_stack(cf_args)
@@ -171,64 +167,87 @@ module PrimaAwsClient
     rescue Aws::CloudFormation::Errors::ValidationError => e
       raise e
     else
-      output "L'update dello stack #{stack_name} è stato avviato".green
+      output "CloudFormation stack #{stack_name} update started".green
     end
   end
 
-  def stack_exists?(stack_name)
+  def update_stack_reuse_template(stack_name, parameters = [], tags = [], role = nil)
+    cf_args = {
+      stack_name: stack_name,
+      use_previous_template: true,
+      parameters: parameters,
+      tags: tags,
+      capabilities: ['CAPABILITY_IAM']
+    }
+
+    cf_args.merge!(role_arn: role) unless role.nil?
+
     begin
-      cf_client.describe_stacks(stack_name: stack_name)
+      cf_client.update_stack(cf_args)
     rescue Aws::CloudFormation::Errors::Throttling => e
       output 'Throttling, retrying in 15 seconds'.red
       sleep 15
-      stack_exists?(stack_name)
+      update_stack(stack_name, template_body, parameters = [], tags = [])
     rescue Aws::CloudFormation::Errors::ValidationError => e
-      return false if e.message.include? 'does not exist'
       raise e
     else
-      true
+      output "CloudFormation stack #{stack_name} update started".green
     end
   end
 
+  def stack_exists?(stack_name)
+    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
+
   def delete_stack(stack_name)
-    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
+    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} shutdown succesfully\n".green
   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'])
+  def wait_for_stack_ready(stack_name, failed_statuses = %w[CREATE_FAILED ROLLBACK_IN_PROGRESS ROLLBACK_FAILED DELETE_IN_PROGRESS DELETE_FAILED DELETE_COMPLETE UPDATE_ROLLBACK_FAILED UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS])
     ready = false
     sleep_seconds = 13
-    output "Attendo che lo stack #{stack_name} finisca di essere inizializzato...\n".yellow
-    while !ready
+    output "Waiting for stack #{stack_name}...\n".yellow
+    until ready
       ready = true if stack_ready?(stack_name, failed_statuses)
       seconds_elapsed = 0
       loop do
         break if seconds_elapsed >= sleep_seconds
+
         print '.'.yellow; STDOUT.flush
         sleep 1
         seconds_elapsed += 1
       end
     end
-    output "\nStack #{stack_name} pronto!\n".green
+    output "\nStack #{stack_name} ready!\n".green
   end
 
   def wait_for_stack_removal(stack_name)
     ready = false
     sleep_seconds = 13
     sleep 10
-    output "Attendo che lo stack #{stack_name} finisca di essere cancellato...\n".yellow
-    while !ready
+    output "Waiting for stack #{stack_name}...\n".yellow
+    until ready
       ready = true if stack_deleted?(stack_name)
       seconds_elapsed = 0
       loop do
         break if seconds_elapsed >= sleep_seconds
+
         print '.'.yellow; STDOUT.flush
         sleep 1
         seconds_elapsed += 1
@@ -238,55 +257,46 @@ module PrimaAwsClient
   end
 
   def get_stack_tags(name)
-    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
+    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
 
   def get_stack_parameters(name)
-    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
+    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
 
   def get_stack_outputs(name)
-    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
+    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
 
   def get_stack_template(name)
-    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
-
+    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
 
-  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'])
+  def stack_ready?(stack_name, failed_statuses = %w[CREATE_FAILED ROLLBACK_IN_PROGRESS ROLLBACK_FAILED DELETE_IN_PROGRESS DELETE_FAILED DELETE_COMPLETE UPDATE_ROLLBACK_FAILED UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS])
     begin
       resp = cf_client.describe_stacks(
         stack_name: stack_name
@@ -297,10 +307,11 @@ module PrimaAwsClient
       return false
     end
     raise "The stack #{stack_name} errored out" if failed_statuses.include? stack_status
-    ['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'UPDATE_ROLLBACK_COMPLETE', 'ROLLBACK_COMPLETE'].include? stack_status
+
+    %w[CREATE_COMPLETE UPDATE_COMPLETE UPDATE_ROLLBACK_COMPLETE ROLLBACK_COMPLETE].include? stack_status
   end
 
-  def stack_deleted?(stack_name, failed_statuses = ['ROLLBACK_IN_PROGRESS', 'ROLLBACK_FAILED', 'DELETE_FAILED', 'UPDATE_ROLLBACK_FAILED', 'UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS'])
+  def stack_deleted?(stack_name, failed_statuses = %w[ROLLBACK_IN_PROGRESS ROLLBACK_FAILED DELETE_FAILED UPDATE_ROLLBACK_FAILED UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS])
     begin
       resp = cf_client.describe_stacks(
         stack_name: stack_name
@@ -314,6 +325,7 @@ module PrimaAwsClient
       return true
     end
     raise "The stack #{stack_name} errored out" if failed_statuses.include? stack_status
+
     ['DELETE_COMPLETE'].include? stack_status
   end
 
@@ -326,38 +338,39 @@ module PrimaAwsClient
     !resp.contents.empty?
   end
 
-  def upload_artifact(source_path, destination_path, bucket_name_override=nil)
-    output "Upload dell'artifact in corso (#{(File.size(source_path).to_f / 2**20).round(2)} MiB)\n".yellow
+  def upload_artifact(source_path, destination_path, bucket_name_override = nil)
+    output "Uploading artifact (#{(File.size(source_path).to_f / 2**20).round(2)} MiB)\n".yellow
     s3 = Aws::S3::Resource.new
-    s3_bucket = if !bucket_name_override.nil? then bucket_name_override else @s3_bucket end
+    s3_bucket = !bucket_name_override.nil? ? bucket_name_override : @s3_bucket
     puts s3_bucket
     obj = s3.bucket(s3_bucket).object(destination_path)
     obj.upload_file(source_path)
 
-    output "#{s3_bucket}/#{destination_path} uploadato con successo!\n".green
+    output "#{s3_bucket}/#{destination_path} upload success!\n".green
   end
 
   def wait_for_artifact(bucket, path)
     ready = artifact_exists?(bucket, path)
     sleep_seconds = 13
-    output "Attendo che sia pronto l'artefatto #{path}...\n".yellow
+    output "Wating that artifact #{path} becomes ready...\n".yellow
     retries = 0
-    while !ready
+    until ready
       ready = true if artifact_exists?(bucket, path)
       seconds_elapsed = 0
       loop do
         break if seconds_elapsed >= sleep_seconds
+
         print '.'.yellow; STDOUT.flush
         sleep 1
         seconds_elapsed += 1
       end
       retries += 1
       if retries > 150
-        output "\n Timeout raggiunto aspettando #{path}\n".red
+        output "\n Artifact #{path} timed out\n".red
         exit
       end
     end
-    output "\nArtefatto #{path} creato!\n".green
+    output "\nArtifact #{path} created!\n".green
   end
 
   def list_import_stacks(export_name)
@@ -365,7 +378,7 @@ module PrimaAwsClient
     next_token = ''
     loop do
       print '.'.yellow; STDOUT.flush
-      options = next_token != '' ? { export_name: export_name, next_token: next_token } : {export_name: export_name}
+      options = next_token != '' ? { export_name: export_name, next_token: next_token } : { export_name: export_name }
       begin
         resp = cf_client.list_imports(options)
       rescue Aws::CloudFormation::Errors::Throttling => e
@@ -375,94 +388,81 @@ module PrimaAwsClient
       end
       stacks += resp.imports
       break unless resp.next_token
+
       next_token = resp.next_token
     end
     stacks
   end
 
   def describe_stack_resource(cluster_stack_name, logical_resource_id)
-    begin
-      resp = cf_client.describe_stack_resource({stack_name: cluster_stack_name, logical_resource_id: logical_resource_id})
-    rescue Aws::CloudFormation::Errors::Throttling => e
-      output 'Throttling, retrying in 15 seconds'.red
-      sleep 15
-      resp = describe_stack_resource(cluster_stack_name, logical_resource_id)
-    end
+    resp = cf_client.describe_stack_resource({ stack_name: cluster_stack_name, logical_resource_id: logical_resource_id })
+  rescue Aws::CloudFormation::Errors::Throttling => e
+    output 'Throttling, retrying in 15 seconds'.red
+    sleep 15
+    resp = describe_stack_resource(cluster_stack_name, logical_resource_id)
   end
 
   def describe_instances(instance_ids)
-    begin
-      resp = ec2_client.describe_instances({instance_ids: instance_ids})
-    rescue Aws::CloudFormation::Errors::Throttling => e
-      output 'Throttling, retrying in 15 seconds'.red
-      sleep 15
-      resp = describe_instances(instance_ids)
-    end
+    resp = ec2_client.describe_instances({ instance_ids: instance_ids })
+  rescue Aws::CloudFormation::Errors::Throttling => e
+    output 'Throttling, retrying in 15 seconds'.red
+    sleep 15
+    resp = describe_instances(instance_ids)
   end
 
   def describe_auto_scaling_groups(auto_scaling_group_names, max_records)
-    begin
-      resp = asg_client.describe_auto_scaling_groups({
-        auto_scaling_group_names: auto_scaling_group_names,
-        max_records: max_records
-      })
-    rescue Aws::CloudFormation::Errors::Throttling => e
-      output 'Throttling, retrying in 15 seconds'.red
-      sleep 15
-      resp = describe_auto_scaling_groups(auto_scaling_group_names, max_records)
-    end
+    resp = asg_client.describe_auto_scaling_groups({
+                                                     auto_scaling_group_names: auto_scaling_group_names,
+                                                     max_records: max_records
+                                                   })
+  rescue Aws::CloudFormation::Errors::Throttling => e
+    output 'Throttling, retrying in 15 seconds'.red
+    sleep 15
+    resp = describe_auto_scaling_groups(auto_scaling_group_names, max_records)
   end
 
   def describe_load_balancers(load_balancer_arns)
-    begin
-      resp = alb_client.describe_load_balancers({load_balancer_arns: load_balancer_arns})
-    rescue Aws::ElasticLoadBalancingV2::Errors::Throttling => e
-      output 'Throttling, retrying in 15 seconds'.red
-      sleep 15
-      resp = describe_load_balancers(load_balancer_arns)
-    end
+    resp = alb_client.describe_load_balancers({ load_balancer_arns: load_balancer_arns })
+  rescue Aws::ElasticLoadBalancingV2::Errors::Throttling => e
+    output 'Throttling, retrying in 15 seconds'.red
+    sleep 15
+    resp = describe_load_balancers(load_balancer_arns)
   end
 
   def update_ecs_service(cluster, service, deployment_configuration)
-    begin
-      resp = ecs_client.update_service(
-        cluster: cluster,
-        service: service,
-        deployment_configuration: deployment_configuration
-      )
-    rescue Aws::CloudFormation::Errors::Throttling => e
-      output 'Throttling, retrying in 15 seconds'.red
-      sleep 15
-      resp = update_ecs_service(cluster, service, deployment_configuration)
-    end
+    resp = ecs_client.update_service(
+      cluster: cluster,
+      service: service,
+      deployment_configuration: deployment_configuration
+    )
+  rescue Aws::CloudFormation::Errors::Throttling => e
+    output 'Throttling, retrying in 15 seconds'.red
+    sleep 15
+    resp = update_ecs_service(cluster, service, deployment_configuration)
   end
 
   def describe_ecs_tasks(cluster, tasks)
-    begin
-      resp = ecs_client.describe_tasks({
-        cluster: cluster,
-        tasks: tasks
-      })
-    rescue Aws::CloudFormation::Errors::Throttling => e
-      output 'Throttling, retrying in 15 seconds'.red
-      sleep 15
-      resp = describe_ecs_tasks(cluster, tasks)
-    end
+    resp = ecs_client.describe_tasks({
+                                       cluster: cluster,
+                                       tasks: tasks
+                                     })
+  rescue Aws::CloudFormation::Errors::Throttling => e
+    output 'Throttling, retrying in 15 seconds'.red
+    sleep 15
+    resp = describe_ecs_tasks(cluster, tasks)
   end
 
   def run_ecs_task(cluster, task_definition, overrides, count)
-    begin
-      resp = ecs_client.run_task({
-        cluster: cluster,
-        task_definition: task_definition,
-        overrides: overrides,
-        count: count
-      })
-    rescue Aws::CloudFormation::Errors::Throttling => e
-      output 'Throttling, retrying in 15 seconds'.red
-      sleep 15
-      resp = run_ecs_task(cluster, task_definition, overrides, count)
-    end
+    resp = ecs_client.run_task({
+                                 cluster: cluster,
+                                 task_definition: task_definition,
+                                 overrides: overrides,
+                                 count: count
+                               })
+  rescue Aws::CloudFormation::Errors::Throttling => e
+    output 'Throttling, retrying in 15 seconds'.red
+    sleep 15
+    resp = run_ecs_task(cluster, task_definition, overrides, count)
   end
 
   def get_autoscaling_capacity(asg_name)

data/lib/prima_twig.rb

@@ -8,8 +8,8 @@ require 'aws-sdk-core'
 require 'rubyflare'
 
 class Prima
-  CONFIG_KEYS=['github', 'cloudflare_email', 'cloudflare_apikey', 'aws_username', 'aws_password', 'prima_apikey']
-  attr_reader :gh, :twig, :config, :rugged, :aws
+  CONFIG_KEYS=['github', 'cloudflare_email', 'cloudflare_apikey']
+  attr_reader :gh, :twig, :config, :rugged
 
   def initialize
     @twig = Twig.new(:read_options => true, :max_days_old => 30)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.1
 platform: ruby
 authors:
 - Matteo Giachino
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling
@@ -73,21 +73,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-ec2
+  name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-ecs
+  name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -101,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-elasticloadbalancingv2
+  name: aws-sdk-ecs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -115,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
+  name: aws-sdk-elasticloadbalancingv2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -129,19 +129,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-core
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -286,11 +286,13 @@ description: Our tools to manage git and github
 email: matteo.giachino@prima.it
 executables:
 - twig-feature
+- twig-packer-builder
 - twig-update-ami
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/twig-feature
+- bin/twig-packer-builder
 - bin/twig-update-ami
 - lib/command.rb
 - lib/prima_aws_client.rb