kitchen-scalr 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf896d64b848381606f48c294201eea9005cc0d8
-  data.tar.gz: bf02a1f9ac22894de65ac1bdb99c21ccf796b607
+  metadata.gz: 1715811767a16402db132ab1dd8e5416ed1c269e
+  data.tar.gz: 347d47af5833f7d1c1726bc79bb00f4143ae7bae
 SHA512:
-  metadata.gz: dfb759a6b9af791538fbf709c8e4b1fd709c8270f018c26c7ae1b0b4b20e51a661e9f40258c4bba84808591f4d227fe816824361cf3ab2b767ce50ea947869aa
-  data.tar.gz: 5f314e3ecdd0112146f90c9027a9826be4ee7b1322e0d751fed5e4165d85973195dc389e4603c8bc80cf4c7e6f8f98ccdd40f6cd271ee06b905fed67ec61530f
+  metadata.gz: d129980743e7eb5cae182eaf40811a2009c5ef1e84fd25df6a96e1fb9c31bc5f74c0688c914c77a2d553586d0d68df6f5e73465a7b71d57de0073376fa918789
+  data.tar.gz: 8c465dc682af31fc18833fdeb529a032fe9cad38290bdd8088aa3afcaf6338d5fc512f9151583a2fba3be673f94d60d3255c7c3df3028ff4656feaeddc09e15b

data/README.md

@@ -26,8 +26,11 @@ Please read the [Driver usage][driver_usage] page for more details.
 ### scalr_platform
 **Required in Role mode** This is the identifier of the underlying cloud platform. Examples: "ec2", "gce", "openstack".
 ### scalr_location
-**Required** This is a string corresponding to the cloud location used to create the instance. Example: "us-east-1"
-
+**Required in Role mode** This is a string corresponding to the cloud location used to create the instance. Example: "us-east-1"
+### 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
+**Optional** If set to true, kitchen will use Scalr private ips for the instances, otherwise it will use the public one.
 ## Configuration example
     ---
     driver:
@@ -49,6 +52,12 @@ Please read the [Driver usage][driver_usage] page for more details.
           scalr_use_role: 12345
           scalr_platform: 'ec2'
           scalr_location: 'us-east-1'
+          scalr_base_farm_role:
+            security:
+              securityGroups:
+                - id: 'sg-3b3d9153'
+                - id: 'sg-349a765f'
+                - id: 'sg-4a9a7621'
 
 ## <a name="development"></a> Development
 

data/lib/kitchen/driver/ScalrAPI.rb

@@ -66,13 +66,18 @@ class ScalrAPI
 		if body != ""
 			headers['Content-Type'] = 'application/json'
 		end
-
-		response = ::RestClient::Request.execute(
-			:method => method, 
-			:url => @api_url + url,
-			:headers => headers,
-			:payload  => body
-		)
+		begin
+			response = ::RestClient::Request.execute(
+				:method => method, 
+				:url => @api_url + url,
+				:headers => headers,
+				:payload  => body
+			)
+		rescue RestClient::ExceptionWithResponse => e
+     		puts "Scalr server returned an error: "
+     		puts e.response
+     		raise e
+ 		end
 		if response == ""
 			response = "{}"
 		end

data/lib/kitchen/driver/scalr.rb

@@ -22,6 +22,7 @@ require "kitchen/driver/scalr_version"
 require "kitchen/driver/scalr_ssh_script_template"
 require "kitchen/driver/scalr_cred"
 require "kitchen/driver/scalr_ps_script_template"
+require "kitchen/driver/scalr_farm_role"
 require "json"
 require 'os'
 require 'securerandom'
@@ -36,6 +37,8 @@ module Kitchen
     class Scalr < Kitchen::Driver::Base
       include CredentialsManager
 
+      include FarmRoleObjectBuilder
+
       kitchen_driver_api_version 2
 
       plugin_version Kitchen::Driver::SCALR_VERSION
@@ -66,6 +69,10 @@ module Kitchen
 
       default_config :scalr_location, ''
 
+      default_config :scalr_base_farm_role, Hash.new
+
+      default_config :scalr_use_private_ip, false
+
       def create(state)
       	if config[:scalr_api_key_id]==''
       	  #We have to find some other way of getting the credentials
@@ -96,32 +103,7 @@ module Kitchen
         end
         #Now create the farm role object
         puts "Creating the Farm Role"
-        fruuid = "KITCHEN-ROLE-" + state[:suuid]
-        farmRoleObject = {
-          "alias" => fruuid,
-          "placement" => {
-            "placementConfigurationType" => placementConfigurationType(state[:imagePlatform]),
-            "region" => state[:imageLocation]
-          },
-          "instance" => {
-            "instanceConfigurationType" => instanceConfigurationType(state[:imagePlatform]),
-            "instanceType" => {
-              "id" => config[:scalr_server_instanceType]
-            }
-          },
-          "platform" => state[:imagePlatform],
-          "role" => {
-            "id" => state[:roleId]
-          },
-          "scaling" => {
-            "considerSuspendedServers" => "running", 
-            "enabled" => true, 
-            "maxInstances" => 1, 
-            "minInstances" => 1,  
-            "scalingBehavior" => "launch-terminate",
-            "rules" => []
-          }
-        }        
+        farmRoleObject = buildFarmRoleObject(state, config)
         response = scalr_api.create('/api/v1beta0/user/%s/farms/%d/farm-roles/' % [config[:scalr_env_id], state[:farmId]], farmRoleObject)
         puts "Farm Role created"
         state[:farmRoleId] = response['id']
@@ -137,10 +119,11 @@ module Kitchen
         if response.size == 0 then
           raise "No running server in the farm!"
         end
-        state[:hostname] = response[0]['publicIp'][0]
-        #state[:port] = 22
-        #state[:username] = 'root'
-        #state[:password] = 
+        if config[:scalr_use_private_ip] then
+          state[:hostname] = response[0]['privateIp'][0]
+        else
+          state[:hostname] = response[0]['publicIp'][0]
+        end
         state[:ssh_key] = state[:keyfileName]
         #state[:proxy_command] = 
         #state[:rdp_port] = 
@@ -215,11 +198,11 @@ module Kitchen
       end
 
       def destroy(state)
-        if config[:scalr_api_key_id]==''
-	  #We have to find some other way of getting the credentials
-	  loadCredentials
-	end
-	scalr_api = ScalrAPI.new(config[:scalr_api_url], config[:scalr_api_key_id], config[:scalr_api_key_secret])
+        if config[:scalr_api_key_id]=='' then
+          #We have to find some other way of getting the credentials
+          loadCredentials
+        end
+        scalr_api = ScalrAPI.new(config[:scalr_api_url], config[:scalr_api_key_id], config[:scalr_api_key_secret])
         cleanup_scalr(scalr_api, state)
       end
 
@@ -242,21 +225,6 @@ module Kitchen
         raise "Server status timeout!"
       end
 
-      def placementConfigurationType(cloudPlatform)
-        return {
-          "ec2" => "AwsClassicPlacementConfiguration",
-          "openstack" => "OpenStackPlacementConfiguration",
-          "gce" => "GcePlacementConfiguration",
-          "cloudstack" => "CloudStackPlacementConfiguration"
-          }[cloudPlatform]
-      end
-
-      def instanceConfigurationType(cloudPlatform)
-        return {
-          "ec2" => "AwsInstanceConfiguration"
-          }[cloudPlatform]
-      end
-
       def createCustomRole(scalr_api,state)
         #Get the imageId for the provided image
         puts 'Getting the imageId for image %s' % [config[:scalr_server_image]]

data/lib/kitchen/driver/scalr_farm_role.rb

@@ -0,0 +1,22 @@
+module Kitchen
+  module Driver
+    module FarmRoleObjectBuilder
+      def buildFarmRoleObject(state, config)
+        fruuid = "KITCHEN-ROLE-" + state[:suuid]
+        farmRoleObject = {
+          "alias" => fruuid,
+          "cloudPlatform" => state[:imagePlatform],
+          "cloudLocation" => state[:imageLocation],
+          "instanceType" => {
+            "id" => config[:scalr_server_instanceType]
+          },
+          "role" => {
+            "id" => state[:roleId]
+          }
+        }
+        farmRoleObject = farmRoleObject.deep_merge(config[:scalr_base_farm_role])
+        return farmRoleObject
+      end
+    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.1.0"
+    SCALR_VERSION = "0.2.0"
   end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-scalr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mohammed HAWARI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tailor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Test Kitchen Driver for Scalr
@@ -129,10 +129,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .cane
-- .gitignore
-- .tailor
-- .travis.yml
+- ".cane"
+- ".gitignore"
+- ".tailor"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -143,6 +143,7 @@ files:
 - lib/kitchen/driver/dbapi.rb
 - lib/kitchen/driver/scalr.rb
 - lib/kitchen/driver/scalr_cred.rb
+- lib/kitchen/driver/scalr_farm_role.rb
 - lib/kitchen/driver/scalr_ps_script_template.rb
 - lib/kitchen/driver/scalr_ssh_script_template.rb
 - lib/kitchen/driver/scalr_version.rb
@@ -156,17 +157,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Scalr