beaker-aws 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57529b95c092329fae7b75595e5d037d1a911b7e
-  data.tar.gz: b0da2eb31f34a2577011d61ebba9c9ce6c1a90d3
+  metadata.gz: 4866acd6653e805a28c64c04e3ca86c9906ff7e5
+  data.tar.gz: e6b5052bbe8d40251c1cd9f91bd0c28fec0e905a
 SHA512:
-  metadata.gz: 74923a90c8fe25d456959961d7ae0f2f5672d6116e631fa9b8e514b14d6fad51320fc98d03ea42995629317a24ef8e3f51d028a220fc9876435427aeed37a5da
-  data.tar.gz: 9da09c3fc224398a918979348b0e9c1a454b0276dfd923dd1b97d7e526d03aea15d8f820b0fe6add671bda0ae5c9bab5a680332208c9ea2e380ef3dc84973113
+  metadata.gz: 5118363801c1e62579baa718d2e8a2e2a53fb4a46e15d8f42d20116480696e320dec38a4095e050073c095f1299d8d39ef33e1b945e9a89e64fad99291caea13
+  data.tar.gz: 43651255fa2ea328814945204fc859f2415468024863ba292195c1da7b5dfe171d8a496a7f27e0545cff3b6061f717e18bacb3260553fc699e6b8f2ecb0c538c

data/README.md

@@ -4,19 +4,26 @@ Beaker library to use aws hypervisor
 
 # How to use this wizardry
 
-This gem that allows you to use hosts with [aws](aws.md) hypervisor with [beaker](https://github.com/puppetlabs/beaker). 
-Please checkout our [aws](aws.md) and [ec2](ec2.md) docs.
+This gem that allows you to use hosts with [aws](aws.md) hypervisor with [beaker](https://github.com/puppetlabs/beaker). Please check out our [aws](aws.md) and [ec2](ec2.md) docs.
 
-### Right Now? (beaker 3.x)
+Beaker will automatically load the appropriate hypervisors for any given hosts file, so as long as your project dependencies are satisfied there's nothing else to do. No need to `require` this library in your tests.
 
-This gem is already included as [beaker dependency](https://github.com/puppetlabs/beaker/blob/master/beaker.gemspec) for you, so you don't need to do anything special to use this gem's functionality with beaker.
+## With Beaker 3.x
 
-### In beaker's Next Major Version? (beaker 4.x)
+This library is included as a dependency of Beaker 3.x versions, so there's nothing to do.
 
-In beaker's next major version, the requirement for beaker-aws will be pulled
-from that repo. When that happens, then the usage pattern will change. In order
-to use this then, you'll need to include beaker-aws as a dependency right
-next to beaker itself.
+## With Beaker 4.x
+
+As of Beaker 4.0, all hypervisor and DSL extension libraries have been removed and are no longer dependencies. In order to use a specific hypervisor or DSL extension library in your project, you will need to include them alongside Beaker in your Gemfile or project.gemspec. E.g.
+
+~~~ruby
+# Gemfile
+gem 'beaker', '~>4.0'
+gem 'beaker-aws'
+# project.gemspec
+s.add_runtime_dependency 'beaker', '~>4.0'
+s.add_runtime_dependency 'beaker-aws'
+~~~
 
 # Spec tests
 

data/ec2.md

@@ -111,3 +111,6 @@ This is optional and by default is set to '0.0.0.0/0'.
 
 #### `user` ####
 By default root login is not allowed with Amazon Linux. Setting it to ec2-user will trigger `sshd_config` and `authorized_keys` changes by beaker.
+
+#### `disable_root_ssh` ####
+By default Beaker enabled root login on the instance. There are situation where we use AMIs which are pre-configured. Setting `disable_root_ssh` to `true` will stop enablign the root login.

data/lib/beaker-aws/version.rb

@@ -1,3 +1,3 @@
 module BeakerAws
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -612,9 +612,9 @@ module Beaker
     # @return [void]
     # @api private
     def configure_hosts
-      non_netdev_hosts = @hosts.select{ |h| !(h['platform'] =~ /f5-|netscaler/) }
-      non_netdev_hosts.each do |host|
-        host_entries = non_netdev_hosts.map do |h|
+      non_netdev_windows_hosts = @hosts.select{ |h| !(h['platform'] =~ /f5-|netscaler|windows/) }
+      non_netdev_windows_hosts.each do |host|
+        host_entries = non_netdev_windows_hosts.map do |h|
           h == host ? etc_hosts_entry(h, :private_ip) : etc_hosts_entry(h)
         end
         host_entries.unshift "127.0.0.1\tlocalhost localhost.localdomain\n"
@@ -629,7 +629,12 @@ module Beaker
     # @api private
     def enable_root_on_hosts
       @hosts.each do |host|
-        enable_root(host)
+        if host['disable_root_ssh'] == true
+          @logger.notify("aws-sdk: Not enabling root for instance as disable_root_ssh is set to 'true'.")
+        else
+          @logger.notify("aws-sdk: Enabling root ssh")
+          enable_root(host)
+        end
       end
     end
 
@@ -709,6 +714,8 @@ module Beaker
           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}"))
+          elsif host['platform'] =~ /windows/
+            @logger.notify('aws-sdk: Change hostname on windows is not supported.')
           else
             next if host['platform'] =~ /netscaler/
             host.exec(Command.new("hostname #{host.name}"))
@@ -728,6 +735,8 @@ module Beaker
           if host['platform'] =~ /el-7/
             # on el-7 hosts, the hostname command doesn't "stick" randomly
             host.exec(Command.new("hostnamectl set-hostname #{host.hostname}"))
+          elsif host['platform'] =~ /windows/
+            @logger.notify('aws-sdk: Change hostname on windows is not supported.')
           else
             next if host['platform'] =~ /netscaler/
             host.exec(Command.new("hostname #{host.hostname}"))

data/spec/beaker/hypervisor/aws_sdk_spec.rb

@@ -44,7 +44,7 @@ module Beaker
     }}
 
     before :each do
-      @hosts = make_hosts({:snapshot => :pe}, 6)
+      @hosts = make_hosts({:snapshot => :pe}, 7)
       @hosts[0][:platform] = "centos-5-x86-64-west"
       @hosts[1][:platform] = "centos-6-x86-64-west"
       @hosts[2][:platform] = "centos-7-x86-64-west"
@@ -53,6 +53,7 @@ module Beaker
       @hosts[4][:platform] = 'f5-host'
       @hosts[4][:user] = 'notroot'
       @hosts[5][:platform] = 'netscaler-host'
+      @hosts[6][:platform] = 'windows-host'
 
       ENV['AWS_ACCESS_KEY'] = nil
       ENV['AWS_SECRET_ACCESS_KEY'] = nil
@@ -635,9 +636,9 @@ module Beaker
       it { is_expected.to be_nil }
 
       context 'calls #set_etc_hosts' do
-        it 'for each host (except the f5 ones)' do
-          non_netdev_hosts = @hosts.select{ |h| !(h['platform'] =~ /f5|netscaler/) }
-          expect(aws).to receive(:set_etc_hosts).exactly(non_netdev_hosts.size).times
+        it 'for each host (except the f5 and windows ones)' do
+          non_netdev_windows_hosts = @hosts.select{ |h| !(h['platform'] =~ /f5|netscaler|windows/) }
+          expect(aws).to receive(:set_etc_hosts).exactly(non_netdev_windows_hosts.size).times
           expect(configure_hosts).to be_nil
         end
 
@@ -669,6 +670,25 @@ module Beaker
         expect( aws ).to receive(:enable_root_f5).with( @hosts[4] ).once()
         aws.enable_root_on_hosts()
       end
+      context 'when :disable_root_ssh is true' do
+        it 'should not enable root' do
+          @hosts = [@hosts[0]]
+
+          @hosts[0][:disable_root_ssh] = true
+          expect( aws ).to_not receive(:enable_root)
+          aws.enable_root_on_hosts();
+        end
+      end
+
+      context 'when :disable_root_ssh is defined and false' do
+        it 'should enable root' do
+          @hosts = [@hosts[0]]
+
+          @hosts[0][:disable_root_ssh] = false
+          expect( aws ).to receive(:enable_root).with(@hosts[0]).once()
+          aws.enable_root_on_hosts();
+        end
+      end
     end
 
     describe '#enable_root_f5' do
@@ -715,14 +735,14 @@ module Beaker
       context 'for each host' do
         it 'calls exec' do
           @hosts.each do |host|
-            expect(host).to receive(:exec).once unless host['platform'] =~ /netscaler/
+            expect(host).to receive(:exec).once unless host['platform'] =~ /netscaler|windows/
           end
           expect(set_hostnames).to eq(@hosts)
         end
 
         it 'passes a Command instance to exec' do
           @hosts.each do |host|
-            expect(host).to receive(:exec).with( instance_of(Beaker::Command) ).once unless host['platform'] =~ /netscaler/
+            expect(host).to receive(:exec).with( instance_of(Beaker::Command) ).once unless host['platform'] =~ /netscaler|windows/
           end
           expect(set_hostnames).to eq(@hosts)
         end
@@ -737,9 +757,9 @@ 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|
+          @hosts.each do |host|
             host.instance_eval("@name = 'prettyponyprincess'")
-	  end
+          end
           expect(set_hostnames).to eq(@hosts)
           @hosts.each do |host|
             expect(host[:vmhostname]).not_to eq(nil)
@@ -749,6 +769,13 @@ module Beaker
         end
 
       end
+
+      context 'windows host platform' do
+        it 'should not change hostname when use_beaker_hostnames is enabled' do
+          options[:use_beaker_hostnames] = true
+          expect(@hosts[6]).to_not receive(:exec)
+        end
+      end
     end
 
     describe '#backoff_sleep' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-aws
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec