lib/chef/knife/google_disk_create.rb in knife-google-1.3.1 vs lib/chef/knife/google_disk_create.rb in knife-google-2.0.0

@@ -1,7 +1,11 @@
-# Copyright 2013 Google Inc. All Rights Reserved.
 #
+# Author:: Paul Rossman (<[e-mail]>)
+# Author:: Chef Partner Engineering (<[e-mail]>)
+# Copyright:: Copyright 2015-2016 Google Inc., Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
 # 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
@@ -9,60 +13,52 @@
 # 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.
-#
-require 'chef/knife/google_base'
 
-class Chef
-  class Knife
-    class GoogleDiskCreate < Knife
+require "chef/knife"
+require "chef/knife/cloud/command"
+require "chef/knife/cloud/google_service"
+require "chef/knife/cloud/google_service_helpers"
+require "chef/knife/cloud/google_service_options"
 
-      include Knife::GoogleBase
+class Chef::Knife::Cloud
+  class GoogleDiskCreate < Command
+    include GoogleServiceHelpers
+    include GoogleServiceOptions
 
-      banner "knife google disk create NAME --gce-disk-size N -Z ZONE (options)"
+    banner "knife google disk create NAME --gce-disk-size N (options)"
 
-      deps do
-        require 'google/compute'
-      end
+    option :disk_size,
+      long:        "--gce-disk-size SIZE",
+      description: "Size of the persistent disk between 10 and 10000 GB, specified in GB; default is '10' GB",
+      default:     10,
+      proc:        proc { |size| size.to_i }
 
-      option :zone,
-        :short => "-Z ZONE",
-        :long => "--gce-zone ZONE",
-        :description => "The Zone for this disk",
-        :required => true
+    option :disk_type,
+      long:        "--gce-disk-type TYPE",
+      description: "Disk type to use to create the disk. Possible values are 'pd-standard', 'pd-ssd' and 'local-ssd'; default is 'pd-standard'",
+      default:     "pd-standard"
 
-      option :disk_size,
-        :long => "--gce-disk-size SIZE",
-        :description => "Size of the persistent disk between 1 and 10000 GB, specified in GB; default is '1' GB",
-        :default => "1"
+    option :disk_source,
+      long:        "--gce-disk-source_image IMAGE_URL",
+      description: "GCE disk source image to use when creating disk, such as projects/centos-cloud/global/images/centos-7-v20160216; optional, if not supplied, a blank disk will be created",
+      default:     nil
 
-      def run
-        $stdout.sync = true
-        unless @name_args.size > 0
-          ui.error("Please provide the name of the new disk")
-          exit 1
-        end
+    def validate_params!
+      check_for_missing_config_values!(:disk_size, :disk_type)
+      raise "Please specify a disk name." unless @name_args.first
+      raise "Disk size must be between 10 and 10,000" unless valid_disk_size?(locate_config_value(:disk_size))
+      super
+    end
 
-        begin
-          zone = client.zones.get(config[:zone])
-        rescue Google::Compute::ResourceNotFound
-          ui.error("Zone '#{config[:zone]}' not found")
-          exit 1
-        end
+    def execute_command
+      name = @name_args.first
+      size = locate_config_value(:disk_size)
+      type = locate_config_value(:disk_type)
+      src  = locate_config_value(:disk_source)
 
-        begin
-          disk_size = config[:disk_size].to_i
-          raise if !disk_size.between?(1, 10000)
-        rescue
-          ui.error("Size of the persistent disk must be between 1 and 10000 GB.")
-          exit 1
-        end
-
-        zone_operation = client.disks.create(:name => @name_args.first,
-                                             :sizeGb => config[:disk_size],
-                                             :zone => zone.name)
-      end
+      service.create_disk(name, size, type, src)
     end
   end
 end