prima-twig 1.2.0 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cac5201db54aab9c3ca72d6730d6d367bfff6fb49f8450b9a8b01556461d901e
-  data.tar.gz: 85d5192cbeb4317411f6d15de30bd5849f4c076911252cb3212bbce0972e4080
+  metadata.gz: 665845adb115e9091a4d63673e3386d7b50e2043350ee342daee36122a6807f1
+  data.tar.gz: d92dc143955f44ae455eb20bead9668737183bfab7fa7f62c9b116e279c9538e
 SHA512:
-  metadata.gz: aa3aa668188a7d6fe4c47308d373eea8b70912909c3f48aae81d3f4b900c7c79845beb50c5a762fb399600bd389d16c7ede5d5fc301680e0c4ad3188ccbf305a
-  data.tar.gz: 5ed3ffc9d7748ff2817a3894489539ad253954c49fcfd35d81771f2e0212661efab521a0febd42eee6aa7b19cd81109ffbd647bef77419fff50f6748d08e8caa
+  metadata.gz: 27bcc7a32bc312e359015843c05ad59872d54582ce342587894489407a6c48dbbce6997a7cbc5be2e7d246aead9dc0f235996658e450810e4409b829a670428a
+  data.tar.gz: 2474944753cd11b793107b6b8de274e7460ea2f54a2587ee43f3bef89ca2ef2278b40f861e5198a79c4fb8acce32a1e14c6bc684b479e0a5b188417b2c939462

data/bin/twig-feature

@@ -79,7 +79,6 @@ class Release
         qainit_deploy!(true)
       end
     when 'deploy'
-      abort('Non sei nella cartella di artemide') unless Dir.pwd.match 'artemide$'
       if 'lock' == args[1]
         deploy_lock!
       end
@@ -327,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
@@ -582,9 +581,9 @@ class Release
     resp.load_balancers[0].dns_name
   end
 
-  def update_cluster_stack(stack_name, tags = [])
-    stack_body = IO.read('cloudformation/stacks/ecs-cluster.yml')
-    update_stack(stack_name, stack_body, [], tags)
+  def update_cluster_stack(stack_name, tags = [], parameters = [])
+    stack_body = get_stack_template(stack_name)
+    update_stack(stack_name, stack_body, parameters, tags)
   end
 
   def choose_branch_to_deploy(project_name, select_master = false)

data/bin/twig-update-ami

@@ -29,14 +29,24 @@ class TwigUpdateAmi
     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-026890988d91ee8c6'
+    ami_mappings = JSON.parse(@s3.get_object(bucket: @s3_bucket, key: "ami/ami-mappings.json")["body"].read())
+
+    ami_mapping = nil
+    ami_mappings.each do |item|
+      if item['ami_template'].eql?(ami_template) and item['env'].eql?(env)
+        ami_mapping = item
+      end
+    end
+
+    stop_if(ami_mapping == nil, "No AMI found with parameters #{ami_template} and #{env}")
+
+    new_ami_id = update_packer(ami_template, env, ami_mapping['teams_mapping'], ami_mapping['country'])
+    # 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)
 
@@ -51,32 +61,19 @@ class TwigUpdateAmi
         output "skipping stack #{stack} because is a qa"
         next
       else
-        stack_tags = tags_to_hashes(get_stack_tags(stack))
-        stack_tags['TemplateVersion'] = stack_tags['TemplateVersion'].to_i + 1
-
+        stack_parameters = get_stack_parameters(stack)
+        stack_parameters = update_stack_parameters(stack_parameters, "AMIID", new_ami_id)
         if stack.include?('batch')
-          stack_parameters = update_stack_parameters(get_stack_parameters(stack),
-            [
-              { parameter_key: 'AMIID', parameter_value: new_ami_id },
-              { parameter_key: 'TemplateVersion', parameter_value: stack_tags['TemplateVersion'].to_s }
-            ]
-          )
           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(get_stack_parameters(stack),
-            [
-              { parameter_key: 'AMIID', parameter_value: new_ami_id },
-              { parameter_key: 'DesiredCapacity', parameter_value: get_desired_capacity(stack).to_s },
-              { parameter_key: 'TemplateVersion', parameter_value: stack_tags['TemplateVersion'].to_s }
-            ]
-          )
+          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")
         end
-        update_stack(stack, stack_template, stack_parameters, hashes_to_tags(stack_tags))
+        update_stack(stack, stack_template, stack_parameters)
       end
     end
 
@@ -120,10 +117,11 @@ class TwigUpdateAmi
     old_values.uniq
   end
 
-  def update_stack_parameters(stack_parameters, new_parameters)
-    new_parameters.each do |new_param|
-      stack_parameters.reject{ |k| k["parameter_key"] == new_param["parameter_key"] }
-      stack_parameters.push(new_param)
+  def update_stack_parameters(stack_parameters, key, value)
+    stack_parameters.each do |param|
+      if param.parameter_key == key
+        param.parameter_value = value
+      end
     end
     stack_parameters
   end
@@ -143,14 +141,14 @@ class TwigUpdateAmi
   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')
+      if out.export_name.include?('EC2Fleet') or out.export_name.include?('AutoScalingGroup') or 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"
+  def update_packer(json_filename, env, teams, country)
+    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} -var teams_mapping=#{teams} -var country=#{country} -machine-readable ./#{json_filename} | tee build.log"
     `grep 'artifact,0,id' build.log | cut -d, -f6 | cut -d: -f2`.sub(/\n/, '')
   end
 

data/lib/prima_aws_client.rb

@@ -474,21 +474,4 @@ module PrimaAwsClient
     resp = ec2_client.describe_spot_fleet_requests(spot_fleet_request_ids: [fleet_arn])
     resp.spot_fleet_request_configs[0].spot_fleet_request_config.target_capacity
   end
-
-  def hashes_to_tags(hashes)
-    tags = []
-    hkeys = hashes.keys
-    hkeys.each do |hkey|
-      tags.insert(0, { key: hkey, value: hashes[hkey].to_s })
-    end
-    tags
-  end
-
-  def tags_to_hashes(tags)
-    hash = Hash.new
-    tags.each do |tags_obj|
-      hash[tags_obj.key] = tags_obj.value
-    end
-    hash
-  end
 end

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.0
+  version: 1.2.6
 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-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling