kitchen-gce 0.0.1 → 0.0.4

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+### Bug fixes
+
+* In GCE, instance names must be unique; derive by default from
+  `<suite>-<platform>` and a UUID.
+* README formatting and clarity fixes.
+
+### Improvements
+
+* Add concept of an "area" (us, europe, any) to automatically select
+  an availability zone from those that are up within the requested
+  area for each instance.
+
+## 0.0.1 / 2013-10-20
+
+### Initial release

data/Gemfile

@@ -1 +1,4 @@
 source 'https://rubygems.org'
+
+# Specify dependencies in gemspec:
+gemspec

data/README.md

@@ -18,12 +18,14 @@ which to run your test-kitchen instances, create one, noting the
 Console](https://code.google.com/apis/console/), create a "service
 account" for the project under the "API Access" tab.  Save the key
 file, and note the email address associated with the service account
-(e.g. <number>@developer.gserviceaccount.com - not the project owner's
-email address).
+(e.g. 123456789012@developer.gserviceaccount.com - not the project
+owner's email address).
 
 If you have not [set up SSH keys for your GCE
 environment](https://developers.google.com/compute/docs/instances#sshkeys),
-you must also do that prior to using kitchen-gce.
+you must also do that prior to using kitchen-gce.  Also, you will
+likely want to add your GCE SSH keys to ssh-agent prior to converging
+any instances.
 
 ## Installation
 
@@ -45,6 +47,16 @@ Then, execute `bundle install`.
 
 ## Configuration
 
+### area
+
+Area in which to launch instances.  For the purposes of this driver,
+"area" is defined as the part prior to the first hyphen in an
+availability zone's name; e.g. in "us-central1-b", the area is "us".
+Specifying area but not "zone_name" allows kitchen-gce to avoid
+launching instances into a zone that is down for maintenance.  If
+"any" is specified, kitchen-gce will select a zone from all areas.
+Default: `us` (lowest cost area); valid values: `any`, `europe`, `us`
+
 ### google_client_email
 
 **Required** Email address associated with your GCE service account.
@@ -69,11 +81,13 @@ instances will be launched.
 
 GCE instance type (size) to launch; default: `n1-standard-1`
 
-### name
+### inst_name
 
 Name to give to instance; unlike EC2's "Name" tag, this is used as an
-instance identifier and must be unique.  Default:
-`test-kitchen-#{Time.now.to_i}`
+instance identifier and must be unique.  If none is specified, a unique
+name will be auto-generated; note that auto-generated names must be
+used if there is more than one test suite.  Default:
+`<suite>-<platform>-<UUID>`
 
 ### username
 
@@ -82,7 +96,8 @@ to the appropriate SSH keys.  Default: `ENV['USER']`
 
 ### zone_name
 
-Location into which instances will be launched.  Default: `us-central1-b`
+Location into which instances will be launched.  If not specified, a
+zone is chosen from available zones within the "area" (see above).
 
 ## Example
 
@@ -93,6 +108,7 @@ like this:
 ---
 driver_plugin: gce
 driver_config:
+  area: any
   google_client_email: "123456789012@developer.gserviceaccount.com"
   google_key_location: "<%= ENV['HOME']%>/gce/1234567890abcdef1234567890abcdef12345678-privatekey.p12"
   google_project: "alpha-bravo-123"
@@ -126,11 +142,11 @@ Source is hosted on [GitHub](https://github.com/anl/kitchen-gce).
 Created and maintained by [Andrew Leonard](http://andyleonard.com)
 ([andy@hurricane-ridge.com](mailto:andy@hurricane-ridge.com)).
 
-The initial implementation drew heavily on the
+The initial release drew heavily on the
 [kitchen-ec2](https://github.com/opscode/kitchen-ec2/) gem for both
 inspiration and implementation details.  Any bugs, however, are solely
-the author's own fault.
+the author's own doing.
 
 ## License
 
-Apache 2.0.
+Licensed under Apache 2.0.

data/kitchen-gce.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'kitchen-gce'
-  s.version     = '0.0.1'
+  s.version     = '0.0.4'
   s.date        = '2013-10-20'
   s.summary     = 'Kitchen::Driver::Gce'
   s.description = 'A Test-Kitchen driver for Google Compute Engine'
@@ -10,7 +10,11 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/anl/kitchen-gce'
   s.license     = 'Apache 2.0'
 
-  s.add_dependency 'test-kitchen', '~> 1.0.0.beta.3'
-  s.add_dependency 'fog', '>= 1.11.0'
+  s.add_dependency 'test-kitchen'
+  s.add_dependency 'fog', '>= 1.19.0'
   s.add_dependency 'google-api-client'
+
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'tailor'
 end

data/lib/kitchen/driver/gce.rb

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 require 'fog'
+require 'securerandom'
 
 require 'kitchen'
 
@@ -22,10 +23,11 @@ module Kitchen
   module Driver
     class Gce < Kitchen::Driver::SSHBase
 
-      default_config :machine_type,  'n1-standard-1'
-      default_config :name,          "test-kitchen-#{Time.now.to_i}"
-      default_config :username,      ENV['USER']
-      default_config :zone_name,     'us-central1-b'
+      default_config :area, 'us'
+      default_config :machine_type, 'n1-standard-1'
+      default_config :inst_name, nil
+      default_config :username, ENV['USER']
+      default_config :zone_name, nil
 
       required_config :google_client_email
       required_config :google_key_location
@@ -33,7 +35,10 @@ module Kitchen
       required_config :image_name
 
       def create(state)
-        server= create_instance
+        return if state[:server_id]
+
+        config[:inst_name] ||= generate_name
+        server = create_instance
         state[:server_id] = server.identity
 
         info("GCE instance <#{state[:server_id]}> created.")
@@ -56,7 +61,7 @@ module Kitchen
       end
 
       private
-      
+
       def connection
         Fog::Compute.new({
           :provider            => 'google',
@@ -68,13 +73,46 @@ module Kitchen
 
       def create_instance
         connection.servers.create({
-          :name         => config[:name],
+          :name         => config[:inst_name],
           :image_name   => config[:image_name],
           :machine_type => config[:machine_type],
-          :zone_name    => config[:zone_name],
+          :zone_name    => get_zone,
         })
       end
 
+      def get_zone
+        if config[:zone_name].nil?
+          zones = []
+          connection.zones.each do |z|
+            case config[:area]
+            when 'us'
+              if z.name.match(/^us/) and z.status == 'UP'
+                zones.push(z)
+              end
+            when 'europe'
+              if z.name.match(/^europe/) and z.status == 'UP'
+                zones.push(z)
+              end
+            when 'any'
+              if z.status == 'UP'
+                zones.push(z)
+              end
+            else
+              raise ArgumentError, 'Unknown area'
+            end
+          end
+          return zones.sample.name
+        else
+          return config[:zone_name]
+        end
+      end
+
+      def generate_name
+        # Inspired by generate_name from kitchen-rackspace
+        base_name = instance.name[0..26] # UUID is 36 chars, max name length 63
+        "#{base_name}-#{SecureRandom.uuid}"
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-gce
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -16,17 +16,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.19.0
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tailor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Test-Kitchen driver for Google Compute Engine
 email: andy@hurricane-ridge.com
 executables: []
@@ -66,6 +114,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -84,12 +133,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3638187786435759861
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3638187786435759861
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23