prima-twig 0.31.55 → 0.31.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a59d935465a804a7f44c9593c96b787dd51d6c6e
-  data.tar.gz: ba4ac81c3196eb2e35f4e76f235d1064b44780d3
+  metadata.gz: '0880a7f1e6f2543a179ad98b5bfbd05cec9bd42f'
+  data.tar.gz: 16ebf28302e7c32f5cd845154f6d44a69acd85c8
 SHA512:
-  metadata.gz: a3c6dfadfdbbaaabbd8c94f58aecc0781cbd6c061f578476c77c3d7498cfc29631614a1bd72582a6e1b65f13f53f3a81f619217cee757ccc3f585d5bae6db02e
-  data.tar.gz: ac704f344302a91e104d777866dd5e534ccbb57fc3b16d8a1755d78774913e977cb48c53a736a017b0598ef9f2fe056c56d795962dcbc1d49bb434827f745198
+  metadata.gz: 2f7eb4f286a25d22110de1648b0cd8bd6832816417ba8ddc1b4b99ad005cea4cdc592c84f670757c6673c4b08c17b2164f3b5b2e3e6c250240d3d78f84d7b01b
+  data.tar.gz: 531be4ca7ab4d09094e645f6431eb995ce27d4c04c0dd64dbda540315613cf8f640604f4433a74f631890de7c409ad39fad4d8760eb3325db8972ba35f5dc816

data/bin/twig-feature

@@ -1127,6 +1127,10 @@ class Release
     projects_text.concat "
 > Crash url: https://#{crash_hostname}" if deploy_crash?
     projects_text.concat "
+> RabbitMQ url: http://#{ec2_ip_address(asg_stack_name)}:15672"
+> Supervisor url: http://#{ec2_ip_address(asg_stack_name)}:9001"
+> Elasticsearch url: http://#{ec2_ip_address(asg_stack_name)}:9200"
+> Elasticsearch 2 url: http://#{ec2_ip_address(asg_stack_name)}:9201"
 > SSH connection: ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no githubUsername@#{ec2_ip_address(asg_stack_name)}\n"
     output projects_text.cyan
     output "Deploy effettuato, everything is awesome!\n".green

data/bin/twig-update-ami

@@ -51,9 +51,18 @@ class TwigUpdateAmi
         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'])
-          update_stack_url(stack['stack_name'], stack['template_url'], get_stack_parameters(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)
         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)
@@ -83,6 +92,18 @@ class TwigUpdateAmi
     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?('ECSAutoScalingGroup')
+        return get_autoscaling_capacity(out.output_value)
+      elsif out.export_name.include?('SpotFleet')
+        return get_spotfleet_capacity(out.output_value)
+      end
+    end
+    return nil
+  end
+
   def update_packer(json_filename)
     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/, '')

data/lib/prima_aws_client.rb

@@ -10,6 +10,14 @@ module PrimaAwsClient
     @cf ||= Aws::CloudFormation::Client.new
   end
 
+  def asg_client
+    @asg ||= Aws::AutoScaling::Client.new
+  end
+
+  def appscaling_client
+    @appscaling ||= Aws::ApplicationAutoScaling::Client.new
+  end
+
   def stack_list
     stacks = []
     next_token = ''
@@ -107,6 +115,11 @@ module PrimaAwsClient
     resp.stacks[0].parameters
   end
 
+  def get_stack_outputs(name)
+    resp = cf_client.describe_stacks(stack_name: name)
+    resp.stacks[0].outputs
+  end
+
   def get_stack_template(name)
     resp = cf_client.get_template(stack_name: name)
     resp.template_body
@@ -154,4 +167,14 @@ module PrimaAwsClient
     end
     stacks
   end
+
+  def get_autoscaling_capacity(asg_name)
+    resp = asg_client.describe_auto_scaling_groups(auto_scaling_group_names: [asg_name])
+    resp.auto_scaling_groups[0].desired_capacity
+  end
+
+  def get_spotfleet_capacity(fleet_arn)
+    resp = appscaling_client.describe_scalable_targets(service_namespace: 'ec2', resource_ids: ["spot-fleet-request/#{fleet_arn}"])
+    resp.scalable_targets[0].min_capacity
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.31.55
+  version: 0.31.56
 platform: ruby
 authors:
 - Matteo Giachino
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk