prima-twig 0.62.14 → 0.62.101

data/bin/twig-update-ami

@@ -29,11 +29,12 @@ 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)
-    # new_ami_id = 'ami-000e38f3a919824ae'
+    new_ami_id = update_packer(ami_template, env)
+    # new_ami_id = 'ami-026890988d91ee8c6'
     Dir.chdir '..'
     stop_if(new_ami_id.to_s.empty?, 'Failed to generate AMI!'.red)
     output "new ami id: #{new_ami_id}"
+    stop_if(true, "skipping stacks update")
 
     output 'searching for ami to update...'
     ami_mappings = JSON.parse(@s3.get_object(bucket: @s3_bucket, key: "ami/ami-mappings.json")["body"].read())
@@ -50,33 +51,33 @@ class TwigUpdateAmi
       if stack.include?('qa')
         output "skipping stack #{stack} because is a qa"
         next
-      elsif stack.include?('batch')
-        stack_parameters = update_stack_parameters(get_stack_parameters(stack),
-          [
-            { parameter_key: 'AMIID', parameter_value: new_ami_id }
-          ]
-        )
-        update_stack(stack, get_stack_template(stack), stack_parameters)
-      elsif stack.include?('fleet')
+      else
         stack_tags = tags_to_hashes(get_stack_tags(stack))
         stack_tags['TemplateVersion'] = stack_tags['TemplateVersion'].to_i + 1
 
-        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 }
-          ]
-        )
-        update_stack(stack, get_stack_template(stack), stack_parameters, hashes_to_tags(stack_tags))
-      else # autoscaling group normali come ania-tools
-        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 }
-          ]
-        )
-        update_stack(stack, get_stack_template(stack), stack_parameters)
+        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_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))
       end
     end
 
@@ -149,8 +150,8 @@ class TwigUpdateAmi
     end
   end
 
-  def update_packer(json_filename)
-    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`\" -machine-readable ./#{json_filename} | tee build.log"
+  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
 

data/lib/prima_aws_client.rb

@@ -337,6 +337,29 @@ module PrimaAwsClient
     output "#{s3_bucket}/#{destination_path} uploadato con successo!\n".green
   end
 
+  def wait_for_artifact(bucket, path)
+    ready = artifact_exists?(bucket, path)
+    sleep_seconds = 13
+    output "Attendo che lo sia pronto l'artefatto #{path}...\n".yellow
+    retries = 0
+    while !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
+        exit
+      end
+    end
+    output "\nArtefatto #{path} creato!\n".green
+  end
+
   def list_import_stacks(export_name)
     stacks = []
     next_token = ''

data/lib/prima_twig.rb

@@ -20,7 +20,9 @@ class Prima
     @twig = Twig.new(:read_options => true, :max_days_old => 30)
     unless has_config?
       if File.exist?('../prima/twig.yml')
-         `cp ../prima/twig.yml .`
+        `cp ../prima/twig.yml .`
+      elsif File.exist?('/tmp/twig.yml')
+        `cp /tmp/twig.yml .`
       else
         generate_config
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.62.14
+  version: 0.62.101
 platform: ruby
 authors:
 - Matteo Giachino
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling
@@ -285,6 +285,7 @@ dependencies:
 description: Our tools to manage git and github
 email: matteo.giachino@prima.it
 executables:
+- twig-build
 - twig-circle
 - twig-deploy
 - twig-feature
@@ -296,6 +297,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/twig-build
 - bin/twig-circle
 - bin/twig-deploy
 - bin/twig-feature
@@ -326,7 +328,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: The Prima twig toolbelt