prima-twig 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c85bc796545f4a0f38fa6be4380dec88e6c2fb771e8fe39d5044c57e9c0a6ee
-  data.tar.gz: 4eef557dba95dc99c88f3f07951bb6219aa2fe63eb928c12e9c6a743954400e6
+  metadata.gz: 375cff1dcb6c293a35af2cbed16c3d2868c8e02df37fc6dd9daaa3cc86b9bf9b
+  data.tar.gz: e7fd3d93fc6a856eb504290ba8c1498121b0c900ba35be697033a3fcde833aae
 SHA512:
-  metadata.gz: 4d2472dfc0c866aab6563b9cca251fd606256dc05c55bd450abbd65e5db86371327626bbb8001b06a3e15f50355f6d9a26fb1760513bc3a04698c043b9cbf572
-  data.tar.gz: 4e86ab32ba1df95732055f29da69469fdd2c71d197233c5db726e18780910141206e9eb6ab5d94d2db621b3be8199d0bf22bc69bc8fdc24c26204eef6a0f1c19
+  metadata.gz: 06a6dd7bf5686f6bc466728dfd0916987e9b0c537133ea521d6faaeae57e5409208785428f03e6a34a7e6654cb93be7a648c91960f014d011293025e5682793b
+  data.tar.gz: '009485acbc7e40d0fc4d1a0c03c9f730ee5f0704ea15b48f228f926a1af82d5b772021d706c54b29424e509cd52904c6457e9b3cdfe670764760135cc5eb4194'

data/bin/twig-update-ami

@@ -30,7 +30,7 @@ class TwigUpdateAmi
     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'
+    # 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}"
@@ -51,32 +51,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 +107,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,7 +131,7 @@ 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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Matteo Giachino