kitchen-scalr 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aed471809336ed67da5a607d989338cf8730062e
-  data.tar.gz: 7b5f76e72e1fcc8edbf0a85c5b1275304a7aebe4
+  metadata.gz: cb804557c97471c653a3a10e19146a07e0393fac
+  data.tar.gz: 1d46aad9bf348f7afc5887bc3fa284296e41e1fa
 SHA512:
-  metadata.gz: 8d538c4bbf86fd2d648226815903efb53972e77dfdd3b9e5d61df94e585996f691764dd1c9d48c6acdaf958d7028476ccf630b8c5623ef4fdcb772ce82c86ab2
-  data.tar.gz: 34a8fec968f23bc2ab088c298df6ca1a35a19ac8fe291244c8922048b3d450a5d0a449436b18e9c4b85c88b3dee19a40ef5f13cb87fa90c7305826fd30c70fdc
+  metadata.gz: dec56583fa44e36aadcdbef74edbebc4d2ac95f710e35fbead6b71020d56c59c9ef3b668706335df259e425baf35cf77d0794bd42929eb42c48add4935f17fd1
+  data.tar.gz: 36832a993dc9a197bcb2d153b0f5a01c09fc5d88d7dc1f8691c74ef5c8608117878c9115bcf509bd0933e535003c3e55a0022a74d9a6e6200b5d064e9b5f61a0

data/README.md

@@ -1,5 +1,7 @@
 # <a name="title"></a> Kitchen::Scalr
 
+[![Gem Version](https://badge.fury.io/rb/kitchen-scalr.svg)](https://badge.fury.io/rb/kitchen-scalr)
+
 A Test Kitchen Driver for Scalr. This driver creates an instance on Scalr by creating a Farm containing a single Farm Role and granting Test Kitchen access to the corresponding server. It can work in two modes:
 * **Image Mode:** (default) The user provides an image name and the driver will automatically create a role corresponding to this image as well as instanciate this role in a farm.
 * **Role Mode:** the user provides a role id and the driver will instanciate it in a farm
@@ -14,7 +16,7 @@ Please read the [Driver usage][driver_usage] page for more details.
 ### scalr_env_id
 **Required** This is a string corresponding to the environment id used by the plugin.
 ### scalr_api_key_id and scalr_api_key_secret
-**Required except on macOS and Windows** These are respectively the API KEY ID and API KEY secret used to make the API calls to Scalr. This option **SHOULD NOT** be used on Windows and macOS because kitchen scalr integrates natively with these OSes to ensure secure storage of the Scalr credentials. In this case, Scalr will prompt for credentials at the first use, and memorize them for further calls.
+**Required except on macOS and Windows** These are respectively the API KEY ID and API KEY secret used to make the API calls to Scalr. This option **SHOULD NOT** be used on Windows and macOS because kitchen scalr integrates natively with these OSes to ensure secure storage of the Scalr credentials. In this case, Kitchen-Scalr will prompt for credentials at the first use, and memorize them for further calls.
 ### scalr_project_id
 **Required** This is a string corresponding to the project identifier used to create the farm in Scalr. This is used in Scalr for accountability and cost management.
 ### scalr_use_role
@@ -27,6 +29,8 @@ Please read the [Driver usage][driver_usage] page for more details.
 **Required in Role mode** This is the identifier of the underlying cloud platform. Examples: "ec2", "gce", "openstack".
 ### scalr_location
 **Required in Role mode** This is a string corresponding to the cloud location used to create the instance. Example: "us-east-1"
+### scalr_permit_ssh_root_login
+**Optional** This is a boolean, default is 'false', that configures sshd to allow root logins and bounces the service during kitchen create. Useful if your base image does not allow ssh as root by default.
 ### scalr_base_farm_role
 **Optional** This is a yaml representation of a Farm Role Object as described in the APIv2 in Scalr. When kitchen-scalr creates a server, it merges this object with the previously-described parameters and creates the corresponding Farm Role. This section can be used to configure Security Groups, Networking etc... You can put the same parameters there as the ones you would get with a `scalr-ctl farm-roles get`.
 ### scalr_use_private_ip
@@ -74,9 +78,14 @@ example:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+## <a name="thanks"></a> Thanks
+
+- @daxgames for contributing the 'permit_ssh_root_login' setting.
+
 ## <a name="authors"></a> Authors
 
-Created and maintained by [Mohammed HAWARI][author] (<mohammed@hawari.fr>)
+- Created by [Mohammed HAWARI][author] (<mohammed@hawari.fr>)
+- Maintained by [Aloys AUGUSTIN][maintainer] (<aloys@scalr.com>)
 
 ## <a name="license"></a> License
 
@@ -84,8 +93,9 @@ Apache 2.0 (see [LICENSE][license])
 
 
 [author]:           https://github.com/momohawari
-[issues]:           https://github.com/momohawari/kitchen-scalr/issues
-[license]:          https://github.com/momohawari/kitchen-scalr/blob/master/LICENSE
-[repo]:             https://github.com/momohawari/kitchen-scalr
+[maintainer]:       https://github.com/aloysaugustin
+[issues]:           https://github.com/aloysaugustin/kitchen-scalr/issues
+[license]:          https://github.com/aloysaugustin/kitchen-scalr/blob/master/LICENSE
+[repo]:             https://github.com/aloysaugustin/kitchen-scalr
 [driver_usage]:     http://kitchen.ci/docs/getting-started/adding-platform
 [chef_omnibus_dl]:  http://www.chef.io/chef/install/

data/kitchen-scalr.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{A Test Kitchen Driver for Scalr}
   spec.summary       = spec.description
   spec.homepage      = ''
-  spec.license       = 'Apache 2.0'
+  spec.license       = 'Apache-2.0'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = []

data/lib/kitchen/driver/scalr.rb

@@ -71,6 +71,8 @@ module Kitchen
 
       default_config :scalr_base_farm_role, Hash.new
 
+      default_config :scalr_permit_ssh_root_login, false
+
       default_config :scalr_use_private_ip, false
 
       def create(state)
@@ -125,8 +127,8 @@ module Kitchen
           state[:hostname] = response[0]['publicIp'][0]
         end
         state[:ssh_key] = state[:keyfileName]
-        #state[:proxy_command] = 
-        #state[:rdp_port] = 
+        #state[:proxy_command] =
+        #state[:rdp_port] =
       end
 
       def cleanup_scalr(scalr_api, state)
@@ -243,17 +245,17 @@ module Kitchen
         #Create a matching role on the fly
         ruuid = 'KITCHEN-ROLE-' + state[:suuid]
         roleObject = {
-          "builtinAutomation" => ["base"], 
+          "builtinAutomation" => ["base"],
           "category" => {
                           "id" => 1
-                        }, 
-          "deprecated" => false, 
-          "description" => "test kitchen role", 
-          "name" => ruuid, 
+                        },
+          "deprecated" => false,
+          "description" => "test kitchen role",
+          "name" => ruuid,
           "os" => {
                     "id" => state[:imageOsId]
-                  }, 
-          "quickStart" => false,  
+                  },
+          "quickStart" => false,
           "useScalrAgent" => true
         }
         puts 'Creating a role with name %s' % [ruuid]
@@ -286,6 +288,9 @@ module Kitchen
           res = `yes | ssh-keygen -q -f #{keyfileName} -N ""`
           f = File.open(keyfileName + ".pub")
           scriptData = Kitchen::Driver::SCALR_SSH_SCRIPT % { :ssh_pub_key => f.read }
+          if config[:scalr_permit_ssh_root_login]
+            scriptData += Kitchen::Driver::SCALR_SSH_ROOT_PERMIT_SCRIPT
+          end
           f.close
           state[:scriptOsType] = "linux"
         else

data/lib/kitchen/driver/scalr_ssh_script_template.rb

@@ -1,10 +1,25 @@
+require 'kitchen'
+
 module Kitchen
   module Driver
 
-    SCALR_SSH_SCRIPT = 
-    '#!/bin/bash
+    SCALR_SSH_SCRIPT = '#!/bin/bash
 cat >> /root/.ssh/authorized_keys << EOF
 %{ssh_pub_key}
-EOF'
+EOF
+'
+
+    SCALR_SSH_ROOT_PERMIT_SCRIPT = '
+sed -i \'s/^\(PermitRootLogin\)\s*no/\1 yes/g\' /etc/ssh/sshd_config
+
+if command -v systemctl >/dev/null 2>&1; then
+    systemctl restart sshd
+elif [ -f /etc/init.d/ssh ]; then
+    /etc/init.d/ssh restart
+elif [ -f /etc/init.d/sshd ]; then
+    /etc/init.d/sshd restart
+fi
+'
+
   end
-end
+end

data/lib/kitchen/driver/scalr_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Scalr Kitchen driver
-    SCALR_VERSION = "0.2.2"
+    SCALR_VERSION = "0.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-scalr
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Mohammed HAWARI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -163,7 +163,7 @@ files:
 - lib/kitchen/driver/scalr_version.rb
 homepage: ''
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Scalr