prima-twig 0.56.82 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 800b8a6ea7c7da6e8d28909aa71ebf735a7633c006dbd0b973621b57b158ff3e
-  data.tar.gz: 5cec0cacd51094c1b3c6e11f63745f3cae01b2f08c55e01d01b0023b278b91aa
+  metadata.gz: 263cb3add15f62f517e594cd0319db08a667ada510f43d586e18bc68cc221709
+  data.tar.gz: 22659c79c2ae2a16377e65043e182c48768b1445b4bd79c01273e60274991904
 SHA512:
-  metadata.gz: 4e3a16a61aae91cefc6bf1a8b522cbe6d8d763cf0d5a19bdb8beb30f3df5c7310b3ff4933875005d81d14c1928796a8e0db5e99b6f468f90b974bb5e3c6edde7
-  data.tar.gz: 7956f2b6a78191c18aac8ee337d122f447575c2808fe9f30610bfe73a674db1c13d681b6a51abebdfda39888c0f71ba6fc15efe332f5bc3b0f5f9caa576f8dc3
+  metadata.gz: e8dd33e8a28dc23c7bee07318f30895c7c2c3dba67d1841791f66ee32a42095945abe871753d587b92731c169e259a60caec2bee7935219ca775efd695b28d69
+  data.tar.gz: 10c2eaf08194ea86fb6cc836cd9127772955b944d27f2af4647fc597cf61aa94aa41d07dcb8e329a2af2db1c5d5f4da5ee5d14c8ea5c603d212de977173f44f8

data/bin/twig-feature

@@ -22,7 +22,12 @@ class Release
         exec "twig feature #{ARGV.join ' '}"
       end
     end
+    @cf = Aws::CloudFormation::Client.new
+    @alb = Aws::ElasticLoadBalancingV2::Client.new
+    @ec2 = Aws::EC2::Client.new
+    @ecs = Aws::ECS::Client.new
     @batch = Aws::Batch::Client.new
+    @asg = Aws::AutoScaling::Client.new
     @s3 = Aws::S3::Client.new
     @s3_bucket = 'prima-artifacts'
     @artifact_path = '/tmp/prima-artifact.zip'
@@ -750,7 +755,7 @@ class Release
     create_alb_stack(stack_name_alb, "http", deploy_id, 'qa-minimal') unless stack_exists?(stack_name_alb)
     create_alb_stack(stack_name_alb_ws, "websocket", deploy_id, 'qa-minimal') unless stack_exists?(stack_name_alb_ws)
 
-    resp = describe_stack_resource(cluster_stack_name, 'ECSCluster')
+    resp = @cf.describe_stack_resource({stack_name: cluster_stack_name, logical_resource_id: 'ECSCluster'})
     @ecs_cluster_name = resp.stack_resource_detail.physical_resource_id
 
     asg_stack_name = "ecs-asg-allinone-qa-#{deploy_id}"
@@ -921,7 +926,7 @@ class Release
     create_alb_stack(stack_name_alb, "http", deploy_id) unless stack_exists?(stack_name_alb)
     create_alb_stack(stack_name_alb_ws, "websocket", deploy_id) unless stack_exists?(stack_name_alb_ws)
 
-    resp = describe_stack_resource(cluster_stack_name, 'ECSCluster')
+    resp = @cf.describe_stack_resource({stack_name: cluster_stack_name, logical_resource_id: 'ECSCluster'})
     @ecs_cluster_name = resp.stack_resource_detail.physical_resource_id
 
     asg_stack_name = "ecs-asg-allinone-qa-#{deploy_id}"
@@ -2032,10 +2037,16 @@ class Release
   end
 
   def ec2_ip_address(asg_stack_name)
-    resp = describe_stack_resource(asg_stack_name, 'ECSAutoScalingGroup')
-    resp = describe_auto_scaling_groups([resp.stack_resource_detail.physical_resource_id], 1)
+    resp = @cf.describe_stack_resource({
+      stack_name: asg_stack_name,
+      logical_resource_id: 'ECSAutoScalingGroup'
+    })
+    resp = @asg.describe_auto_scaling_groups({
+      auto_scaling_group_names: [resp.stack_resource_detail.physical_resource_id],
+      max_records: 1
+    })
     instance_id = resp.auto_scaling_groups[0].instances[0].instance_id
-    resp = describe_instances([instance_id])
+    resp = @ec2.describe_instances({instance_ids: [instance_id]})
     resp.reservations[0].instances[0].private_ip_address
   end
 
@@ -2080,8 +2091,13 @@ class Release
     when stack_name.include?('hutch')
       logical_resource_id = 'EcsApplicationLoadBalancerPublic'
     end
-    resp = describe_stack_resource(stack_name, logical_resource_id)
-    resp = describe_load_balancers([resp.stack_resource_detail.physical_resource_id])
+    resp = @cf.describe_stack_resource({
+      stack_name: stack_name,
+      logical_resource_id: logical_resource_id
+    })
+    resp = @alb.describe_load_balancers({
+      load_balancer_arns: [resp.stack_resource_detail.physical_resource_id]
+    })
     resp.load_balancers[0].dns_name
   end
 
@@ -2130,8 +2146,18 @@ class Release
     else
       raise "Service name non gestito per lo stack #{stack_name}"
     end
-    resp = describe_stack_resource(stack_name, logical_resource_id)
-    update_ecs_service(@ecs_cluster_name, resp.stack_resource_detail.physical_resource_id, {minimum_healthy_percent: 0, maximum_percent: 100})
+    resp = @cf.describe_stack_resource(
+      stack_name: stack_name,
+      logical_resource_id: logical_resource_id
+    )
+    @ecs.update_service(
+      cluster: @ecs_cluster_name,
+      service: resp.stack_resource_detail.physical_resource_id,
+      deployment_configuration: {
+        minimum_healthy_percent: 0,
+        maximum_percent: 100
+      }
+    )
   end
 
   def create_activia_artifact(revision)
@@ -2866,20 +2892,24 @@ class Release
   end
 
   def import_dbs(ip_address)
-    overrides = {
-      container_overrides: [
-        {
-          name: 'dbrestore',
-          environment: [
-            {
-              name: 'EC2_IP_ADDRESS',
-              value: ip_address
-            }
-          ]
-        }
-      ]
-    }
-    resp = run_ecs_task(@ecs_cluster_name, @import_db_task, overrides, 1)
+    resp = @ecs.run_task({
+      cluster: @ecs_cluster_name,
+      task_definition: @import_db_task,
+      overrides: {
+        container_overrides: [
+          {
+            name: 'dbrestore',
+            environment: [
+              {
+                name: 'EC2_IP_ADDRESS',
+                value: ip_address
+              }
+            ]
+          }
+        ]
+      },
+      count: 1
+    })
     return resp
   end
 
@@ -2893,7 +2923,10 @@ class Release
         pp task
         stop_if true, "Task di import DB lanciato, ma risposta vuota!".red
       end
-      task = describe_ecs_tasks(task.tasks[0].cluster_arn, [task.tasks[0].task_arn])
+      task = @ecs.describe_tasks({
+        cluster: task.tasks[0].cluster_arn,
+        tasks: [task.tasks[0].task_arn]
+      })
       stopped_at = task.tasks[0].stopped_at unless task.tasks[0].nil?
       sleep_seconds = 10
       seconds_elapsed = 0
@@ -2997,7 +3030,10 @@ class Release
   end
 
   def launch_marley(ip_address, prima_hostname, borat_hostname)
-    resp = describe_stack_resource('batch-job-marley', 'JobDefinition')
+    resp = @cf.describe_stack_resource({
+      stack_name: 'batch-job-marley',
+      logical_resource_id: 'JobDefinition'
+    })
 
     @batch.submit_job({
         job_name: "marley-#{@dns_record_identifier}", # required

data/lib/prima_aws_client.rb

@@ -18,14 +18,6 @@ module PrimaAwsClient
     @ec2 ||= Aws::EC2::Client.new
   end
 
-  def alb_client
-    @alb ||= Aws::ElasticLoadBalancingV2::Client.new
-  end
-
-  def ecs_client
-    @ecs ||= Aws::ECS::Client.new
-  end
-
   def stack_list
     stacks = []
     next_token = ''
@@ -315,91 +307,6 @@ module PrimaAwsClient
     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
-  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
-  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
-  end
-
-  def describe_load_balancers(load_balancer_arns)
-    begin
-      resp = alb_client.describe_load_balancers({load_balancer_arns: load_balancer_arns})
-    rescue Aws::CloudFormation::Errors::Throttling => e
-      output 'Throttling, retrying in 15 seconds'.red
-      sleep 15
-      resp = describe_load_balancers(load_balancer_arns)
-    end
-  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
-  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
-  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
-  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.56.82
+  version: 0.57.0
 platform: ruby
 authors:
 - Matteo Giachino
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk