knife-digital_ocean 2.2.0 → 2.3.0

data/lib/chef/knife/digital_ocean_droplet_resize.rb

@@ -0,0 +1,58 @@
+# 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.
+#
+require 'chef/knife/digital_ocean_base'
+
+class Chef
+  class Knife
+   class DigitalOceanDropletResize < Knife
+      include Knife::DigitalOceanBase
+
+      banner 'knife digital_ocean droplet resize (options)'
+
+      option :size,
+             short: '-s SIZE',
+             long: '--size SIZE',
+             description: 'Power Action On/Off'
+
+      option :id,
+             short: '-I ID',
+             long: '--droplet-id ID',
+             description: 'Droplet ID'
+
+      def run
+        $stdout.sync = true
+
+        validate!
+
+        unless locate_config_value(:size)
+          ui.error('Size cannot be empty. => -s <size>')
+          exit 1
+        end
+
+        unless locate_config_value(:id)
+          ui.error('ID cannot be empty. => -I <id>')
+          exit 1
+        end
+
+        result = client.droplet_actions.resize(droplet_id: locate_config_value(:id), size: locate_config_value(:size))
+
+        unless result.class == DropletKit::Action
+          ui.error JSON.parse(result)['message']
+          exit 1
+        end
+
+        wait_for_status(result)
+      end
+    end
+  end
+end

data/lib/chef/knife/digital_ocean_droplet_snapshot.rb

@@ -0,0 +1,58 @@
+# 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.
+#
+require 'chef/knife/digital_ocean_base'
+
+class Chef
+  class Knife
+   class DigitalOceanDropletSnapshot < Knife
+      include Knife::DigitalOceanBase
+
+      banner 'knife digital_ocean droplet snapshot (options)'
+
+      option :name,
+             short: '-N NAME',
+             long: '--snapshot-name NAME',
+             description: 'Name of snapshot'
+
+      option :id,
+             short: '-I ID',
+             long: '--droplet-id ID',
+             description: 'Droplet ID'
+
+      def run
+        $stdout.sync = true
+
+        validate!
+
+        unless locate_config_value(:name)
+          ui.error('Name cannot be empty. => -N <name>')
+          exit 1
+        end
+
+        unless locate_config_value(:id)
+          ui.error('ID cannot be empty. => -I <id>')
+          exit 1
+        end
+
+        result = client.droplet_actions.snapshot(droplet_id: locate_config_value(:id), name: locate_config_value(:name))
+
+        unless result.class == DropletKit::Action
+          ui.error JSON.parse(result)['message']
+          exit 1
+        end
+
+        wait_for_status(result, status: 'active')
+      end
+    end
+  end
+end

data/lib/chef/knife/digital_ocean_image_destroy.rb

@@ -0,0 +1,42 @@
+# 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.
+#
+require 'chef/knife/digital_ocean_base'
+
+class Chef
+  class Knife
+    class DigitalOceanImageDestroy < Knife
+      include Knife::DigitalOceanBase
+
+      banner 'knife digital_ocean image destroy (options)'
+
+      option :id,
+             short: '-I ID',
+             long: '--image-id ID',
+             description: 'The image ID'
+
+      def run
+        $stdout.sync = true
+
+        validate!
+
+        unless locate_config_value(:id)
+          ui.error('Image ID cannot be empty. => -I <image-id>')
+          exit 1
+        end
+
+        result = client.images.delete(id: locate_config_value(:id))
+        ui.info 'OK' if result == true or ui.error JSON.parse(result)['message']
+      end
+    end
+  end
+end

data/lib/chef/knife/digital_ocean_image_list.rb

@@ -44,7 +44,7 @@ class Chef
           found_images = images.find_all { |i| i.public == false }
         end
 
-        found_images.each do |image|
+        found_images.sort_by(&:slug).each do |image|
           image_list << image.id.to_s
           image_list << image.distribution.to_s
           image_list << image.name.to_s

data/lib/chef/knife/digital_ocean_image_transfer.rb

@@ -0,0 +1,66 @@
+# 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.
+#
+require 'chef/knife/digital_ocean_base'
+
+class Chef
+  class Knife
+    class DigitalOceanImageTransfer < Knife
+      include Knife::DigitalOceanBase
+
+      banner 'knife digital_ocean image transfer (options)'
+
+      option :id,
+             short: '-I ID',
+             long: '--image-id ID',
+             description: 'The image ID'
+
+      option :region,
+             short: '-R REGION',
+             long: '--region REGION',
+             description: 'The region name'
+
+      def run
+        $stdout.sync = true
+
+        validate!
+
+        unless locate_config_value(:id)
+          ui.error('Image ID cannot be empty. => -I <image-id>')
+          exit 1
+        end
+
+        unless locate_config_value(:region)
+          ui.error('Image ID cannot be empty. => -R <region>')
+          exit 1
+        end
+
+        result = client.image_actions.transfer(image_id: locate_config_value(:id), region: locate_config_value(:region))
+
+        unless result.class == DropletKit::ImageAction
+          ui.error JSON.parse(result)['message']
+          exit 1
+        end
+
+        print 'Waiting '
+        while result.status == 'in-progress' do
+          sleep 8
+          print('.')
+
+          break if client.images.find(id: locate_config_value(:id)).
+            regions.include? locate_config_value(:region)
+        end
+        ui.info 'OK'
+      end
+    end
+  end
+end

data/lib/chef/knife/digital_ocean_region_list.rb

@@ -31,7 +31,7 @@ class Chef
 
         regions = client.regions.all
 
-        regions.each do |region|
+        regions.sort_by(&:name).each do |region|
           region_list << region.name
           region_list << region.slug
         end

data/lib/chef/knife/digital_ocean_sshkey_create.rb

@@ -20,15 +20,15 @@ class Chef
 
       banner 'knife digital_ocean sshkey create (options)'
 
-     option :name,
-        :short       => '-n NAME',
-        :long        => '--sshkey-name NAME',
-        :description => 'The ssh key name'
+      option :name,
+             short: '-n NAME',
+             long: '--sshkey-name NAME',
+             description: 'The ssh key name'
 
-     option :public_key,
-        :short       => '-i PUBLIC KEY',
-        :long        => '--public-key PUBLIC KEY',
-        :description => 'File that contains your public ssh key'
+      option :public_key,
+             short: '-i PUBLIC KEY',
+             long: '--public-key PUBLIC KEY',
+             description: 'File that contains your public ssh key'
 
       def run
         $stdout.sync = true
@@ -36,18 +36,18 @@ class Chef
         validate!
 
         unless locate_config_value(:name)
-          ui.error("SSH Key name cannot be empty. => -N <sshkey-name>")
+          ui.error('SSH Key name cannot be empty. => -N <sshkey-name>')
           exit 1
         end
 
         unless locate_config_value(:public_key)
-          ui.error("SSH key file needs to be specified. => -I <public_key>")
+          ui.error('SSH key file needs to be specified. => -I <public_key>')
           exit 1
         end
 
         ssh_key = DropletKit::SSHKey.new name: locate_config_value(:name), public_key: File.read(File.expand_path(locate_config_value(:public_key)))
         result = client.ssh_keys.create(ssh_key)
-        ui.error JSON.parse(result)['message'] rescue 'OK'
+        ui.info 'OK' if result.class == DropletKit::SSHKey or ui.error JSON.parse(result)['message']
       end
     end
   end

data/lib/chef/knife/digital_ocean_sshkey_destroy.rb

@@ -20,10 +20,10 @@ class Chef
 
       banner 'knife digital_ocean sshkey destroy (options)'
 
-     option :id,
-        :short       => '-i ID',
-        :long        => '--sshkey-id ID',
-        :description => 'The ssh key id'
+      option :id,
+             short: '-i ID',
+             long: '--sshkey-id ID',
+             description: 'The ssh key id'
 
       def run
         $stdout.sync = true
@@ -31,12 +31,12 @@ class Chef
         validate!
 
         unless locate_config_value(:id)
-          ui.error("SSH key id cannot be empty. => -i <id>")
+          ui.error('SSH key id cannot be empty. => -i <id>')
           exit 1
         end
 
         result = client.ssh_keys.delete id: locate_config_value(:id)
-        ui.error JSON.parse(result)['message'] rescue 'OK'
+        ui.info 'OK' if result == true or ui.error JSON.parse(result)['message']
       end
     end
   end

data/lib/chef/knife/digital_ocean_sshkey_list.rb

@@ -32,7 +32,7 @@ class Chef
 
         sshkeys = client.ssh_keys.all
 
-        sshkeys.each do |sshkey|
+        sshkeys.sort_by(&:name).each do |sshkey|
           sshkey_list << sshkey.id.to_s
           sshkey_list << sshkey.name.to_s
           sshkey_list << sshkey.fingerprint.to_s

data/lib/knife-digital_ocean/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module DigitalOcean
-    VERSION = '2.2.0'
+    VERSION = '2.3.0'
   end
 end

data/spec/fixtures/keys/id_rsa.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDb2qoPVE2V/w5QZPC6MdPnnJVg8o9w4DNk7hT2rGAM7cyIOL4tqmmcfABPGCEpxen048aXhabpq2BgQXWP9WJw8/FUiqjV1Aohqyev5nl0v00f9xlFRfCP/hatNsn8EvnUL32ijJI/vnKaVhXF6cPz9mYH8DumKE9SxAXC9m6ALu/JJHPUmRqONTUwIASkdxiuBJsjIKei4jU0H1nb8dc/ar1f5KXGgnMTikMnoDIuZosv8+I8r1R2gTIx1HmdJaK9IJx3KbaEHoCasTAK5W2PiP/vkGKQlAjolakE6CVapgDOvkKH7YfT0UBB9JGsGMhEzUphZ6kddSBYLscpKhAx gregf@betsy

data/spec/fixtures/vcr_cassettes/accountinfo.yml

@@ -25,16 +25,14 @@ http_interactions:
       Server:
       - cloudflare-nginx
       Date:
-      - Tue, 11 Nov 2014 03:48:34 GMT
+      - Sun, 16 Nov 2014 00:35:57 GMT
       Content-Type:
       - application/json; charset=utf-8
       Transfer-Encoding:
       - chunked
       Connection:
       - keep-alive
-      Set-Cookie:
-      - __cfduid=d4ff495c6a4297ba6a268c69722a7928c1415677714886; expires=Mon, 23-Dec-2019
-        23:50:00 GMT; path=/; domain=.digitalocean.com; HttpOnly
+      Set-Cookie: _COOKIE_ID_
       Status:
       - 200 OK
       X-Frame-Options:
@@ -48,18 +46,18 @@ http_interactions:
       Ratelimit-Remaining:
       - '1180'
       Ratelimit-Reset:
-      - '1415677540'
+      - '1416100824'
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 8e7ba67a-eeca-432d-9a5f-951d3956a67c
+      - 0b0ea2dd-4632-4a9e-a799-cf8f5369ee8a
       X-Runtime:
-      - '0.022150'
+      - '0.023825'
       Cf-Ray:
-      - 187783d60a990ecd-EWR
+      - 189f9c8d006b0ec7-EWR
     body:
       encoding: UTF-8
       string: '{"account":{"droplet_limit":20,"email":"greg@gregf.org","uuid":"49e2e737d3a7407a042bb7e88f4da8629166f2b9","email_verified":true}}'
     http_version: 
-  recorded_at: Tue, 11 Nov 2014 03:48:34 GMT
+  recorded_at: Sun, 16 Nov 2014 00:35:57 GMT
 recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/domain_create.yml

@@ -0,0 +1,65 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.digitalocean.com/v2/domains
+    body:
+      encoding: UTF-8
+      string: '{"name":"kitchen-digital.org","ip_address":"192.168.1.1"}'
+    headers:
+      Content-Type:
+      - application/json
+      Authorization:
+      - Bearer FAKE_ACCESS_TOKEN
+      User-Agent:
+      - Faraday v0.9.0
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Server:
+      - cloudflare-nginx
+      Date:
+      - Sun, 16 Nov 2014 03:56:18 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Set-Cookie: _COOKIE_ID_
+      Status:
+      - 201 Created
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Content-Type-Options:
+      - nosniff
+      Ratelimit-Limit:
+      - '1200'
+      Ratelimit-Remaining:
+      - '1169'
+      Ratelimit-Reset:
+      - '1416110320'
+      Etag:
+      - '"994a804e0eb309991d38d7a3985ec0d7"'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      X-Request-Id:
+      - f80d9dde-9125-40a8-ac81-663b08ad6acd
+      X-Runtime:
+      - '0.458649'
+      Cf-Ray:
+      - 18a0c204fc560ec7-EWR
+    body:
+      encoding: UTF-8
+      string: '{"domain":{"name":"kitchen-digital.org","ttl":1800,"zone_file":null}}'
+    http_version: 
+  recorded_at: Sun, 16 Nov 2014 03:56:18 GMT
+recorded_with: VCR 2.9.3