knife-oneandone 1.0.0 → 1.2.0

data/lib/chef/knife/oneandone_server_start.rb

@@ -1,35 +1,35 @@
-require 'chef/knife/oneandone_base'
-
-class Chef
-  class Knife
-    class OneandoneServerStart < Knife
-      include Knife::OneandoneBase
-
-      banner 'knife oneandone server start SERVER_ID [SERVER_ID] (options)'
-
-      option :wait,
-             short: '-W',
-             long: '--wait',
-             description: 'Wait for the operation to complete.'
-
-      def run
-        $stdout.sync = true
-
-        init_client
-
-        name_args.each do |server_id|
-          server = OneAndOne::Server.new
-          response = server.change_status(server_id: server_id, action: 'POWER_ON')
-
-          if config[:wait]
-            puts ui.color('Starting, wait for the operation to complete...', :cyan).to_s
-            server.wait_for
-            puts "Server '#{server.specs['name']}' is #{ui.color('started', :bold)}"
-          else
-            puts "Server '#{response['name']}' is #{ui.color('starting', :bold)}"
-          end
-        end
-      end
-    end
-  end
-end
+require 'chef/knife/oneandone_base'
+
+class Chef
+  class Knife
+    class OneandoneServerStart < Knife
+      include Knife::OneandoneBase
+
+      banner 'knife oneandone server start SERVER_ID [SERVER_ID] (options)'
+
+      option :wait,
+             short: '-W',
+             long: '--wait',
+             description: 'Wait for the operation to complete.'
+
+      def run
+        $stdout.sync = true
+
+        init_client
+
+        name_args.each do |server_id|
+          server = OneAndOne::Server.new
+          response = server.change_status(server_id: server_id, action: 'POWER_ON')
+
+          if config[:wait]
+            puts ui.color('Starting, wait for the operation to complete...', :cyan).to_s
+            server.wait_for
+            puts "Server '#{server.specs['name']}' is #{ui.color('started', :bold)}"
+          else
+            puts "Server '#{response['name']}' is #{ui.color('starting', :bold)}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/oneandone_server_stop.rb

@@ -1,41 +1,41 @@
-require 'chef/knife/oneandone_base'
-
-class Chef
-  class Knife
-    class OneandoneServerStop < Knife
-      include Knife::OneandoneBase
-
-      banner 'knife oneandone server stop SERVER_ID [SERVER_ID] (options)'
-
-      option :force,
-             long: '--force',
-             description: 'Force hardware shutdown.'
-
-      option :wait,
-             short: '-W',
-             long: '--wait',
-             description: 'Wait for the operation to complete.'
-
-      def run
-        $stdout.sync = true
-
-        init_client
-
-        method = config[:force] ? 'HARDWARE' : 'SOFTWARE'
-
-        name_args.each do |server_id|
-          server = OneAndOne::Server.new
-          response = server.change_status(server_id: server_id, action: 'POWER_OFF', method: method)
-
-          if config[:wait]
-            puts ui.color('Stopping, wait for the operation to complete...', :cyan).to_s
-            server.wait_for
-            puts "Server '#{server.specs['name']}' is #{ui.color('stopped', :bold)}"
-          else
-            puts "Server '#{response['name']}' is #{ui.color('stopping', :bold)}"
-          end
-        end
-      end
-    end
-  end
-end
+require 'chef/knife/oneandone_base'
+
+class Chef
+  class Knife
+    class OneandoneServerStop < Knife
+      include Knife::OneandoneBase
+
+      banner 'knife oneandone server stop SERVER_ID [SERVER_ID] (options)'
+
+      option :force,
+             long: '--force',
+             description: 'Force hardware shutdown.'
+
+      option :wait,
+             short: '-W',
+             long: '--wait',
+             description: 'Wait for the operation to complete.'
+
+      def run
+        $stdout.sync = true
+
+        init_client
+
+        method = config[:force] ? 'HARDWARE' : 'SOFTWARE'
+
+        name_args.each do |server_id|
+          server = OneAndOne::Server.new
+          response = server.change_status(server_id: server_id, action: 'POWER_OFF', method: method)
+
+          if config[:wait]
+            puts ui.color('Stopping, wait for the operation to complete...', :cyan).to_s
+            server.wait_for
+            puts "Server '#{server.specs['name']}' is #{ui.color('stopped', :bold)}"
+          else
+            puts "Server '#{response['name']}' is #{ui.color('stopping', :bold)}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/oneandone_ssh_key_create.rb

@@ -0,0 +1,54 @@
+require 'chef/knife/oneandone_base'
+require '1and1/helpers'
+
+class Chef
+  class Knife
+    class OneandoneSshKeyCreate < Knife
+      include Knife::OneandoneBase
+      include Oneandone::Helpers
+
+      banner 'knife oneandone ssh key create (options)'
+
+      option :name,
+             short: '-n NAME',
+             long: '--name NAME',
+             description: 'SSH Key name (required)'
+
+      option :description,
+             long: '--description DESCRIPTION',
+             description: 'SSH Key description'
+
+      option :public_key,
+             short: '-p PUBLIC_KEY',
+             long: '--public-key PUBLIC_KEY',
+             description: 'Public key to import. If not given, new SSH key pair will be created'\
+                          ' and the private key is returned in the response.'
+
+      option :wait,
+             short: '-W',
+             long: '--wait',
+             description: 'Wait for the operation to complete.'
+
+      def run
+        $stdout.sync = true
+
+        validate(config[:name], '-n NAME')
+
+        init_client
+
+        ssh_key = OneAndOne::SshKey.new
+        response = ssh_key.create(name: config[:name], description: config[:description],
+                                  public_key: config[:public_key])
+
+        if config[:wait]
+          ssh_key.wait_for
+          formated_output(ssh_key.get, true)
+          puts "SSH Key #{response['id']} is #{ui.color('created', :bold)}"
+        else
+          formated_output(response, true)
+          puts "SSH Key #{response['id']} is #{ui.color('being created', :bold)}"
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/oneandone_ssh_key_delete.rb

@@ -0,0 +1,59 @@
+require 'chef/knife/oneandone_base'
+
+class Chef
+  class Knife
+    class OneandoneSshKeyDelete < Knife
+      include Knife::OneandoneBase
+
+      banner 'knife oneandone ssh key delete SSH_KEY_ID [SSH_KEY_ID] (options)'
+
+      option :wait,
+             short: '-W',
+             long: '--wait',
+             description: 'Wait for the operation to complete.'
+
+      def run
+        $stdout.sync = true
+
+        init_client
+
+        name_args.each do |ssh_key_id|
+          ssh_key = OneAndOne::SshKey.new
+
+          begin
+            ssh_key.get(ssh_key_id: ssh_key_id)
+          rescue StandardError => e
+            if e.message.include? 'NOT_FOUND'
+              ui.error("SSH key ID #{ssh_key_id} not found. Skipping.")
+            else
+              ui.error(e.message)
+            end
+            next
+          end
+
+          ssh_key_name = ssh_key.specs['name']
+
+          confirm("Do you really want to delete SSH key '#{ssh_key_name}'")
+
+          ssh_key.delete
+
+          if config[:wait]
+            begin
+              puts ui.color('Deleting, wait for the operation to complete...', :cyan).to_s
+              ssh_key.wait_for
+              puts "SSH key '#{ssh_key_name}' is #{ui.color('deleted', :bold)}"
+            rescue StandardError => e
+              if e.message.include? 'NOT_FOUND'
+                puts "SSH key '#{ssh_key_name}' is #{ui.color('deleted', :bold)}"
+              else
+                ui.error(e.message)
+              end
+            end
+          else
+            puts "SSH key '#{ssh_key_name}' is #{ui.color('being deleted', :bold)}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/oneandone_ssh_key_list.rb

@@ -0,0 +1,44 @@
+require 'chef/knife/oneandone_base'
+
+class Chef
+  class Knife
+    class OneandoneSshKeyList < Knife
+      include Knife::OneandoneBase
+
+      banner 'knife oneandone ssh key list'
+
+      def run
+        $stdout.sync = true
+
+        init_client
+
+        response = OneAndOne::SshKey.new.list
+        formated_output(response, true)
+
+        ssh_keys = [
+          ui.color('ID', :bold),
+          ui.color('Name', :bold),
+          ui.color('Description', :bold),
+          ui.color('State', :bold),
+          ui.color('Servers', :bold),
+          ui.color('Md5', :bold),
+          ui.color('Public Key', :bold),
+          ui.color('Creation Date', :bold)
+        ]
+
+        response.each do |ssh|
+          ssh_keys << ssh['id']
+          ssh_keys << ssh['name']
+          ssh_keys << (ssh['description'].nil? ? '' : ssh['description'])
+          ssh_keys << ssh['state']
+          ssh_keys << ssh['servers'].to_s
+          ssh_keys << ssh['md5']
+          ssh_keys << ssh['public_key']
+          ssh_keys << ssh['creation_date']
+        end
+
+        puts ui.list(ssh_keys, :uneven_columns_across, 8)
+      end
+    end
+  end
+end

data/lib/chef/knife/oneandone_ssh_key_rename.rb

@@ -0,0 +1,37 @@
+require 'chef/knife/oneandone_base'
+
+class Chef
+  class Knife
+    class OneandoneSshKeyRename < Knife
+      include Knife::OneandoneBase
+
+      banner 'knife oneandone ssh key rename (options)'
+
+      option :name,
+             short: '-n NAME',
+             long: '--name NAME',
+             description: 'SSH Key name'
+
+      option :description,
+             long: '--description DESCRIPTION',
+             description: 'SSH Key description'
+
+      option :id,
+             short: '-I ID',
+             long: '--id ID',
+             description: 'SSH Key ID'
+
+      def run
+        $stdout.sync = true
+
+        init_client
+
+        ssh_key = OneAndOne::SshKey.new
+        response = ssh_key.modify(ssh_key_id: config[:id], name: config[:name], description: config[:description])
+
+        formated_output(response, true)
+        puts "SSH Key updated #{ui.color('updated', :bold)}"
+      end
+    end
+  end
+end

data/lib/knife-oneandone/version.rb

@@ -1,5 +1,5 @@
-module Knife
-  module Oneandone
-    VERSION = '1.0.0'.freeze
-  end
-end
+module Knife
+  module Oneandone
+    VERSION = '1.2.0'.freeze
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-oneandone
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Nurfet Becirevic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-06 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: 1and1
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -86,42 +86,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0.58'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0.58'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.24'
 description: Official Chef Knife plugin for managing 1&1 Cloud servers
 email:
 - nurfet@stackpointcloud.com
@@ -141,6 +141,12 @@ files:
 - lib/1and1/helpers.rb
 - lib/chef/knife/oneandone_appliance_list.rb
 - lib/chef/knife/oneandone_base.rb
+- lib/chef/knife/oneandone_block_storage_attach.rb
+- lib/chef/knife/oneandone_block_storage_create.rb
+- lib/chef/knife/oneandone_block_storage_delete.rb
+- lib/chef/knife/oneandone_block_storage_detach.rb
+- lib/chef/knife/oneandone_block_storage_list.rb
+- lib/chef/knife/oneandone_block_storage_rename.rb
 - lib/chef/knife/oneandone_datacenter_list.rb
 - lib/chef/knife/oneandone_firewall_create.rb
 - lib/chef/knife/oneandone_firewall_delete.rb
@@ -150,6 +156,7 @@ files:
 - lib/chef/knife/oneandone_loadbalancer_delete.rb
 - lib/chef/knife/oneandone_loadbalancer_list.rb
 - lib/chef/knife/oneandone_mp_list.rb
+- lib/chef/knife/oneandone_server_baremetal_model_list.rb
 - lib/chef/knife/oneandone_server_create.rb
 - lib/chef/knife/oneandone_server_delete.rb
 - lib/chef/knife/oneandone_server_hdd_add.rb
@@ -163,6 +170,10 @@ files:
 - lib/chef/knife/oneandone_server_size_list.rb
 - lib/chef/knife/oneandone_server_start.rb
 - lib/chef/knife/oneandone_server_stop.rb
+- lib/chef/knife/oneandone_ssh_key_create.rb
+- lib/chef/knife/oneandone_ssh_key_delete.rb
+- lib/chef/knife/oneandone_ssh_key_list.rb
+- lib/chef/knife/oneandone_ssh_key_rename.rb
 - lib/knife-oneandone/version.rb
 homepage: https://github.com/1and1/oneandone-cloudserver-chef
 licenses:
@@ -184,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Chef Knife plugin for 1&1 Cloud server