knife-google 1.1.0 → 1.2.0

data/lib/chef/knife/google_server_delete.rb

@@ -25,13 +25,13 @@ class Chef
         require 'google/compute'
       end
 
-      banner "knife google server delete SERVER [SERVER] --google-compute-zone ZONE (options)"
+      banner "knife google server delete SERVER [SERVER] -Z ZONE (options)"
 
       attr_reader :instances
 
       option :zone,
         :short => "-Z ZONE",
-        :long => "--google-compute-zone ZONE",
+        :long => "--gce-zone ZONE",
         :description => "The Zone for this server"
 
       option :purge,
@@ -39,12 +39,12 @@ class Chef
         :long => "--purge",
         :boolean => true,
         :default => false,
-        :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the GCE server itself.  Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
+        :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the GCE server itself. Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
 
       option :chef_node_name,
         :short => "-N NAME",
         :long => "--node-name NAME",
-        :description => "The name of the node and client to delete, if it differs from the server name.  Only has meaning when used with the '--purge' option."
+        :description => "The name of the node and client to delete, if it differs from the server name. Only has meaning when used with the '--purge' option."
 
       # Taken from knife-ec2 plugin, for rational , check the following link
       # https://github.com/opscode/knife-ec2/blob/master/lib/chef/knife/ec2_server_delete.rb#L48
@@ -60,9 +60,9 @@ class Chef
 
       def run
         begin
-          zone = client.zones.get(config[:zone] || Chef::Config[:knife][:google_compute_zone]).self_link
+          zone = client.zones.get(config[:zone] || Chef::Config[:knife][:gce_zone]).self_link
         rescue Google::Compute::ResourceNotFound
-          ui.error("Zone '#{config[:zone] || Chef::Config[:knife][:google_compute_zone]}' not found")
+          ui.error("Zone '#{config[:zone] || Chef::Config[:knife][:gce_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.")
@@ -75,25 +75,21 @@ class Chef
             instance = client.instances.get(:name=>instance_name, :zone=>selflink2name(zone))
             @instances << instance
             msg_pair("Name", instance.name)
-            msg_pair("MachineType", selflink2name(instance.machine_type))
-            msg_pair("Image", selflink2name(instance.image))
+            msg_pair("Machine Type", selflink2name(instance.machine_type))
             msg_pair("Zone", selflink2name(instance.zone))
             msg_pair("Tags", instance.tags.has_key?("items") ? instance.tags["items"].join(',') : "None")
             msg_pair("Public IP Address", public_ips(instance).join(','))
             msg_pair("Private IP Address", private_ips(instance).join(','))
-
             puts "\n"
+            ui.warn("Persistent disks attached to this instance are not deleted with this operation")
             ui.confirm("Do you really want to delete server '#{selflink2name(zone)}:#{instance.name}'")
-
             client.instances.delete(:instance=>instance.name, :zone=>selflink2name(zone))
-
             ui.warn("Deleted server '#{selflink2name(zone)}:#{instance.name}'")
-
             if config[:purge]
               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")
+              ui.warn("Corresponding node and client for the #{instance.name} server were not deleted and remain registered with the Chef Server")
             end
           rescue
             ui.error("Could not locate server '#{selflink2name(zone)}:#{instance_name}'.")

data/lib/chef/knife/google_server_list.rb

@@ -20,27 +20,27 @@ class Chef
 
       include Knife::GoogleBase
 
-      banner "knife google server list --google-compute-zone ZONE (options)"
+      banner "knife google server list -Z ZONE (options)"
 
       option :zone,
         :short => "-Z ZONE",
-        :long => "--google-compute-zone ZONE",
+        :long => "--gce-zone ZONE",
         :description => "The Zone for this server"
 
       def run
         $stdout.sync = true
         
         begin
-          zone = client.zones.get(config[:zone] || Chef::Config[:knife][:google_compute_zone])
+          zone = client.zones.get(config[:zone] || Chef::Config[:knife][:gce_zone])
         rescue Google::Compute::ResourceNotFound
-          ui.error("Zone '#{config[:zone] || Chef::Config[:knife][:google_compute_zone] }' not found.")
+          ui.error("Zone '#{config[:zone] || Chef::Config[:knife][:gce_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_label = ['Name', 'Type', 'Image', 'Public IP', 'Private IP', 'Disks', 'Zone', 'Status']
+        instance_label = ['name', 'type', '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
@@ -48,7 +48,6 @@ class Chef
         client.instances.list(:zone=>zone.name).each do |instance|
           instance_list << instance.name
           instance_list << selflink2name(instance.machine_type.to_s)
-          instance_list << selflink2name(instance.image.to_s)
           instance_list << public_ips(instance).join(',')
           instance_list << private_ips(instance).join(',')
           instance_list << disks(instance).join(',')

data/lib/chef/knife/google_zone_list.rb

@@ -27,11 +27,10 @@ class Chef
         $stdout.sync = true
 
         zone_list = [
-          ui.color("Name", :bold),
-          ui.color('Status', :bold),
-          ui.color('Servers', :bold),
-          ui.color('Disks', :bold),
-          ui.color('Maintainance Window',:bold)].flatten.compact
+          ui.color("name", :bold),
+          ui.color('status', :bold),
+          ui.color('deprecation', :bold),
+          ui.color('maintainance window', :bold)].flatten.compact
 
         output_column_count = zone_list.length
 
@@ -46,30 +45,25 @@ class Chef
               ui.color(status, :red)
             end
           end
-          instance_quota = "0"
-          zone.quotas.each do |quota|
-            if quota["metric"] == "INSTANCES"
-              instance_quota = "#{quota["usage"].to_i}"
-            end
-          end
-          zone_list << instance_quota
-          disk_quota = "0"
-          zone.quotas.each do |quota|
-            if quota["metric"] == "DISKS"
-              disk_quota = "#{quota["usage"].to_i}"
-            end
+          deprecation_state = "-"
+          if zone.deprecated.respond_to?('state')
+            deprecation_state = zone.deprecated.state  
+          end 
+          zone_list << deprecation_state
+          unless zone.maintenance_windows.nil?
+            maintenance_window = zone.maintenance_windows.map do |mw|
+              begin_time = Time.parse(mw["beginTime"])
+              end_time = Time.parse(mw["endTime"])
+              if (Time.now >= begin_time) and (Time.now <= end_time)
+                ui.color("#{begin_time} to #{end_time}",:red)
+              else
+                ui.color("#{begin_time} to #{end_time}",:green)
+              end
+            end.join(",")
+            zone_list << maintenance_window
+          else
+            zone_list << "-"
           end
-          zone_list << disk_quota
-          maintenance_window = zone.maintenance_windows.map do |mw|
-            begin_time = Time.parse(mw["beginTime"])
-            end_time = Time.parse(mw["endTime"])
-            if (Time.now >= begin_time) and (Time.now <= end_time)
-              ui.color("#{begin_time} to #{end_time}",:red)
-            else
-              ui.color("#{begin_time} to #{end_time}",:green)
-            end
-          end.join(",")
-          zone_list << maintenance_window
         end
         ui.info(ui.list(zone_list, :uneven_columns_across, output_column_count))
       end

data/lib/google/compute.rb

@@ -32,13 +32,14 @@ require 'google/compute/disk'
 require 'google/compute/firewall'
 require 'google/compute/image'
 require 'google/compute/server'
-require 'google/compute/kernel'
 require 'google/compute/machine_type'
 require 'google/compute/network'
 require 'google/compute/project'
 require 'google/compute/snapshot'
+require 'google/compute/region'
 require 'google/compute/zone'
 require 'google/compute/global_operation'
+require 'google/compute/region_operation'
 require 'google/compute/zone_operation'
 require 'google/compute/server/attached_disk'
 require 'google/compute/server/network_interface'

data/lib/google/compute/client.rb

@@ -17,6 +17,7 @@
 require 'google/api_client'
 require 'multi_json'
 require 'google/compute/resource_collection'
+require 'knife-google/version'
 
 module Google
   module Compute
@@ -27,7 +28,7 @@ module Google
       attr_reader :dispatcher
 
       def initialize(authorization, project, credential_file)
-        api_client = Google::APIClient.new(:application_name=>'google-compute-ruby-client')
+        api_client = Google::APIClient.new(:application_name => 'knife-google', :application_version => Knife::Google::VERSION)
         api_client.authorization = authorization
         api_client.auto_refresh_token = true
         @project = project
@@ -65,7 +66,7 @@ module Google
           "https://www.googleapis.com/auth/userinfo.email"]
         redirect_uri = 'urn:ietf:wg:oauth:2.0:oob'
 
-        api_client = Google::APIClient.new(:application_name=>'google-compute-ruby-client')
+        api_client = Google::APIClient.new(:application_name => 'knife-google', :application_version => Knife::Google::VERSION)
 
         api_client.authorization.scope = scope
         api_client.authorization.client_id = client_id
@@ -125,10 +126,6 @@ module Google
         CreatableResourceCollection.new(:resource_class => Google::Compute::Server, :dispatcher=>@dispatcher)
       end
 
-      def kernels
-        ListableResourceCollection.new(:resource_class => Google::Compute::Kernel,:dispatcher=>@dispatcher)
-      end
-
       def machine_types
         ListableResourceCollection.new(:resource_class => Google::Compute::MachineType,:dispatcher=>@dispatcher)
       end
@@ -141,10 +138,18 @@ module Google
         DeletableResourceCollection.new(:resource_class => Google::Compute::GlobalOperation, :dispatcher=>@dispatcher)
       end
 
+      def regionOperations
+        DeletableResourceCollection.new(:resource_class => Google::Compute::RegionOperation, :dispatcher=>@dispatcher)
+      end
+
       def zoneOperations
         DeletableResourceCollection.new(:resource_class => Google::Compute::ZoneOperation, :dispatcher=>@dispatcher)
       end
 
+      def regions
+        ListableResourceCollection.new(:resource_class => Google::Compute::Region, :dispatcher=>@dispatcher)
+      end
+
       def zones
         ListableResourceCollection.new(:resource_class => Google::Compute::Zone, :dispatcher=>@dispatcher)
       end
@@ -162,7 +167,7 @@ module Google
         end
 
         def compute
-          @compute ||= @api_client.discovered_api('compute','v1beta15')
+          @compute ||= @api_client.discovered_api('compute','v1')
         end
         
         def dispatch(opts)

data/lib/google/compute/creatable_resource_collection.rb

@@ -17,11 +17,22 @@ module Google
     class CreatableResourceCollection < DeletableResourceCollection
 
       def create(options={})
-        if ["Server", "Disk"].include? self.resource_class_name
+        if ["Server"].include? self.resource_class_name
           data = @dispatcher.dispatch(:api_method => api_resource.insert, 
                            :parameters=>{:project=>project, :zone=>options[:zone]},
                            :body_object => options )
           ZoneOperation.new(data.merge!(:dispatcher=>@dispatcher))
+        elsif ["Disk"].include? self.resource_class_name
+          if options[:sourceImage].nil?
+            data = @dispatcher.dispatch(:api_method => api_resource.insert,
+                           :parameters=>{:project=>project, :zone=>options[:zone]},
+                           :body_object => options)
+          else
+            data = @dispatcher.dispatch(:api_method => api_resource.insert,
+                           :parameters=>{:project=>project, :zone=>options[:zone], :sourceImage=>options[:sourceImage]},
+                           :body_object => options)
+          end
+          ZoneOperation.new(data.merge!(:dispatcher=>@dispatcher))
         else
           data = @dispatcher.dispatch(:api_method => api_resource.insert, 
                            :parameters=>{:project=>project},

data/lib/google/compute/disk.rb

@@ -23,7 +23,6 @@ module Google
 
       attr_reader :zone, :size_gb, :status, :options
       attr_reader :source_snapshot, :source_snapshot_id
-      attr_reader :source_image
 
       def from_hash(disk_data)
         super(disk_data)
@@ -33,7 +32,6 @@ module Google
         @options = disk_data["options"]
         @source_snapshot = disk_data["sourceSnapshot"]
         @source_snapshot_id = disk_data["sourceSnapshotId"] 
-        @source_image = disk_data["sourceImage"] 
       end
     end
   end

data/lib/google/compute/image.rb

@@ -16,12 +16,11 @@ module Google
   module Compute
     class Image < Resource
 
-      attr_reader :source_type, :preferred_kernel, :raw_disk, :deprecated
+      attr_reader :source_type, :raw_disk, :deprecated
 
       def from_hash(data)
         super(data)
         @source_type = data["sourceType"]
-        @preferred_kernel = data["preferredKernel"]
         @raw_disk = data["rawDisk"]
         @deprecated = data["deprecated"]
       end

data/lib/google/compute/project.rb

@@ -16,13 +16,12 @@ module Google
   module Compute
     class Project < Resource
 
-      attr_reader :common_instance_metadata, :quotas, :external_ip_addresses
+      attr_reader :common_instance_metadata, :quotas
 
       def from_hash(data)
         super(data)
         @common_instance_metadata = data["commonInstanceMetadata"]
         @quotas = data["quotas"]
-        @external_ip_addresses = data["externalIpAddresses"]
       end
 
       def set_common_instance_metadata(metadata)
@@ -71,6 +70,7 @@ module Google
         end
         set_common_instance_metadata(temp_metadata)
       end
+
     end
   end
 end

data/lib/google/compute/{kernel.rb → region.rb}

@@ -14,7 +14,18 @@
 
 module Google
   module Compute
-    class Kernel < Resource
+    class Region < Resource
+
+      attr_reader :status, :zones
+      attr_reader :quotas, :deprecated
+
+      def from_hash(region_data)
+        super(region_data)
+        @status = region_data["status"] 
+        @zones = region_data["zones"]
+        @quotas = region_data["quotas"]
+        @deprecated = region_data["deprecated"]
+      end
     end
   end
 end

data/lib/google/compute/region_operation.rb

@@ -0,0 +1,62 @@
+# Copyright 2013 Google Inc. All Rights Reserved.
+#
+# 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.
+
+# Google compute engine, operation resource reference
+
+require 'timeout'
+
+module Google
+  module Compute
+    class RegionOperation < Resource
+
+      attr_reader :zone, :client_operation_id, :operation_type
+      attr_reader :target_link, :target_id, :status
+      attr_reader :status_message, :user, :progress
+      attr_reader :insert_time, :start_time, :end_time
+      attr_reader :error, :warnings, :http_error_status_code
+      attr_reader :http_error_message, :region
+
+      def from_hash(data)
+        super(data)
+        @zone = data["zone"]
+        @client_operation_id =  data["clientOperationId"]
+        @operation_type = data["operationType"]
+        @target_link= data["targetLink"]
+        @target_id = data["targetId"]
+        @status =  data["status"]
+        @status_message = data["statusMessage"]
+        @user = data["user"]
+        @progress =  data["progress"]
+        @insert_time = Time.parse( data["insertTime"] )
+        @start_time = Time.parse( data["startTime"] )
+        @end_time = Time.parse( data["endTime"] ) if data.key?("endTime")
+        @error = data["error"]
+        @warnings = data["warnings"]
+        @http_error_status_code = data["httpErrorMessage"]
+        @http_error_message = data["httpErrorMessage"]
+        @region = data["region"]
+      end
+
+      def wait_for_completion!(options={})
+        timeout = options[:timeout] || 60
+        status = Timeout::timeout(timeout, OperationTimeout) do
+          until  progress==100
+            sleep 2
+            progress= get_self.progress
+          end  
+        end
+      end
+    end
+  end
+end

data/lib/google/compute/server.rb

@@ -20,13 +20,13 @@ module Google
   module Compute
     class Server < Resource
 
-      attr_reader  :tags, :image, :machine_type, :status, :status_message, :zone
+      attr_reader  :tags, :machine_type, :status, :status_message, :zone
       attr_reader  :network_interfaces, :disks, :metadata, :service_accounts
+      attr_reader  :scheduling
 
       def from_hash(data)
         super(data)
         @tags = data["tags"]
-        @image = data["image"]
         @machine_type = data["machineType"]
         @status = data["status"]
         @status_message = data["statusMessage"]
@@ -45,6 +45,7 @@ module Google
         end  
         @metadata = data["metadata"]
         @service_accounts = data["service_accounts"]
+        @scheduling = data["scheduling"]
       end
 
       def serial_port_output

data/lib/google/compute/server/attached_disk.rb

@@ -22,16 +22,16 @@ module Google
     class AttachedDisk
       include Utils
 
-      attr_reader :kind, :type, :mode, :source
-      attr_reader :device_name, :index, :boot
+      attr_reader :kind, :index, :type, :mode
+      attr_reader :source, :device_name, :boot
       
       def initialize(data)
         @kind = data["kind"]
+        @index = data["index"]
         @type = data["type"]
         @mode= data["mode"]
         @source = data["source"]
         @device_name = data["deviceName"] 
-        @index = data["index"]
         @boot = data["boot"]
       end
     end