knife-digital_ocean 0.7.0 → 2.0.0

data/lib/chef/knife/digital_ocean_droplet_create.rb

@@ -1,9 +1,9 @@
 # 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.
@@ -30,120 +30,120 @@ class Chef
       banner 'knife digital_ocean droplet create (options)'
 
       option :server_name,
-        :short       => '-N NAME',
-        :long        => '--server-name NAME',
-        :description => 'The server name',
-        :proc        => Proc.new { |server_name| Chef::Config[:knife][:server_name] = server_name }
+             short: '-N NAME',
+             long: '--server-name NAME',
+             description: 'The server name',
+             proc: proc { |server_name| Chef::Config[:knife][:server_name] = server_name }
 
       option :image,
-        :short       => '-I IMAGE',
-        :long        => '--image IMAGE',
-        :description => 'Your DigitalOcean Image',
-        :proc        => Proc.new { |image| Chef::Config[:knife][:image] = image }
+             short: '-I IMAGE',
+             long: '--image IMAGE',
+             description: 'Your DigitalOcean Image',
+             proc: proc { |image| Chef::Config[:knife][:image] = image }
 
       option :size,
-        :short       => '-S SIZE',
-        :long        => '--size SIZE',
-        :description => 'Your DigitalOcean Size',
-        :proc        => Proc.new { |size| Chef::Config[:knife][:size] = size }
+             short: '-S SIZE',
+             long: '--size SIZE',
+             description: 'Your DigitalOcean Size',
+             proc: proc { |size| Chef::Config[:knife][:size] = size }
 
       option :location,
-        :short       => '-L REGION',
-        :long        => '--location REGION',
-        :description => 'DigitalOcean Location (Region)',
-        :proc        => Proc.new { |location| Chef::Config[:knife][:location] = location }
+             short: '-L REGION',
+             long: '--location REGION',
+             description: 'DigitalOcean Location (Region)',
+             proc: proc { |location| Chef::Config[:knife][:location] = location }
 
       option :ssh_key_ids,
-        :short       => '-K KEYID',
-        :long        => '--ssh-keys KEY_ID',
-        :description => 'Comma spearated list of your SSH key ids',
-        :proc        => lambda { |o| o.split(/[\s,]+/) }
+             short: '-K KEYID',
+             long: '--ssh-keys KEY_ID',
+             description: 'Comma spearated list of your SSH key ids',
+             proc: lambda { |o| o.split(/[\s,]+/) }
 
       option :identity_file,
-        :short       => '-i IDENTITY_FILE',
-        :long        => '--identity-file IDENTITY_FILE',
-        :description => 'The SSH identity file used for authentication',
-        :proc        => Proc.new { |identity| Chef::Config[:knife][:identity_file] = identity }
+             short: '-i IDENTITY_FILE',
+             long: '--identity-file IDENTITY_FILE',
+             description: 'The SSH identity file used for authentication',
+             proc: proc { |identity| Chef::Config[:knife][:identity_file] = identity }
 
       option :bootstrap,
-        :short       => '-B',
-        :long        => '--bootstrap',
-        :description => 'Do a chef-client bootstrap on the created droplet (for use with chef-server)'
+             short: '-B',
+             long: '--bootstrap',
+             description: 'Do a chef-client bootstrap on the created droplet (for use with chef-server)'
 
       option :solo,
-        :long        => '--[no-]solo',
-        :description => 'Do a chef-solo bootstrap on the droplet using knife-solo',
-        :proc        => Proc.new { |s| Chef::Config[:knife][:solo] = s }
+             long: '--[no-]solo',
+             description: 'Do a chef-solo bootstrap on the droplet using knife-solo',
+             proc: proc { |s| Chef::Config[:knife][:solo] = s }
 
       option :ssh_user,
-        :short       => '-x USERNAME',
-        :long        => '--ssh-user USERNAME',
-        :description => 'The ssh username; default is "root"',
-        :default     => 'root'
+             short: '-x USERNAME',
+             long: '--ssh-user USERNAME',
+             description: 'The ssh username; default is "root"',
+             default: 'root'
 
       option :distro,
-        :short       => '-d DISTRO',
-        :long        => '--distro DISTRO',
-        :description => 'Chef-Bootstrap a distro using a template; default is "chef-full"',
-        :proc        => Proc.new { |d| Chef::Config[:knife][:distro] = d },
-        :default     => 'chef-full'
+             short: '-d DISTRO',
+             long: '--distro DISTRO',
+             description: 'Chef-Bootstrap a distro using a template; default is "chef-full"',
+             proc: proc { |d| Chef::Config[:knife][:distro] = d },
+             default: 'chef-full'
 
       option :run_list,
-        :short       => '-r RUN_LIST',
-        :long        => '--run-list RUN_LIST',
-        :description => 'Comma separated list of roles/recipes to apply',
-        :proc        => lambda { |o| o.split(/[\s,]+/) },
-        :default     => []
+             short: '-r RUN_LIST',
+             long: '--run-list RUN_LIST',
+             description: 'Comma separated list of roles/recipes to apply',
+             proc: lambda { |o| o.split(/[\s,]+/) },
+             default: []
 
       option :template_file,
-        :long        => "--template-file TEMPLATE",
-        :description => "Full path to location of template to use",
-        :proc        => Proc.new { |t| Chef::Config[:knife][:template_file] = t },
-        :default     => false
+             long: '--template-file TEMPLATE',
+             description: 'Full path to location of template to use',
+             proc: proc { |t| Chef::Config[:knife][:template_file] = t },
+             default: false
 
       option :host_key_verify,
-        :long        => "--[no-]host-key-verify",
-        :description => "Verify host key, enabled by default",
-        :default     => true
+             long: '--[no-]host-key-verify',
+             description: 'Verify host key, enabled by default',
+             default: true
 
       option :prerelease,
-        :long        => "--prerelease",
-        :description => "Install the pre-release chef gems"
+             long: '--prerelease',
+             description: 'Install the pre-release chef gems'
 
       option :bootstrap_version,
-        :long        => "--bootstrap-version VERSION",
-        :description => "The version of Chef to install",
-        :proc        => Proc.new { |v| Chef::Config[:knife][:bootstrap_version] = v }
+             long: '--bootstrap-version VERSION',
+             description: 'The version of Chef to install',
+             proc: proc { |v| Chef::Config[:knife][:bootstrap_version] = v }
 
       option :environment,
-        :short       => "-E ENVIRONMENT",
-        :long        => "--environment ENVIRONMENT",
-        :description => "The name of the chef environment to use",
-        :proc        => Proc.new { |e| Chef::Config[:knife][:environment] = e },
-        :default     => '_default'
+             short: '-E ENVIRONMENT',
+             long: '--environment ENVIRONMENT',
+             description: 'The name of the chef environment to use',
+             proc: proc { |e| Chef::Config[:knife][:environment] = e },
+             default: '_default'
 
       option :json_attributes,
-        :short       => '-j JSON',
-        :long        => '--json-attributes JSON',
-        :description => 'A JSON string to be added to the first run of chef-client',
-        :proc        => lambda { |o| JSON.parse(o) }
+             short: '-j JSON',
+             long: '--json-attributes JSON',
+             description: 'A JSON string to be added to the first run of chef-client',
+             proc: lambda { |o| JSON.parse(o) }
 
       option :private_networking,
-        :long        => "--private_networking",
-        :description => "Enables private networking if the selected region supports it",
-        :default     => false
+             long: '--private_networking',
+             description: 'Enables private networking if the selected region supports it',
+             default: false
 
       option :secret_file,
-        :long => "--secret-file SECRET_FILE",
-        :description => "A file containing the secret key to use to encrypt data bag item values",
-        :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
+             long: '--secret-file SECRET_FILE',
+             description: 'A file containing the secret key to use to encrypt data bag item values',
+             proc: proc { |sf| Chef::Config[:knife][:secret_file] = sf }
 
       option :ssh_port,
-        :short => "-p PORT",
-        :long => "--ssh-port PORT",
-        :description => "The ssh port",
-        :default => "22",
-        :proc => Proc.new { |port| Chef::Config[:knife][:ssh_port] = port }
+             short: '-p PORT',
+             long: '--ssh-port PORT',
+             description: 'The ssh port',
+             default: '22',
+             proc: proc { |port| Chef::Config[:knife][:ssh_port] = port }
 
       def run
         $stdout.sync = true
@@ -180,40 +180,42 @@ class Chef
             'Knife plugin knife-solo was not found.',
             'Please add the knife-solo gem to your Gemfile or',
             'install it manually with `gem install knife-solo`.'
-          ].join(" ")
+          ].join(' ')
           exit 1
         end
 
-        response = client.droplets.create(:name               => locate_config_value(:server_name),
-                                          :size_id            => locate_config_value(:size),
-                                          :image_id           => locate_config_value(:image),
-                                          :region_id          => locate_config_value(:location),
-                                          :ssh_key_ids        => locate_config_value(:ssh_key_ids).join(','),
-                                          :private_networking => locate_config_value(:private_networking))
+        droplet = DropletKit::Droplet.new(name: locate_config_value(:server_name),
+                                          size: locate_config_value(:size),
+                                          image: locate_config_value(:image),
+                                          region: locate_config_value(:location),
+                                          ssh_keys: locate_config_value(:ssh_key_ids).split(/, ?/),
+                                          private_networking: locate_config_value(:private_networking))
 
-        if response.status != 'OK'
-          ui.error("Droplet could not be started #{response.inspect}")
-          exit 1
-        end
+        server = client.droplets.create(droplet)
 
-        puts "Droplet creation for #{locate_config_value(:server_name)} started. Droplet-ID is #{response.droplet.id}"
+        # if client.droplets.find(id: server.id).status != 'in-progress'
+        #   ui.error("Droplet could not be started #{server.inspect}")
+        #   exit 1
+        # end
 
-        unless !config.has_key?(:json_attributes) || config[:json_attributes].empty?
+        puts "Droplet creation for #{locate_config_value(:server_name)} started. Droplet-ID is #{server.id}"
+
+        unless !config.key?(:json_attributes) || config[:json_attributes].empty?
           puts ui.color("JSON Attributes: #{config[:json_attributes]}", :magenta)
         end
 
-        print ui.color("Waiting for IPv4-Address", :magenta)
-        print(".") until ip_address = ip_address_available(response.droplet.id) {
+        print ui.color('Waiting for IPv4-Address', :magenta)
+        print('.') until ip_address = ip_address_available(server.id) do
           puts 'done'
-        }
+        end
 
         puts ui.color("IPv4 address is: #{ip_address}", :green)
 
         print ui.color('Waiting for sshd:', :magenta)
-        print('.') until tcp_test_ssh(ip_address) {
+        print('.') until tcp_test_ssh(ip_address) do
           sleep 2
           puts 'done'
-        }
+        end
 
         if locate_config_value(:bootstrap) || solo_bootstrap?
           bootstrap_for_node(ip_address).run
@@ -221,14 +223,13 @@ class Chef
           puts ip_address
           exit 0
         end
-
       end
 
       def ip_address_available(droplet_id)
-        response = client.droplets.show(droplet_id)
-        if response.droplet.ip_address
+        server = client.droplets.find(id: droplet_id)
+        if server.public_ip
           yield
-          response.droplet.ip_address
+          server.public_ip
         else
           sleep @initial_sleep_delay ||= 10
           false
@@ -262,7 +263,7 @@ class Chef
 
       def bootstrap_for_node(ip_address)
         bootstrap = bootstrap_class.new
-        bootstrap.name_args = [ ip_address ]
+        bootstrap.name_args = [ip_address]
         bootstrap.config.merge! config
         bootstrap.config[:chef_node_name] = locate_config_value(:server_name)
         bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)

data/lib/chef/knife/digital_ocean_droplet_destroy.rb

@@ -1,9 +1,9 @@
 # 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.
@@ -20,9 +20,9 @@ class Chef
       banner 'knife digital_ocean droplet destroy (options)'
 
       option :server,
-        :short       => '-S ID',
-        :long        => '--server ID',
-        :description => 'The server id'
+             short: '-S ID',
+             long: '--server ID',
+             description: 'The server id'
 
       def run
         $stdout.sync = true
@@ -30,14 +30,13 @@ class Chef
         validate!
 
         unless locate_config_value(:server)
-          ui.error("Server cannot be empty. ALL DATA WILL BE LOST! => -S <server-id>")
+          ui.error('Server cannot be empty. ALL DATA WILL BE LOST! => -S <server-id>')
           exit 1
         end
 
-        result = client.droplets.delete locate_config_value(:server)
-        puts result.status
+        result = client.droplets.delete(id: locate_config_value(:server))
+        puts JSON.parse(result)['message'] rescue 'OK'
       end
-
     end
   end
 end

data/lib/chef/knife/digital_ocean_droplet_list.rb

@@ -1,9 +1,9 @@
 # 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.
@@ -25,46 +25,28 @@ class Chef
         validate!
 
         droplet_list = [
-            h.color('ID',     :bold),
-            h.color('Name',   :bold),
-            h.color('Size',   :bold),
-            h.color('Region', :bold),
-            h.color('IPv4',   :bold),
-            h.color('Image',  :bold),
-            h.color('Status', :bold)
+          ui.color('ID',     :bold),
+          ui.color('Name',   :bold),
+          ui.color('Size',   :bold),
+          ui.color('Region', :bold),
+          ui.color('IPv4',   :bold),
+          ui.color('Image',  :bold),
+          ui.color('Status', :bold)
         ]
+        droplets = client.droplets.all
 
-        regions = client.regions.list.regions.inject({}) do |h, region|
-          h[region.id] = region.name
-          h
-        end
-
-        sizes = client.sizes.list.sizes.inject({}) do |h, size|
-          h[size.id] = size.name
-          h
-        end
-
-        client.droplets.list.droplets.each do |droplet|
+        droplets.each do |droplet|
           droplet_list << droplet.id.to_s
           droplet_list << droplet.name.to_s
-          droplet_list << sizes[droplet.size_id]
-          droplet_list << regions[droplet.region_id]
-          droplet_list << droplet.ip_address.to_s
-
-          image_details = client.images.show(droplet.image_id)
-          if image_details.status != 'OK'
-            image_os_info = 'N/A'
-          else
-            image_os_info = image_details.image.name 
-          end
-            
-          droplet_list << droplet.image_id.to_s + ' (' + image_os_info +  ')'
+          droplet_list << droplet.size_slug.to_s
+          droplet_list << droplet.region.name.to_s
+          droplet_list << droplet.public_ip.to_s
+          droplet_list << droplet.image.name.to_s
           droplet_list << droplet.status.to_s
         end
 
-        puts h.list(droplet_list, :uneven_columns_across, 7)
+        puts ui.list(droplet_list, :uneven_columns_across, 7)
       end
-
     end
   end
 end

data/lib/chef/knife/digital_ocean_image_list.rb

@@ -1,9 +1,9 @@
 # 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.
@@ -19,10 +19,10 @@ class Chef
 
       banner 'knife digital_ocean image list (options)'
 
-      option :global_images,
-        :short       => '-G',
-        :long        => '--global',
-        :description => 'Show global images'
+      option :public_images,
+             short: '-P',
+             long: '--public',
+             description: 'Show public images'
 
       def run
         $stdout.sync = true
@@ -30,42 +30,29 @@ class Chef
         validate!
 
         image_list = [
-            h.color('ID',           :bold),
-            h.color('Distribution', :bold),
-            h.color('Name',         :bold),
-            h.color('Global',       :bold)
+          ui.color('ID',           :bold),
+          ui.color('Distribution', :bold),
+          ui.color('Name',         :bold),
+          ui.color('Slug',         :bold)
         ]
 
-        if config[:global_images]
-          filter = 'global'
-        else
-          filter = 'my_images'
-        end
-
-        images = client.images.list(:filter => filter).images
+        images = client.images.all
 
-        images.sort! do |a, b|
-          [ a.distribution, a.name ] <=> [ b.distribution, b.name ]
+        if config[:public_images]
+          found_images = images.find_all { |i| i.public == true }
+        else
+          found_images = images.find_all { |i| i.public == false }
         end
 
-        images.each do |image|
+        found_images.each do |image|
           image_list << image.id.to_s
           image_list << image.distribution.to_s
           image_list << image.name.to_s
-          image_list << truefalse(config[:global_images])
+          image_list << image.slug.to_s
         end
 
-        puts h.list(image_list, :uneven_columns_across, 4)
+        puts ui.list(image_list, :uneven_columns_across, 4)
       end
-
-      def truefalse(boolean)
-        if boolean
-          '+'
-        else
-          '-'
-        end
-      end
-
     end
   end
 end