builderator 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec9b3b99b02e2e735e33bbc78da82f65a502f579
-  data.tar.gz: 9ec84828b5d15e715f93844328610adf09bcae7f
+  metadata.gz: 89e14c2393d87e5b4a95b6e08442efde1b56a3d2
+  data.tar.gz: 5c0e467fc4f9228e7d2c981ecd607c1659072d7f
 SHA512:
-  metadata.gz: 9dc75e1de4d13342c15fb5f88bdfa11035aa38f884b4bf2ba94ac719a6f15139d808d6ea849896d840cc536010745c6c1d43dfef90f715f4443939932dc5f65c
-  data.tar.gz: e55a662292f305a923d1191e20ed7d2a80d91dc55d43858c9c6bb3488ef63f845ca6545745c07d5991e72742f83e6aeec51b95138d2e4ff54bdf64f4a99c8b39
+  metadata.gz: 87cb9385e02b95d9672ab4fceb21bd905b27e6aeaa142d317e3ef182888851999e0db0400703a86d6d65b2934567715a4509222f701b62cd5097bc866d31254a
+  data.tar.gz: 0448ea00eb5a00064975a18df49d468e17da249b2eb8cf48ea52109ff0136c8c4b194ffa0bfb2bf2ebddcff2953130e469936a4322412d937a98ab5f69f9a2d0

data/Gemfile.lock

@@ -15,12 +15,12 @@ GEM
   specs:
     addressable (2.4.0)
     ast (2.3.0)
-    aws-sdk (2.3.11)
-      aws-sdk-resources (= 2.3.11)
-    aws-sdk-core (2.3.11)
+    aws-sdk (2.3.13)
+      aws-sdk-resources (= 2.3.13)
+    aws-sdk-core (2.3.13)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.11)
-      aws-sdk-core (= 2.3.11)
+    aws-sdk-resources (2.3.13)
+      aws-sdk-core (= 2.3.13)
     berkshelf (4.3.3)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -56,31 +56,30 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef (12.7.2)
-      chef-config (= 12.7.2)
-      chef-zero (~> 4.5)
+    chef (12.5.1)
+      chef-config (= 12.5.1)
+      chef-zero (~> 4.2, >= 4.2.2)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
-      mixlib-authentication (~> 1.4)
+      mixlib-authentication (~> 1.3)
       mixlib-cli (~> 1.4)
       mixlib-log (~> 1.3)
       mixlib-shellout (~> 2.0)
-      net-ssh (>= 2.9, < 4.0)
+      net-ssh (~> 2.6)
       net-ssh-multi (~> 1.1)
       ohai (>= 8.6.0.alpha.1, < 9)
       plist (~> 3.1.0)
-      proxifier (~> 1.0)
-      rspec-core (~> 3.4)
-      rspec-expectations (~> 3.4)
-      rspec-mocks (~> 3.4)
+      pry (~> 0.9)
+      rspec-core (~> 3.2)
+      rspec-expectations (~> 3.2)
+      rspec-mocks (~> 3.2)
       rspec_junit_formatter (~> 0.2.0)
       serverspec (~> 2.7)
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
-      uuidtools (~> 2.1.5)
-    chef-config (12.7.2)
+    chef-config (12.5.1)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     chef-zero (4.6.2)
@@ -90,6 +89,7 @@ GEM
       rack
       uuidtools (~> 2.1)
     cleanroom (1.0.0)
+    coderay (1.1.1)
     dep-selector-libgecode (1.2.0)
     dep_selector (1.0.3)
       dep-selector-libgecode (~> 1.0)
@@ -114,12 +114,10 @@ GEM
     json (1.8.3)
     json_pure (1.8.3)
     libyajl2 (1.2.0)
+    method_source (0.8.2)
     minitar (0.5.4)
-    mixlib-authentication (1.4.0)
+    mixlib-authentication (1.4.1)
       mixlib-log
-      rspec-core (~> 3.2)
-      rspec-expectations (~> 3.2)
-      rspec-mocks (~> 3.2)
     mixlib-cli (1.6.0)
     mixlib-config (2.2.1)
     mixlib-log (1.6.0)
@@ -129,7 +127,7 @@ GEM
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.1.1)
+    net-ssh (2.9.4)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.1)
@@ -155,7 +153,10 @@ GEM
       ast (~> 2.2)
     plist (3.1.0)
     powerpack (0.1.1)
-    proxifier (1.0.3)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rack (1.6.4)
     rainbow (2.1.0)
     rake (10.5.0)
@@ -214,6 +215,7 @@ GEM
       rspec-its
       specinfra (~> 2.53)
     sfl (2.2)
+    slop (3.6.0)
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.1.7

data/lib/builderator/tasks.rb

@@ -74,8 +74,8 @@ module Builderator
         prepare
 
         invoke Tasks::Packer, :build, [profile], options
-        invoke Tasks::Packer, :remote_tag, [profile], options if options['remote_tag']
         invoke Tasks::Packer, :copy, [profile], options if options['copy']
+        invoke Tasks::Packer, :remote_tag, [profile], options if options['remote_tag']
       end
 
       # desc 'cookbook SUBCOMMAND', 'Cookbook tasks'

data/lib/builderator/tasks/packer.rb

@@ -133,35 +133,44 @@ module Builderator
       def remote_tag(profile)
         invoke :configure, [profile], options
 
-        sts_client = Aws::STS::Client.new(region: Config.aws.region)
         allowed_cred_keys = %w(access_key_id secret_access_key session_token)
 
         images.each do |image_name, (image, build)|
-          filters = [{
-            :name => 'name',
-            :values => [image_name]
-          }]
+          ami_regions = build.ami_regions
+          ami_regions << Config.aws.region
+          ami_regions.uniq!
+          ami_regions.each do |region|
 
-          if build.tagging_role.nil?
-            say_status :complete, 'No remote tagging to be performed as no IAM role is defined'
-            return
-          end
+            sts_client = Aws::STS::Client.new(region: region)
+
+            filters = [{
+              :name => 'name',
+              :values => [image_name]
+            }]
 
-          build.ami_users.each do |account|
-            role_arn = "arn:aws:iam::#{account}:role/#{build.tagging_role}"
-            begin
-              response = sts_client.assume_role( :role_arn => role_arn, :role_session_name => "tag-new-ami")
-              raise "Could not assume role [#{role_arn}].  Perhaps it does not exist?" unless response.successful?
-            rescue => e
-              say_status :skip, "Got error when trying to assume role: #{e.message} - continuing."
-              next
+            if build.tagging_role.nil?
+              say_status :complete, 'No remote tagging to be performed as no IAM role is defined'
+              return
             end
 
-            creds_hash = response.credentials.to_h.keep_if { |k,v| allowed_cred_keys.include?(k.to_s) }
+            regional_image = Util.ec2(region).describe_images(:filters => filters).images.first
 
-            say_status :remote_tag, "Tag AMI #{image_name} (#{image.image_id}) in account #{account}"
-            Util.ec2(Config.aws.region, creds_hash)
-                .create_tags(:dry_run => false, :resources => [image.image_id], :tags => image.tags)
+            build.ami_users.each do |account|
+              role_arn = "arn:aws:iam::#{account}:role/#{build.tagging_role}"
+              begin
+                response = sts_client.assume_role( :role_arn => role_arn, :role_session_name => "tag-new-ami")
+                raise "Could not assume role [#{role_arn}].  Perhaps it does not exist?" unless response.successful?
+              rescue => e
+                say_status :skip, "Got error when trying to assume role: #{e.message} - continuing."
+                next
+              end
+
+              creds_hash = response.credentials.to_h.keep_if { |k,v| allowed_cred_keys.include?(k.to_s) }
+
+              say_status :remote_tag, "Tag AMI #{image_name} (#{regional_image.image_id}) in #{region} (#{account})"
+              Util.ec2(region, creds_hash)
+                  .create_tags(:dry_run => false, :resources => [regional_image.image_id], :tags => image.tags)
+            end
           end
         end
         say_status :complete, 'Remote tagging complete'

data/rvm.env

@@ -1,14 +1,14 @@
-declare -x GEM_HOME="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-3"
-declare -x GEM_PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-3:/home/jenkins/.rvm/gems/ruby-2.1.5@global"
+declare -x GEM_HOME="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-2"
+declare -x GEM_PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-2:/home/jenkins/.rvm/gems/ruby-2.1.5@global"
 declare -x HOME="/home/jenkins"
-declare -x HUDSON_COOKIE="e12399cc-9dd6-47e7-8fea-246675a1fc27"
+declare -x HUDSON_COOKIE="e18797dc-72cf-4e64-9f78-1a26e5fe5703"
 declare -x IRBRC="/home/jenkins/.rvm/rubies/ruby-2.1.5/.irbrc"
 declare -x LANG="en_US.UTF-8"
 declare -x LC_ALL="en_US.UTF-8"
 declare -x MY_RUBY_HOME="/home/jenkins/.rvm/rubies/ruby-2.1.5"
 declare -x NLSPATH="/usr/dt/lib/nls/msg/%L/%N.cat"
 declare -x OLDPWD
-declare -x PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-3/bin:/home/jenkins/.rvm/gems/ruby-2.1.5@global/bin:/home/jenkins/.rvm/rubies/ruby-2.1.5/bin:/home/jenkins/.rvm/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
+declare -x PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-2/bin:/home/jenkins/.rvm/gems/ruby-2.1.5@global/bin:/home/jenkins/.rvm/rubies/ruby-2.1.5/bin:/home/jenkins/.rvm/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
 declare -x PWD="/home/jenkins/workspace/gem-public-builderator-master"
 declare -x RUBY_VERSION="ruby-2.1.5"
 declare -x SHLVL="1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builderator
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake