kitchen-linode 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fdde159676f80c3c7393b8d367d890015728851
-  data.tar.gz: b9b2068002a5023f7519394f68991f370af630ee
+  metadata.gz: b429d8c0d943634ab216a027c4bc62162566f3a5
+  data.tar.gz: c82211b3cb544569746a8f2d9a337ad385c316a2
 SHA512:
-  metadata.gz: a6c3ac89e8d376c298107ba26c3add27751d3fae9b16113eff242fff3d81afd9340217eea1d78c39d19ee6def4b8a11d747f32b4cecdb9f93fbe493ad3a8290f
-  data.tar.gz: e66263ab10f93f22c64231fe07aaf65c7924cf1d659f6839299126fb7ef6f9e322dbd936d774a09f8c86c51431087db049f77d065868e870b4a359534ba5874b
+  metadata.gz: 0666415dff8f9a349760291379e98ee71fbd8ebd622d964c63a0e98fc85041a633c685398eaa0e717c077d66b8cc2ec5ad3577daab6ec5c3c539d152edaea23d
+  data.tar.gz: 393231cd75860bbea2e844bae894b082bd60125cfb704d5e2e5443d6db435a8243bbe732ae4e43ea3ad8cc61d2dc813e76a6ce1350c56d87c12e81c6673c1a96

data/.codeclimate.yml

@@ -5,8 +5,8 @@ engines:
       languages:
       - ruby
       - javascript
-      exclude_fingerprints:
-      - f08c6dde8c0c74e57c63addbf89c6620
+    exclude_fingerprints:
+    - f08c6dde8c0c74e57c63addbf89c6620
   rubocop:
       enabled: true
 

data/LICENSE.md

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/lib/kitchen/driver/linode.rb

@@ -63,36 +63,36 @@ module Kitchen
         config_server_name
         set_password
         
-        if state[:server_id]
-          info "#{config[:server_name]} (#{state[:server_id]}) already exists."
+        if state[:linode_id]
+          info "#{config[:server_name]} (#{state[:linode_id]}) already exists."
           return
         end
         
-        info("Creating Linode.")
+        info("Creating Linode - #{config[:server_name]}")
         
         server = create_server
         
         # assign the machine id for reference in other commands
-        state[:server_id] = server.id
+        state[:linode_id] = server.id
         state[:hostname] = server.public_ip_address
-        info("Linode <#{state[:server_id]}> created.")
+        info("Linode <#{state[:linode_id]}> created.")
         info("Waiting for linode to boot...")
         server.wait_for { ready? }
-        info("Linode <#{state[:server_id]}, #{state[:hostname]}> ready.")
+        info("Linode <#{state[:linode_id]}, #{state[:hostname]}> ready.")
         setup_ssh(state) if bourne_shell?
       rescue Fog::Errors::Error, Excon::Errors::Error => ex
         raise ActionFailed, ex.message
       end
 
       def destroy(state)
-        return if state[:server_id].nil?
-        server = compute.servers.get(state[:server_id])
+        return if state[:linode_id].nil?
+        server = compute.servers.get(state[:linode_id])
 
         server.destroy
 
-        info("Linode <#{state[:server_id]}> destroyed.")
-        state.delete(:server_id)
-        state.delete(:hostname)
+        info("Linode <#{state[:linode_id]}> destroyed.")
+        state.delete(:linode_id)
+        state.delete(:pub_ip)
       end
       
       private
@@ -192,11 +192,15 @@ module Kitchen
                            :password => config[:password],
                            :timeout => config[:ssh_timeout])
         pub_key = open(config[:public_key_path]).read
+        shortname = "#{config[:vm_hostname].split('.')[0]}"
+        hostsfile = "127.0.0.1 #{config[:vm_hostname]} #{shortname} localhost\n::1 #{config[:vm_hostname]} #{shortname} localhost"
         @max_interval = 60
         @max_retries = 10
         @retries = 0
         begin
           ssh.run([
+            %(echo "#{hostsfile}" > /etc/hosts),
+            %(hostnamectl set-hostname #{config[:vm_hostname]}),
             %(mkdir .ssh),
             %(echo "#{pub_key}" >> ~/.ssh/authorized_keys),
             %(passwd -l #{config[:username]})
@@ -217,8 +221,17 @@ module Kitchen
       
       # Set the proper server name in the config
       def config_server_name
-        return if config[:server_name]
-        config[:server_name] = "kitchen_linode-#{rand.to_s.split('.')[1]}"
+        if config[:server_name]
+          config[:vm_hostname] = "#{config[:server_name]}"
+          config[:server_name] = "kitchen-#{config[:server_name]}-#{instance.name}-#{Time.now.to_i.to_s}"
+        else
+          config[:vm_hostname] = "#{instance.name}"
+          config[:server_name] = "kitchen-#{File.basename(config[:kitchen_root])}-#{instance.name}-#{Time.now.to_i.to_s}"
+        end
+        
+        if config[:server_name].is_a?(String) && config[:server_name].size >= 32
+          config[:server_name] = "#{config[:server_name][0..29]}#{rand(10..99)}"
+        end
       end
       
       # ensure a password is set

data/lib/kitchen/driver/linode_version.rb

@@ -20,6 +20,6 @@ module Kitchen
 
   module Driver
     # Version string for Linode Kitchen driver
-    LINODE_VERSION = "0.11.0"
+    LINODE_VERSION = "0.12.0"
   end
 end

data/spec/kitchen/driver/linode_spec.rb

@@ -46,9 +46,11 @@ describe Kitchen::Driver::Linode do
   describe '#finalize_config' do
     before(:each) { allow(File).to receive(:exist?).and_return(false) }
 
-    context 'both private and public key info provided' do
+    context 'private key, public key, and api key provided' do
       let(:config) do
-        { private_key_path: '/tmp/key', public_key_path: '/tmp/key.pub' }
+        { private_key_path: '/tmp/key', 
+          public_key_path: '/tmp/key.pub',
+          api_key: 'mykey' }
       end
 
       it 'raises no error' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-linode
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Brett Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -109,6 +109,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- LICENSE.md
 - README.md
 - Rakefile
 - kitchen-linode.gemspec