prima-twig 1.2.4 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8ea88b99a7b2753ff87fb27010c6aa4269434559df2f099ab3872377c1bbf29
-  data.tar.gz: 529350a786fed406ca2644b90591a0661cdf2c74ba0dcf93d987d31cea8fa47e
+  metadata.gz: 665845adb115e9091a4d63673e3386d7b50e2043350ee342daee36122a6807f1
+  data.tar.gz: d92dc143955f44ae455eb20bead9668737183bfab7fa7f62c9b116e279c9538e
 SHA512:
-  metadata.gz: 3f29e006d7e38abefbecd43fa38e441e90105052fda54080ee4db2db16f04752f9c9394b1035b9d76e9e2be11183c725515881860309f197fdbe29eae53d0677
-  data.tar.gz: 3bb09b054773e85b39b38c2634f5d0a526a3b63212f88bbfa250a4322514b8fceed5963c39875a82fd0179fad126b4f17982479e62dcfd77e6573d36d9bd161c
+  metadata.gz: 27bcc7a32bc312e359015843c05ad59872d54582ce342587894489407a6c48dbbce6997a7cbc5be2e7d246aead9dc0f235996658e450810e4409b829a670428a
+  data.tar.gz: 2474944753cd11b793107b6b8de274e7460ea2f54a2587ee43f3bef89ca2ef2278b40f861e5198a79c4fb8acce32a1e14c6bc684b479e0a5b188417b2c939462

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)
+    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)
 
@@ -137,8 +147,8 @@ class TwigUpdateAmi
     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_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.4
+  version: 1.2.6
 platform: ruby
 authors:
 - Matteo Giachino
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling
@@ -314,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The Prima twig toolbelt