knife-google 1.0.0 → 1.1.0

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.9.3
+
+script: bundle exec rake spec

data/README.md

@@ -65,6 +65,19 @@ or, for Gemfile:
     gem 'knife-google'
 ```
 
+There is a long standing issue in Ruby where the net/http library by default does not check the validity of an SSL certificate during a TLS handshake.
+
+To configure Windows system to validate SSL certificate please download
+[cacert.pem](http://curl.haxx.se/ca/cacert.pem) file and save to C: drive. Now make ruby aware of your certificate authority by setting SSL_CERT_FILE.
+
+To set this in your current command prompt session, type:
+
+```sh
+    set SSL_CERT_FILE = C:\cacert.pem
+```
+
+On Linux system the configuration for SSL certificate validation is present by default.
+
 Depending on your system's configuration, you may need to run this command
 with root/Administrator privileges.
 
@@ -126,7 +139,7 @@ Some usage examples follow:
   $ knife google server list -Z us-central2-a
 
   # Create a server
-  $ knife google server create www1 -m n1-standard-1 -I centos-6-v20130325 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe
+  $ knife google server create www1 -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe
 
   # Delete a server (along with Chef node and API client via --purge)
   $ knife google server delete www1 --purge -Z us-central2-a
@@ -203,12 +216,26 @@ and upcoming maintenance windows.  The output should look similar to:
 ### knife google server create
 
 Use this command to create a new Google Compute Engine server (a.k.a.
-instance).  You must specify a name, the machine type, the zone, and
-image.  Note that if you are bootstrapping the node, make sure to
-follow the preparation instructions earlier and use the `-x` and
-`-i` commands to specify the username and the identity file for
-that user.  Make sure to use the private key file (e.g. `~/.ssh/id_rsa`)
-for the identity file and *not* the public key file.
+instance).  You must specify a name, the machine type, the zone, and 
+the the image name. Images provided by Google follow this naming 
+convention:
+
+  ```
+  debian-7-wheezy-vYYYYMMDD
+  debian-6-squeeze-vYYYYMMDD
+  centos-6-vYYYYMMDD
+  ```
+
+By default, the plugin will look for the specified image in the instance's
+primary project first and then consult GCE's officially supported image
+locations. The `-J IMAGE_PROJECT_ID` option can be specified to force the
+plugin to look for the image in an alternate project location.
+
+Note that if you are bootstrapping the node, make sure to follow the 
+preparation instructions earlier and use the `-x` and `-i` commands 
+to specify the username and the identity file for that user.  Make sure 
+to use the private key file (e.g. `~/.ssh/id_rsa`) for the identity 
+file and *not* the public key file.
 
 See the extended options that also allow bootstrapping the node with
 `knife google server create --help`.

data/lib/chef/knife/google_base.rb

@@ -66,6 +66,7 @@ class Chef
           }
         }.flatten.compact
       end
+
     end
   end
 end

data/lib/chef/knife/google_server_create.rb

@@ -44,11 +44,16 @@ class Chef
         :description => "The Image for the server",
         :required => true
 
+      option :image_project_id,
+        :short => "-J IMAGE_PROJECT_ID",
+        :long => "--google-compute-image-project-id IMAGE_PROJECT_ID",
+        :description => "The project-id containing the Image (debian-cloud, centos-cloud, etc)",
+        :default => "" 
+
       option :zone,
         :short => "-Z ZONE",
         :long => "--google-compute-zone ZONE",
-        :description => "The Zone for this server",
-        :required => true
+        :description => "The Zone for this server"
 
       option :network,
         :short => "-n NETWORK",
@@ -265,23 +270,59 @@ class Chef
         end
 
         begin
-          zone = client.zones.get(config[:zone]).self_link
+          zone = client.zones.get(config[:zone] || Chef::Config[:knife][:google_compute_zone]).self_link
         rescue Google::Compute::ResourceNotFound
-          ui.error("Zone '#{config[:zone]}' not found")
+          ui.error("Zone '#{config[:zone] || Chef::Config[:knife][:google_compute_zone]}' not found")
+          exit 1
+        rescue Google::Compute::ParameterValidation
+          ui.error("Must specify zone in knife config file or in command line as an option. Try --help.")
           exit 1
         end
+
         begin
-          machine_type = client.machine_types.get(config[:machine_type]).self_link
+          machine_type = client.machine_types.get(:name=>config[:machine_type], :zone=>selflink2name(zone)).self_link
         rescue Google::Compute::ResourceNotFound
           ui.error("MachineType '#{config[:machine_type]}' not found")
           exit 1
         end
+
+        (checked_custom, checked_all) = false
         begin
-          image = client.images.get(:project=>'google', :name=>config[:image]).self_link
+          image_project = config[:image_project_id]
+          machine_type=~Regexp.new('/projects/(.*?)/')
+          project = $1
+          if image_project.empty?
+            unless checked_custom
+              checked_custom = true
+              ui.info("Looking for Image '#{config[:image]}' in Project '#{project}'")
+              image = client.images.get(:project=>project, :name=>config[:image]).self_link
+            else
+              case config[:image].downcase
+              when /debian/
+                project = 'debian-cloud'
+                ui.info("Looking for Image '#{config[:image]}' in Project '#{project}'")
+              when /centos/
+                project = 'centos-cloud'
+                ui.info("Looking for Image '#{config[:image]}' in Project '#{project}'")
+              end
+              checked_all = true
+              image = client.images.get(:project=>project, :name=>config[:image]).self_link
+            end
+          else
+            checked_all = true
+            project = image_project
+            image = client.images.get(:project=>project, :name=>config[:image]).self_link
+          end
+          ui.info("Found Image '#{config[:image]}' in Project '#{project}'")
         rescue Google::Compute::ResourceNotFound
-          ui.error("Image '#{config[:image]}' not found")
-          exit 1
+          unless checked_all then
+            retry
+          else
+            ui.error("Image '#{config[:image]}' not found")
+            exit 1
+          end
         end
+
         begin
           network = client.networks.get(config[:network]).self_link
         rescue Google::Compute::ResourceNotFound

data/lib/chef/knife/google_server_delete.rb

@@ -21,6 +21,7 @@ class Chef
       include Knife::GoogleBase
 
       deps do
+        require 'chef/api_client'
         require 'google/compute'
       end
 
@@ -31,8 +32,7 @@ class Chef
       option :zone,
         :short => "-Z ZONE",
         :long => "--google-compute-zone ZONE",
-        :description => "The Zone for this server",
-        :required => true
+        :description => "The Zone for this server"
 
       option :purge,
         :short => "-P",
@@ -60,9 +60,12 @@ class Chef
 
       def run
         begin
-          zone = client.zones.get(config[:zone]).self_link
+          zone = client.zones.get(config[:zone] || Chef::Config[:knife][:google_compute_zone]).self_link
         rescue Google::Compute::ResourceNotFound
-          ui.error("Zone '#{config[:zone]}' not found")
+          ui.error("Zone '#{config[:zone] || Chef::Config[:knife][:google_compute_zone]}' not found")
+          exit 1
+        rescue Google::Compute::ParameterValidation
+          ui.error("Must specify zone in knife config file or in command line as an option. Try --help.")
           exit 1
         end
 
@@ -87,9 +90,8 @@ class Chef
             ui.warn("Deleted server '#{selflink2name(zone)}:#{instance.name}'")
 
             if config[:purge]
-              thing_to_delete = config[:chef_node_name] || instance.name
-              destroy_item(Chef::Node, thing_to_delete, "node")
-              destroy_item(Chef::ApiClient, thing_to_delete, "client")
+              destroy_item(Chef::Node, instance.name, "node")
+              destroy_item(Chef::ApiClient, instance.name, "client")
             else
               ui.warn("Corresponding node and client for the #{instance.name} server  were not deleted and remain registered with the Chef Server")
             end

data/lib/chef/knife/google_server_list.rb

@@ -25,28 +25,23 @@ class Chef
       option :zone,
         :short => "-Z ZONE",
         :long => "--google-compute-zone ZONE",
-        :description => "The Zone for this server",
-        :required => true
+        :description => "The Zone for this server"
 
       def run
         $stdout.sync = true
-
+        
         begin
-          zone = client.zones.get(config[:zone])
+          zone = client.zones.get(config[:zone] || Chef::Config[:knife][:google_compute_zone])
         rescue Google::Compute::ResourceNotFound
-          ui.error("Zone '#{config[:zone]}' not found")
+          ui.error("Zone '#{config[:zone] || Chef::Config[:knife][:google_compute_zone] }' not found.")
+          exit 1
+        rescue Google::Compute::ParameterValidation
+          ui.error("Must specify zone in knife config file or in command line as an option. Try --help.")
           exit 1
         end
 
-        instance_list = [
-          ui.color("Name", :bold),
-          ui.color('Type', :bold),
-          ui.color('Image', :bold),
-          ui.color('Public IP', :bold),
-          ui.color('Private IP', :bold),
-          ui.color('Disks', :bold),
-          ui.color("Zone", :bold),
-          ui.color('Status', :bold)].flatten.compact
+        instance_label = ['Name', 'Type', 'Image', 'Public IP', 'Private IP', 'Disks', 'Zone', 'Status']
+        instance_list = (instance_label.map {|label| ui.color(label, :bold)}).flatten.compact
 
         output_column_count = instance_list.length
 
@@ -70,7 +65,12 @@ class Chef
             end
           end
         end
-        puts ui.list(instance_list, :uneven_columns_across, output_column_count)
+
+        if instance_list.count > 8  # This condition checks if there are any servers available. The first 8 values are the Labels. 
+           puts ui.list(instance_list, :uneven_columns_across, output_column_count)
+        else
+           puts "No servers found in #{zone.name} zone."
+        end
       end
     end
   end

data/lib/google/compute/client.rb

@@ -76,24 +76,32 @@ module Google
         $stdout.print "\n\nAuthorization code: "
         authorization_code = $stdin.gets.chomp
         api_client.authorization.code = authorization_code
-        api_client.authorization.fetch_access_token!
-        access_token = api_client.authorization.access_token
-        refresh_token = api_client.authorization.refresh_token
-        id_token = api_client.authorization.id_token
-        expires_in = api_client.authorization.expires_in
-        issued_at = api_client.authorization.issued_at.to_s
-        if !@credential_file
-            filepath = File.expand_path(DEFAULT_FILE)
+        
+        begin
+          api_client.authorization.fetch_access_token!
+        rescue Faraday::Error::ConnectionFailed => e
+          raise ConnectionFail,
+            "The SSL certificates validation may not configured for this system. Please refer README to configured SSL certificates validation"\
+              if e.message.include? "SSL_connect returned=1 errno=0 state=SSLv3 read server certificate B: certificate verify failed"
         else
-            filepath = File.expand_path(@credential_file)
-        end
-        File.open(filepath,'w+') do |f|
-          f.write(MultiJson.dump({"authorization_uri" => authorization_uri,
-            "token_credential_uri"=>"https://accounts.google.com/o/oauth2/token",
-            "scope"=>scope,"redirect_uri"=>redirect_uri, "client_id"=>client_id,
-            "client_secret"=>client_secret, "access_token"=>access_token,
-            "expires_in"=>expires_in,"refresh_token"=> refresh_token, "id_token"=>id_token,
-            "issued_at"=>issued_at,"project"=>project }, :pretty=>true))
+          access_token = api_client.authorization.access_token
+          refresh_token = api_client.authorization.refresh_token
+          id_token = api_client.authorization.id_token
+          expires_in = api_client.authorization.expires_in
+          issued_at = api_client.authorization.issued_at.to_s
+          if !@credential_file
+              filepath = File.expand_path(DEFAULT_FILE)
+          else
+              filepath = File.expand_path(@credential_file)
+          end
+          File.open(filepath,'w+') do |f|
+            f.write(MultiJson.dump({"authorization_uri" => authorization_uri,
+              "token_credential_uri"=>"https://accounts.google.com/o/oauth2/token",
+              "scope"=>scope,"redirect_uri"=>redirect_uri, "client_id"=>client_id,
+              "client_secret"=>client_secret, "access_token"=>access_token,
+              "expires_in"=>expires_in,"refresh_token"=> refresh_token, "id_token"=>id_token,
+              "issued_at"=>issued_at,"project"=>project }, :pretty=>true))
+          end
         end
       end
 
@@ -154,7 +162,7 @@ module Google
         end
 
         def compute
-          @compute ||= @api_client.discovered_api('compute','v1beta14')
+          @compute ||= @api_client.discovered_api('compute','v1beta15')
         end
         
         def dispatch(opts)

data/lib/google/compute/creatable_resource_collection.rb

@@ -33,6 +33,12 @@ module Google
       def insert(options={})
         create(options)
       end
+
+      def create_snapshot(options={})
+        data = @dispatcher.dispatch(:api_method => api_resource.create_snapshot, :parameters=>options)
+        ZoneOperation.new(data.merge!(:dispatcher=>@dispatcher)) unless data.nil?
+      end
+
     end
   end
 end

data/lib/google/compute/exception.rb

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'faraday'
 module Google
   module Compute
     class ParameterValidation < ArgumentError; end
@@ -23,6 +24,7 @@ module Google
     class OperationTimeout < RuntimeError; end
     class HashConvert < RuntimeError; end
     class ResourceNotFound < RuntimeError; end
+    class ConnectionFail < Faraday::Error::ConnectionFailed; end
   end
 end
 

data/lib/knife-google/version.rb

@@ -14,6 +14,6 @@
 #
 module Knife
   module Google
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/spec/chef/knife/google_base_spec.rb

@@ -26,7 +26,7 @@ describe Chef::Knife::GoogleBase do
 
   it "#selflink2name should return name from a seleflink url" do
     knife_plugin.selflink2name(
-      'https://www.googleapis.com/compute/v1beta14/projects/mock-project/category/resource').
+      'https://www.googleapis.com/compute/v1beta15/projects/mock-project/category/resource').
       should eq('resource')
   end
 

data/spec/chef/knife/google_server_create_spec.rb

@@ -16,24 +16,19 @@ require 'spec_helper'
 
 describe Chef::Knife::GoogleServerCreate do
 
-  let(:knife_plugin) do
-    Chef::Knife::GoogleServerCreate.new(["-m"+stored_machine_type.name,
-      "-I"+stored_image.name, "-n"+stored_network.name,
-      "-Z"+stored_zone.name, stored_instance.name])
-  end
-
-  it "#run should invoke compute api to create an server" do
+  before(:each) do
     zones = mock(Google::Compute::ListableResourceCollection)
     zones.should_receive(:get).with(stored_zone.name).
       and_return(stored_zone)
 
     machine_types = mock(Google::Compute::ListableResourceCollection)
-    machine_types.should_receive(:get).with(stored_machine_type.name).
+    machine_types.should_receive(:get).
+      with({:name=>stored_machine_type.name, :zone=>stored_zone.name}).
       and_return(stored_machine_type)
 
     images = mock(Google::Compute::ListableResourceCollection)
     images.should_receive(:get).
-      with({:project=>"google", :name=>stored_image.name}).
+      with({:project=>"debian-cloud", :name=>stored_image.name}).
       and_return(stored_image)
 
     networks = mock(Google::Compute::ListableResourceCollection)
@@ -59,7 +54,13 @@ describe Chef::Knife::GoogleServerCreate do
       :images=>images, :zones=>zones,:machine_types=>machine_types,
       :networks=>networks)
     Google::Compute::Client.stub!(:from_json).and_return(client)
+  end
 
+  it "#run should invoke compute api to create an server" do
+    knife_plugin = Chef::Knife::GoogleServerCreate.new(["-m"+stored_machine_type.name,
+      "-I"+stored_image.name, "-J"+"debian-cloud",
+      "-n"+stored_network.name,
+      "-Z"+stored_zone.name, stored_instance.name])
     knife_plugin.config[:disks]=[]
     knife_plugin.config[:metadata]=[]
     knife_plugin.config[:public_ip]='EPHEMERAL'
@@ -73,12 +74,31 @@ describe Chef::Knife::GoogleServerCreate do
     knife_plugin.run
   end
 
-  describe "without appropriate command line options" do
-    it "should throw exception when required params are not passed" do
-      $stdout.stub!(:write) # lets not print those error messages
-      expect {
-        Chef::Knife::GoogleServerCreate.new([ "NAME"])
-      }.to raise_error(SystemExit)
-    end
+  it "should read zone value from knife config file." do
+    Chef::Config[:knife][:google_compute_zone] = stored_zone.name
+    knife_plugin = Chef::Knife::GoogleServerCreate.new(["-m"+stored_machine_type.name,
+      "-I"+stored_image.name, "-J"+"debian-cloud",
+      "-n"+stored_network.name,
+       stored_instance.name])
+    knife_plugin.config[:disks]=[]
+    knife_plugin.config[:metadata]=[]
+    knife_plugin.config[:public_ip]='EPHEMERAL'
+    knife_plugin.ui.stub!(:info)
+
+    knife_plugin.stub!(:wait_for_sshd)
+    knife_plugin.should_receive(:bootstrap_for_node).
+      with(stored_instance,'10.100.0.10').
+      and_return(mock("Chef::Knife::Bootstrap",:run=>true))
+    knife_plugin.run
+  end
+
+end
+
+describe "without appropriate command line options" do
+  it "should throw exception when required params are not passed" do
+    $stdout.stub!(:write) # lets not print those error messages
+    expect {
+      Chef::Knife::GoogleServerCreate.new([ "NAME"])
+    }.to raise_error(SystemExit)
   end
 end

data/spec/chef/knife/google_server_delete_spec.rb

@@ -103,3 +103,25 @@ describe Chef::Knife::GoogleServerDelete do
     end
   end
 end
+
+describe Chef::Knife::GoogleServerDelete do
+  it "should read zone value from knife config file." do
+    Chef::Config[:knife][:google_compute_zone] = stored_zone.name
+    knife_plugin = Chef::Knife::GoogleServerDelete.new([stored_instance.name])
+    zones = mock(Google::Compute::ListableResourceCollection)
+    zones.should_receive(:get).with(stored_zone.name).and_return(stored_zone)
+
+    instances = mock(Google::Compute::DeletableResourceCollection)
+    instances.should_receive(:get).with(:name=>stored_instance.name, :zone=>stored_zone.name).
+        and_return(stored_instance)
+    instances.should_receive(:delete).with(:instance=>stored_instance.name, :zone=>stored_zone.name)
+
+    client = mock(Google::Compute::Client, :zones=>zones, :instances=>instances)
+    Google::Compute::Client.stub!(:from_json).and_return(client)
+    knife_plugin.config[:yes] = true
+    knife_plugin.ui.should_receive(:warn).twice
+    knife_plugin.stub!(:msg_pair)
+    knife_plugin.run
+    
+  end
+end