beaker-aws 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2JhYTYxYzVjMzliNzUxYmM0YzVkMTc1YzYwZWZhMWE5OWZlOTdhMw==
+    OGZkMzdjNjc1Y2JkNzVhODczYWU5MTQ2YjZkNzQ0NDlmYjBmZTA2YQ==
   data.tar.gz: !binary |-
-    OGQ4MGI4YjVhYmU5NzI4NzY3NDBkODYxY2ZkZTAxNGU3YmEzOThlNg==
+    ZWViMzI5MTIxMDRmZDk0NGE3Y2NjNDJmMjY2NzY5MDI0MWEwZmJlMA==
 SHA512:
   metadata.gz: !binary |-
-    MzVhYzJhYzMyNjc0NTI3NjI0YzhmMGE0OGM0ZTM1MjI1M2UxMTUxYmJkMmJj
-    N2FkYjY0ODE1MTcwNjg0NjdhOWE2ZjQzMGMwODZhZDVlNDc0MjcwMjIyNDhk
-    ZmEwMTAzYTRlYjk1MDA4MjUyYTAxZjFlM2MyNWJjNDMyMmVhYmY=
+    OTUwODFlZmZlOGMxZTI4MDdjZDVlNTc1MWI2N2Y5Y2IxYjZiOTEzOGJhNWEx
+    YTAwODg5ODI1ZjIxNTI3MDgyYjRlMWIyNzFjMTM4ZDIyNGJkNGFkMDcyYTVh
+    MjljZGMzNDJkNTg5NmQ2YjYyZTY5MWI5NzYwMDkwMWQ2NGU0NjY=
   data.tar.gz: !binary |-
-    ZDU5ZjU2NzU0ZDQ4NjE4NzM5ZDc4Yzc1NjIzMjYzOThmNzg2NzBlYjdmZDlh
-    YjY4YjZjYmQ2MmE5OTVmZmZlZGI4YjRhYTlmZTFkOWI2OTlmNTQxNDVhNmNi
-    NzVkMTA0ZGU1YzgxYTQyYWRhNGU0YjJmMDhhODMzNDMxMmM1ZDA=
+    YzVmOGUzOWQ3NTY2ODBkN2I4M2QwNDQ5NGRhYWYyNmQ2MjNiYjYyYWYyNjg3
+    YmFiNDA2ZmFjMzk0YThmZGU3OTExNTljY2MxODQ5OTAwYWMxZGNkNzdhMWE2
+    ZDIxMDZkNjg4NzZjNTkxNzE3NDAwMTlkYmMwYTRlMWI1YjI4ZGI=

data/lib/beaker-aws/version.rb

@@ -1,3 +1,3 @@
 module BeakerAws
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -23,16 +23,17 @@ module Beaker
       @logger = options[:logger]
 
       # Get AWS credentials
-      creds = load_credentials()
+      creds = options[:use_fog_credentials] ? load_credentials() : Hash.new
 
       config = {
         :access_key_id => creds[:access_key],
         :secret_access_key => creds[:secret_key],
+        :session_token => creds[:session_token],
         :logger => Logger.new($stdout),
         :log_level => :debug,
         :log_formatter => AWS::Core::LogFormatter.colored,
         :max_retries => 12,
-      }
+      }.delete_if{ |k,v| v.nil? }
       AWS.config(config)
 
       @ec2 = AWS::EC2.new()
@@ -643,7 +644,7 @@ module Beaker
     def set_hostnames
       if @options[:use_beaker_hostnames]
         @hosts.each do |host|
-          host[:vmhostname] = host[:name]
+          host[:vmhostname] = host.name
           if host['platform'] =~ /el-7/
             # on el-7 hosts, the hostname command doesn't "stick" randomly
             host.exec(Command.new("hostnamectl set-hostname #{host.name}"))
@@ -961,8 +962,9 @@ module Beaker
 
       if provider.set?
         {
-          :access_key => provider.access_key_id,
-          :secret_key => provider.secret_access_key,
+          :access_key    => provider.access_key_id,
+          :secret_key    => provider.secret_access_key,
+          :session_token => provider.session_token,
         }
       else
         {}
@@ -981,8 +983,9 @@ module Beaker
       raise "You must specify an aws_secret_access_key in your .fog file (#{dot_fog}) for ec2 instances!" unless default[:aws_secret_access_key]
 
       {
-        :access_key => default[:aws_access_key_id],
-        :secret_key => default[:aws_secret_access_key],
+        :access_key    => default[:aws_access_key_id],
+        :secret_key    => default[:aws_secret_access_key],
+        :session_token => default[:aws_session_token],
       }
     end
 

data/spec/beaker/hypervisor/aws_sdk_spec.rb

@@ -10,6 +10,7 @@ module Beaker
         and_return({
           :access_key => fog_file_contents[:default][:aws_access_key_id],
           :secret_key => fog_file_contents[:default][:aws_secret_access_key],
+          :session_token => fog_file_contents[:default][:aws_session_token],
         })
 
 
@@ -60,6 +61,7 @@ module Beaker
         creds = aws.load_fog_credentials
         expect( creds[:access_key] ).to eq("IMANACCESSKEY")
         expect( creds[:secret_key] ).to eq("supersekritkey")
+        expect( creds[:session_token] ).to eq('somecrazylongsupersessiontoken!#%^^*(%$^&@$%#!!#$asd;fjapugfrejklvznb;jdgfjiadvij')
       end
 
 
@@ -70,6 +72,30 @@ module Beaker
         creds = aws.load_env_credentials
         expect( creds[:access_key] ).to eq("IMANACCESSKEY")
         expect( creds[:secret_key] ).to eq("supersekritkey")
+        expect( creds[:session_token] ).to be_nil
+      end
+
+      it 'from environment variables with session_token' do
+        ENV['AWS_ACCESS_KEY_ID'] = "IMANACCESSKEY"
+        ENV['AWS_SECRET_ACCESS_KEY'] = "supersekritkey"
+        ENV['AWS_SESSION_TOKEN'] = 'somesuperlongsessiontokenspecialcharsblah!#%$#@$^!@qewpofudjsvjm'
+
+        creds = aws.load_env_credentials
+        expect( creds[:access_key] ).to eq("IMANACCESSKEY")
+        expect( creds[:secret_key] ).to eq("supersekritkey")
+        expect( creds[:session_token] ).to eq('somesuperlongsessiontokenspecialcharsblah!#%$#@$^!@qewpofudjsvjm')
+      end
+
+    end
+
+    context 'dont read fog credentials' do
+      let(:options) { make_opts.merge({ 'use_fog_credentials' => false }) }
+
+      it 'not using fog' do
+        creds = aws.load_env_credentials
+        expect( creds[:access_key] ).to eq(nil)
+        expect( creds[:secret_key] ).to eq(nil)
+        expect( options[:use_fog_credentials] ).to eq(false)
       end
     end
 
@@ -626,11 +652,12 @@ module Beaker
         it 'sets the the vmhostname to the beaker config name for each host' do
           options[:use_beaker_hostnames] = true
 	  @hosts.each do |host|
-            host[:name] = "prettyponyprincess"
+            host.instance_eval("@name = 'prettyponyprincess'")
 	  end
           expect(set_hostnames).to eq(@hosts)
           @hosts.each do |host|
-            expect(host[:vmhostname]).to eq(host[:name])
+            expect(host[:vmhostname]).not_to eq(nil)
+            expect(host[:vmhostname]).to eq(host.name)
             expect(host[:vmhostname]).to eq(host.hostname)
           end
         end
@@ -949,17 +976,25 @@ module Beaker
 
     describe '#load_fog_credentials' do
       # Receive#and_call_original below allows us to test the core load_fog_credentials method
-      let(:creds) { {:access_key => 'awskey', :secret_key => 'awspass'} }
       let(:dot_fog) { '.fog' }
       subject(:load_fog_credentials) { aws.load_fog_credentials(dot_fog) }
 
       it 'returns loaded fog credentials' do
+        creds = {:access_key => 'awskey', :secret_key => 'awspass', :session_token => nil}
         fog_hash = {:default => {:aws_access_key_id => 'awskey', :aws_secret_access_key => 'awspass'}}
         expect(aws).to receive(:load_fog_credentials).and_call_original
         expect(YAML).to receive(:load_file).and_return(fog_hash)
         expect(load_fog_credentials).to eq(creds)
       end
 
+      it 'returns loaded fog credentials with session token' do
+        creds = {:access_key => 'awskey', :secret_key => 'awspass', :session_token => 'sometoken'}
+        fog_hash = {:default => {:aws_access_key_id => 'awskey', :aws_secret_access_key => 'awspass', :aws_session_token => 'sometoken'}}
+        expect(aws).to receive(:load_fog_credentials).and_call_original
+        expect(YAML).to receive(:load_file).and_return(fog_hash)
+        expect(load_fog_credentials).to eq(creds)
+      end
+
       context 'raises errors' do
         it 'if missing access_key credential' do
           fog_hash = {:default => {:aws_secret_access_key => 'awspass'}}

data/spec/helpers.rb

@@ -0,0 +1,30 @@
+# setup & require beaker's spec_helper.rb
+beaker_gem_spec = Gem::Specification.find_by_name('beaker')
+beaker_gem_dir = beaker_gem_spec.gem_dir
+beaker_spec_path = File.join(beaker_gem_dir, 'spec')
+$LOAD_PATH << beaker_spec_path
+require File.join(beaker_spec_path, 'helpers.rb')
+
+module TestFileHelpers
+
+  def fog_file_contents
+    { :default => { :aws_access_key_id => "IMANACCESSKEY",
+                    :aws_secret_access_key => "supersekritkey",
+                    :aws_session_token => 'somecrazylongsupersessiontoken!#%^^*(%$^&@$%#!!#$asd;fjapugfrejklvznb;jdgfjiadvij',
+                    :aix_hypervisor_server => "aix_hypervisor.labs.net",
+                    :aix_hypervisor_username => "aixer",
+                    :aix_hypervisor_keyfile => "/Users/user/.ssh/id_rsa-acceptance",
+                    :solaris_hypervisor_server => "solaris_hypervisor.labs.net",
+                    :solaris_hypervisor_username => "harness",
+                    :solaris_hypervisor_keyfile => "/Users/user/.ssh/id_rsa-old.private",
+                    :solaris_hypervisor_vmpath => "rpoooool/zs",
+                    :solaris_hypervisor_snappaths => ["rpoooool/USER/z0"],
+                    :vsphere_server => "vsphere.labs.net",
+                    :vsphere_username => "vsphere@labs.com",
+                    :vsphere_password => "supersekritpassword"} }
+  end
+
+end
+
+# Beaker HostHelpers
+include HostHelpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-aws
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -190,6 +190,7 @@ files:
 - lib/beaker/hypervisor/ec2_helper.rb
 - spec/beaker/hypervisor/aws_sdk_spec.rb
 - spec/beaker/hypervisor/ec2_helper_spec.rb
+- spec/helpers.rb
 - spec/spec_helper.rb
 homepage: https://github.com/puppetlabs/beaker-aws
 licenses:
@@ -211,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Beaker DSL Extension Helpers!