kitchen-rackspace 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8ccd25a789a37c85ac075132f6e3d337469efbe
-  data.tar.gz: 40110dcc2c8348d269e9fb431a2509cfdc7cf9c7
+  metadata.gz: b38ffcc8eb26f872550c5ec737ed5066857fb6c4
+  data.tar.gz: 68bdd5ae2e14296e510c3459441e1ad898c1ec38
 SHA512:
-  metadata.gz: 1f154376c3eb72b7e6a88366865b42e62e7d0ecd604e9b63f3e600a89805eea7e8d3006c34337ed51368709afaa4af9146f2deda7cc4c312b4695624b053f869
-  data.tar.gz: d9e441d9540f0f30cdf34ab71e8e247ef5caadade73ddf6f5691a7525ef6d368c59084549646916a7a25d04b3a78eeda6812f7050d89971bd387c9eef7563677
+  metadata.gz: bf5a93011bdb76cf76162077670dc66c6db8a0dd41c91a00d8bcc394c0b99ae8fd5a079b5652af8c39d7a1fe73ceadf337c9864c05fb06d8829bbe4b92e74bf9
+  data.tar.gz: 1402487a8c35aacbd2189b1e020fe5c9c23bc3fc549137e80267313eef581e03f354fa0fdc83bffdf07647a966ba9ddb1fa5e32e5e736a2e6bb744fe3f140f4c

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.11.0 / 2014-09-04
+
+### Improvements
+
+* PR [#40][] - Port the server name generator from the OpenStack/DigitalOcean
+drivers, with all its bug fixes; update image IDs
+
 # 0.10.0 / 2014-08-28
 
 ### Improvements
@@ -90,6 +97,7 @@ boot times, via [@coderanger][]
 
 * Initial release! Woo!
 
+[#40]: https://github.com/test-kitchen/kitchen-rackspace/pull/40
 [#39]: https://github.com/test-kitchen/kitchen-rackspace/pull/39
 [#38]: https://github.com/test-kitchen/kitchen-rackspace/pull/38
 [#37]: https://github.com/test-kitchen/kitchen-rackspace/pull/37

data/data/images.json

@@ -2,20 +2,20 @@
   "arch": "88928a0a-f94c-47e3-ad7d-27b735af1a15",
   "arch-2014": "88928a0a-f94c-47e3-ad7d-27b735af1a15",
   "arch-2014.8": "88928a0a-f94c-47e3-ad7d-27b735af1a15",
-  "centos": "76016123-eed4-4666-aea9-651fd26ee13c",
-  "centos-7": "76016123-eed4-4666-aea9-651fd26ee13c",
-  "centos-7.0": "76016123-eed4-4666-aea9-651fd26ee13c",
+  "centos": "4da79ffd-46f0-4f7c-9ade-490f04cc8994",
+  "centos-7": "4da79ffd-46f0-4f7c-9ade-490f04cc8994",
+  "centos-7.0": "4da79ffd-46f0-4f7c-9ade-490f04cc8994",
   "centos-6": "a84b1592-6817-42da-a57c-3c13f3cfc1da",
   "centos-6.5": "a84b1592-6817-42da-a57c-3c13f3cfc1da",
   "centos-5": "1078244e-5906-4faf-b88a-a4202889dc00",
   "centos-5.10": "1078244e-5906-4faf-b88a-a4202889dc00",
   "coreos": "4ca73331-5063-429f-8a27-70de5099e747",
   "coreos-stable": "4ca73331-5063-429f-8a27-70de5099e747",
-  "coreos-beta": "746ba067-035c-4dbb-91f6-39300a7f8a03",
+  "coreos-beta": "b782d604-4f2e-48b1-a184-fb99b19889b4",
   "coreos-alpha": "78a24bc3-2545-433b-8067-a5143c04a3c3",
-  "debian": "3e1c00f6-bcbb-4590-903a-c39662bdbc3d",
-  "debian-7": "3e1c00f6-bcbb-4590-903a-c39662bdbc3d",
-  "debian-7.6": "3e1c00f6-bcbb-4590-903a-c39662bdbc3d",
+  "debian": "06cbc0a2-a906-4e6a-8ed7-bd7c952c9f81",
+  "debian-7": "06cbc0a2-a906-4e6a-8ed7-bd7c952c9f81",
+  "debian-7.6": "06cbc0a2-a906-4e6a-8ed7-bd7c952c9f81",
   "debian-6": "695ca76e-fc0d-4e36-82e0-8ed66480a999",
   "debian-6.06": "695ca76e-fc0d-4e36-82e0-8ed66480a999",
   "debian-testing": "ed2dd345-b0a5-42aa-b061-a153c91e2c6d",

data/lib/kitchen/driver/rackspace.rb

@@ -95,10 +95,21 @@ module Kitchen
         images[instance.platform.name]
       end
 
+      # Generate what should be a unique server name up to 63 total chars
+      # Base name:    15
+      # Username:     15
+      # Hostname:     23
+      # Random string: 7
+      # Separators:    3
+      # ================
+      # Total:        63
       def default_name
-        # Generate what should be a unique server name
-        rand_str = Array.new(8) { rand(36).to_s(36) }.join
-        "#{instance.name}-#{Etc.getlogin}-#{Socket.gethostname}-#{rand_str}"
+        [
+          instance.name.gsub(/\W/, '')[0..14],
+          (Etc.getlogin || 'nologin').gsub(/\W/, '')[0..14],
+          Socket.gethostname.gsub(/\W/, '')[0..22],
+          Array.new(7) { rand(36).to_s(36) }.join
+        ].join('-')
       end
 
       private

data/lib/kitchen/driver/rackspace_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    RACKSPACE_VERSION = '0.10.0'
+    RACKSPACE_VERSION = '0.11.0'
   end
 end

data/spec/kitchen/driver/rackspace_spec.rb

@@ -30,10 +30,11 @@ describe Kitchen::Driver::Rackspace do
   let(:state) { Hash.new }
   let(:platform_name) { 'ubuntu' }
   let(:default_networks) { nil }
+  let(:instance_name) { 'potatoes' }
 
   let(:instance) do
     double(
-      name: 'potatoes',
+      name: instance_name,
       logger: logger,
       to_str: 'instance',
       platform: double(name: platform_name)
@@ -120,7 +121,7 @@ describe Kitchen::Driver::Rackspace do
       'ubuntu' => '255df5fb-e3d4-45a3-9a07-c976debf7c14',
       'centos-5.10' => '1078244e-5906-4faf-b88a-a4202889dc00',
       'centos-5' => '1078244e-5906-4faf-b88a-a4202889dc00',
-      'centos' => '76016123-eed4-4666-aea9-651fd26ee13c'
+      'centos' => '4da79ffd-46f0-4f7c-9ade-490f04cc8994'
     }
     platforms.each do |platform, id|
       context "name is #{platform}" do
@@ -387,14 +388,56 @@ describe Kitchen::Driver::Rackspace do
   end
 
   describe '#default_name' do
+    let(:login) { 'user' }
+    let(:hostname) { 'host' }
+
     before(:each) do
-      allow(Etc).to receive(:getlogin).and_return('user')
-      allow(Socket).to receive(:gethostname).and_return('host')
+      allow(Etc).to receive(:getlogin).and_return(login)
+      allow(Socket).to receive(:gethostname).and_return(hostname)
     end
 
     it 'generates a name' do
-      expect(driver.default_name).to match(
-        /^potatoes-user-host-/)
+      expect(driver.send(:default_name)).to match(/^potatoes-user-host-(\S*)/)
+    end
+
+    context 'local node with a long hostname' do
+      let(:hostname) { 'ab.c' * 20 }
+
+      it 'limits the generated name to 63 characters' do
+        expect(driver.send(:default_name).length).to be <= (63)
+      end
+    end
+
+    context 'node with a long hostname, username, and base name' do
+      let(:login) { 'abcd' * 20 }
+      let(:hostname) { 'efgh' * 20 }
+      let(:instance_name) { 'ijkl' * 20 }
+
+      it 'limits the generated name to 63 characters' do
+        expect(driver.send(:default_name).length).to eq(63)
+      end
+    end
+
+    context 'a login and hostname with punctuation in them' do
+      let(:login) { 'some.u-se-r' }
+      let(:hostname) { 'a.host-name' }
+      let(:instance_name) { 'a.instance-name' }
+
+      it 'strips out the dots to prevent bad server names' do
+        expect(driver.send(:default_name)).to_not include('.')
+      end
+
+      it 'strips out all but the three hyphen separators' do
+        expect(driver.send(:default_name).count('-')).to eq(3)
+      end
+    end
+
+    context 'a non-login shell' do
+      let(:login) { nil }
+
+      it 'subs in a placeholder login string' do
+        expect(driver.send(:default_name)).to match(/^potatoes-nologin-/)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Rackspace driver