kontena-plugin-digitalocean 0.3.0 → 0.3.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bb6451500eb7cd117546fb2f5079745ea23773f
-  data.tar.gz: 5383038aeb7fa4a3e638d40a4d93b9d4ecb2f9f4
+  metadata.gz: 159d041998037905df8bfaf653d921910f8ba2df
+  data.tar.gz: b49274c2e74cace9384aa6c25fde76e6c19edb41
 SHA512:
-  metadata.gz: 071c61535e2a8ba9caf1f39a06ba95828b338bf69a61d937828f6c1d5592dd1853efe4adaa9d10661bb6a20b1837b0e905c126e0fe27159c056963321fd0d0c7
-  data.tar.gz: 0d7d1e867703e1a800696d1421fa67062fc7663c38f161e4e67103b273b692fc29727c02d0594d03b46451fd8250bedc43f157cec823939c517c47ddbe96eb9d
+  metadata.gz: 88ebcc12587efa3c1edbd14f249dc6e5a4b6dbe051eb6f5e7d27a6ca2bbcf81f8941e6928cc148e4be37eeaa4e059451bf83a2cc812fbcb8439765e6feb3f097
+  data.tar.gz: 4608d8bc37fb630b12f91316a05a704106fa89717d106a64ae912438978cbf94dddb18777dc2476892270a4adc3ea2ed10a4c4ee67fb5b812015667deb0974e8

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
-  - 2.0.0-p648
-  - 2.1.8
-  - 2.2.3
-  - 2.3.1
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.1
 env:
   - secure: "HAJRG+iaNDuyOMlbYSsXNjA2jwTMQonYJ3fHhm4zDPmIMupNnM+Krx650rVqlMP2KpNIYg4BEWCaDobTU9HoOy0AApmPGc8gGHMCP6v3cSnoGHxmiFy8yB7szgltcBz27PLeJN+exxRCjWPk677jW7JaooyYVSD64dEgVUrFju7olWUrvR0a0hAfBfawXU6kiGgdLnIEtc4AK+mokN9J6fR2PJthuDirZNgDPtVPuBJNFErI9Rh200stcZDOE3F1QE80HyAbrsyfvN/9cosSYDhJS9G+awAw6S+BqeBFZTQlDkWqJgdGsaacasxAmB5bgpkFY5tuv8DdqksK4nXlvsGVurQOYyufuc0y7HllPFVBPkzETCyWaafzek9acfTriLKJIJ26sFYQpuGQlgmAT/KyKYqqzX1ZAk/qe+haT5dt19bXzCHQHWapnWIll11AU0F67TiastmfyaBhnO8d983rwyxIww+8n3AfGPJXZ2eEjw2Rr17yqPYIVtkRoy7ctvCVJTeC6nDGhCqgU5lfl59656fzmJaBI9nWkadK0hQY8WB/5sLJ72pnRZDBbv3xIddS+JnDqxQWheMaJ7Oz5MkbHzdmRo3EhuHGPYpsdPQoeMudqGXX6OTxkQcRbKqJOHDE58rQzz7cZPvY2fwYOkhCspjLWcUAytbaMDkrEVs="
 cache: bundler
@@ -14,3 +14,4 @@ deploy:
   gem: kontena-plugin-digitalocean
   on:
     tags: true
+    rvm: 2.4.1

data/kontena-plugin-digitalocean.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'kontena-cli', '>= 1.0'
-  spec.add_runtime_dependency 'droplet_kit', '~> 2.0', '>= 2.0.1'
+  spec.add_runtime_dependency 'droplet_kit', '~> 2.2'
   spec.add_runtime_dependency 'activesupport', '~> 4.0'
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/kontena/machine/digital_ocean/master_provisioner.rb

@@ -18,11 +18,6 @@ module Kontena
         end
 
         def run!(opts)
-          abort('Invalid ssh key') unless File.exists?(File.expand_path(opts[:ssh_key]))
-
-          ssh_key = ssh_key(File.read(File.expand_path(opts[:ssh_key])).strip)
-          abort('Ssh key does not exist in Digital Ocean') unless ssh_key
-
           if opts[:ssl_cert]
             abort('Invalid ssl cert') unless File.exists?(File.expand_path(opts[:ssl_cert]))
             ssl_cert = File.read(File.expand_path(opts[:ssl_cert]))
@@ -45,7 +40,7 @@ module Kontena
               size: opts[:size],
               private_networking: true,
               user_data: user_data(userdata_vars),
-              ssh_keys: [ssh_key.id],
+              ssh_keys: [opts[:ssh_key_id]],
               tags: ['master']
           )
 
@@ -89,10 +84,6 @@ module Kontena
           erb(File.read(cloudinit_template), vars)
         end
 
-        def ssh_key(public_key)
-          client.ssh_keys.all.find{|key| key.public_key == public_key}
-        end
-
         def master_running?
           http_client.get(path: '/').status == 200
         rescue

data/lib/kontena/machine/digital_ocean/node_provisioner.rb

@@ -19,11 +19,6 @@ module Kontena
         end
 
         def run!(opts)
-          abort('Invalid ssh key') unless File.exists?(File.expand_path(opts[:ssh_key]))
-
-          ssh_key = ssh_key(File.read(File.expand_path(opts[:ssh_key])).strip)
-          abort('Ssh key does not exist in Digital Ocean') unless ssh_key
-
           userdata_vars = {
             version: opts[:version],
             master_uri: opts[:master_uri],
@@ -39,7 +34,7 @@ module Kontena
               size: opts[:size],
               private_networking: true,
               user_data: user_data(userdata_vars),
-              ssh_keys: [ssh_key.id],
+              ssh_keys: [opts[:ssh_key_id]],
               tags: [opts[:grid]]
             )
             created = client.droplets.create(droplet)

data/lib/kontena/machine/digital_ocean/ssh_key_manager.rb

@@ -0,0 +1,31 @@
+module Kontena
+  module Machine
+    module DigitalOcean
+      class SshKeyManager
+
+        attr_reader :client
+
+        # @param [String] token Digital Ocean API token
+        def initialize(token)
+          @client = DropletKit::Client.new(access_token: token)
+        end
+
+        def find_by_public_key(public_key)
+          list.find { |key| key.public_key == public_key }
+        end
+
+        def list
+          client.ssh_keys.all.to_a
+        end
+
+        def create(public_key)
+          client.ssh_keys.create(DropletKit::SSHKey.new(public_key: public_key, name: public_key.split(/\s+/).last))
+        end
+
+        def find_or_create_by_public_key(public_key)
+          find_by_public_key(public_key) || create(public_key)
+        end
+      end
+    end
+  end
+end

data/lib/kontena/machine/digital_ocean.rb

@@ -5,3 +5,4 @@ require_relative 'digital_ocean/node_provisioner'
 require_relative 'digital_ocean/node_destroyer'
 require_relative 'digital_ocean/master_provisioner'
 require_relative 'digital_ocean/master_destroyer'
+require_relative 'digital_ocean/ssh_key_manager'

data/lib/kontena/plugin/digital_ocean/master/create_command.rb

@@ -10,7 +10,7 @@ module Kontena::Plugin::DigitalOcean::Master
     option "--token", "TOKEN", "DigitalOcean API token", environment_variable: "DO_TOKEN"
     option "--region", "REGION", "Region"
     option "--size", "SIZE", "Droplet size"
-    option "--ssh-key", "SSH_KEY", "Path to ssh public key", default: '~/.ssh/id_rsa.pub'
+    option "--ssh-key", "SSH_KEY", "Path to ssh public key"
     option "--ssl-cert", "SSL CERT", "SSL certificate file"
     option "--vault-secret", "VAULT_SECRET", "Secret key for Vault (optional)"
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (optional)"
@@ -19,17 +19,19 @@ module Kontena::Plugin::DigitalOcean::Master
 
 
     def execute
+      suppress_warnings # until DO merges resource_kit pr #32
       do_token = ask_do_token
 
       require_relative '../../../machine/digital_ocean'
 
       do_region = ask_droplet_region(do_token)
       do_size = ask_droplet_size(do_token, do_region)
+      do_ssh_key_id = ask_ssh_key(do_token)
 
       provisioner = provisioner(do_token)
       provisioner.run!(
         name: name,
-        ssh_key: ssh_key,
+        ssh_key_id: do_ssh_key_id,
         ssl_cert: ssl_cert,
         size: do_size,
         region: do_region,
@@ -39,6 +41,8 @@ module Kontena::Plugin::DigitalOcean::Master
         initial_admin_code: SecureRandom.hex(16),
         mongodb_uri: mongodb_uri
       )
+    ensure
+      resume_warnings
     end
 
     # @param [String] token

data/lib/kontena/plugin/digital_ocean/master/terminate_command.rb

@@ -9,12 +9,15 @@ module Kontena::Plugin::DigitalOcean::Master
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
+      suppress_warnings # until DO merges resource_kit pr #32
       do_token = ask_do_token
       confirm_command(name) unless forced?
 
       require_relative '../../../machine/digital_ocean'
       destroyer = destroyer(do_token)
       destroyer.run!(name)
+    ensure
+      resume_warnings
     end
 
     # @param [String] token

data/lib/kontena/plugin/digital_ocean/nodes/create_command.rb

@@ -9,13 +9,14 @@ module Kontena::Plugin::DigitalOcean::Nodes
     parameter "[NAME]", "Node name"
     option "--token", "TOKEN", "DigitalOcean API token", environment_variable: 'DO_TOKEN'
     option "--region", "REGION", "Region"
-    option "--ssh-key", "SSH_KEY", "Path to ssh public key", default: '~/.ssh/id_rsa.pub'
+    option "--ssh-key", "SSH_KEY", "Path to ssh public key"
     option "--size", "SIZE", "Droplet size"
     option "--count", "COUNT", "How many droplets to create"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
     option "--channel", "CHANNEL", "Define CoreOS image channel"
 
     def execute
+      suppress_warnings # until DO merges resource_kit pr #32
       require_api_url
       require_current_grid
 
@@ -27,6 +28,7 @@ module Kontena::Plugin::DigitalOcean::Nodes
       coreos_channel = self.channel || ask_channel
       do_size = ask_droplet_size(do_token, do_region)
       do_count = ask_droplet_count
+      do_ssh_key_id = ask_ssh_key(do_token)
 
       grid = fetch_grid
       provisioner = provisioner(client(require_token), do_token)
@@ -34,7 +36,7 @@ module Kontena::Plugin::DigitalOcean::Nodes
         master_uri: api_url,
         grid_token: grid['token'],
         grid: current_grid,
-        ssh_key: ssh_key,
+        ssh_key_id: do_ssh_key_id,
         name: name,
         size: do_size,
         count: do_count,
@@ -42,11 +44,13 @@ module Kontena::Plugin::DigitalOcean::Nodes
         version: version,
         channel: coreos_channel
       )
+    ensure
+      resume_warnings
     end
 
     def ask_droplet_count
       if self.count.nil?
-        prompt.ask('How many droplets?: ', default: 1)
+        prompt.ask('How many droplets?:', default: 1)
       else
         self.count
       end

data/lib/kontena/plugin/digital_ocean/nodes/restart_command.rb

@@ -10,6 +10,7 @@ module Kontena::Plugin::DigitalOcean::Nodes
     option "--token", "TOKEN", "DigitalOcean API token", environment_variable: "DO_TOKEN"
 
     def execute
+      suppress_warnings # until DO merges resource_kit pr #32
       require_api_url
       require_current_grid
       do_token = ask_do_token
@@ -27,6 +28,8 @@ module Kontena::Plugin::DigitalOcean::Nodes
       else
         exit_with_error "Cannot find droplet #{pastel.cyan(name)} in DigitalOcean"
       end
+    ensure
+      resume_warnings
     end
   end
 end

data/lib/kontena/plugin/digital_ocean/nodes/terminate_command.rb

@@ -11,6 +11,7 @@ module Kontena::Plugin::DigitalOcean::Nodes
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
+      suppress_warnings # until DO merges resource_kit pr #32
       require_api_url
       require_current_grid
       token = require_token
@@ -22,6 +23,8 @@ module Kontena::Plugin::DigitalOcean::Nodes
       grid = client(require_token).get("grids/#{current_grid}")
       destroyer = destroyer(client(token), do_token)
       destroyer.run!(grid, node_name)
+    ensure
+      resume_warnings
     end
 
     # @param [Kontena::Client] client

data/lib/kontena/plugin/digital_ocean/prompts.rb

@@ -1,7 +1,56 @@
 module Kontena::Plugin::DigitalOcean::Prompts
+
+  # Until DO merges https://github.com/digitalocean/resource_kit/pull/32
+  def suppress_warnings
+    @original_verbosity = $VERBOSE
+    $VERBOSE = nil
+  end
+
+  def resume_warnings
+    $VERBOSE = @original_verbosity
+  end
+
+  def ask_ssh_key(do_token)
+    manager = Kontena::Machine::DigitalOcean::SshKeyManager.new(do_token)
+
+    if self.ssh_key
+      puts self.ssh_key.inspect
+      public_key = File.read(self.ssh_key).strip
+    else
+      keys = manager.list
+      key_id = :new
+
+      default_path = File.join(Dir.home, '.ssh', 'id_rsa.pub')
+      default = File.exist?(default_path) ? File.read(default_path).strip : nil
+
+      unless keys.empty?
+        key = prompt.select("Choose SSH key:") do |menu|
+          i = 1
+          keys.each do |item|
+            menu.choice "#{item.name} (#{item.fingerprint})" , item
+            menu.default i if item.public_key == default
+            i += 1
+          end
+          menu.choice "Create new SSH key", :new
+        end
+      end
+
+      if key == :new
+
+        public_key = prompt.ask('SSH public key: (enter an ssh key in OpenSSH format "ssh-xxx xxxxx key_name")', default: default) do |q|
+          q.validate /^ssh-rsa \S+ \S+$/
+        end
+      else
+        public_key = key.public_key
+      end
+
+      manager.find_or_create_by_public_key(public_key).id
+    end
+  end
+
   def ask_do_token
     if self.token.nil?
-      prompt.ask('DigitalOcean API token: ', echo: false)
+      prompt.ask('DigitalOcean API token:', echo: false)
     else
       self.token
     end
@@ -9,7 +58,7 @@ module Kontena::Plugin::DigitalOcean::Prompts
 
   def ask_droplet_region(do_token)
     if self.region.nil?
-      prompt.select("Choose a datacenter region: ") do |menu|
+      prompt.select("Choose a datacenter region:") do |menu|
         do_client = DropletKit::Client.new(access_token: do_token)
         do_client.regions.all.sort_by{|r| r.slug }.each{ |region|
           menu.choice region.name, region.slug
@@ -22,12 +71,13 @@ module Kontena::Plugin::DigitalOcean::Prompts
 
   def ask_droplet_size(do_token, do_region)
     if self.size.nil?
-      prompt.select("Choose droplet size: ") do |menu|
+      prompt.select("Choose droplet size:") do |menu|
         do_client = DropletKit::Client.new(access_token: do_token)
         do_client.sizes.all.to_a.select{ |s| s.memory > 1000 }.sort_by{|s| s.memory }.each{ |size|
+          #p size
           if size.regions.include?(do_region)
             memory = size.memory.to_i / 1024
-            menu.choice "#{memory}GB/#{size.vcpus}CPU/#{size.disk}GB ($#{size.price_monthly.to_i}/mo)", size.slug
+            menu.choice "#{size.slug}: #{memory}GB/#{size.vcpus}CPU/#{size.disk}GB ($#{size.price_monthly.to_i}/mo)", size.slug
           end
         }
       end
@@ -43,7 +93,7 @@ module Kontena::Plugin::DigitalOcean::Prompts
         n['labels'] && n['labels'].include?('provider=digitalocean'.freeze)
       }
       raise "Did not find any nodes with label provider=digitalocean" if nodes.size == 0
-      prompt.select("Select node: ") do |menu|
+      prompt.select("Select node:") do |menu|
         nodes.sort_by{|n| n['node_number'] }.reverse.each do |node|
           initial = node['initial_member'] ? '(initial) ' : ''
           menu.choice "#{node['name']} #{initial}", node['name']
@@ -55,7 +105,7 @@ module Kontena::Plugin::DigitalOcean::Prompts
   end
 
   def ask_channel
-    prompt.select('Select CoreOS channel') do |menu|
+    prompt.select('Select Container Linux channel:') do |menu|
       menu.choice 'Stable', 'stable'
       menu.choice 'Beta', 'beta'
       menu.choice 'Alpha', 'alpha'

data/lib/kontena/plugin/digital_ocean.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module DigitalOcean
-      VERSION = "0.3.0"
+      VERSION = "0.3.1.rc1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1.rc1
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +102,7 @@ files:
 - lib/kontena/machine/digital_ocean/master_provisioner.rb
 - lib/kontena/machine/digital_ocean/node_destroyer.rb
 - lib/kontena/machine/digital_ocean/node_provisioner.rb
+- lib/kontena/machine/digital_ocean/ssh_key_manager.rb
 - lib/kontena/plugin/digital_ocean.rb
 - lib/kontena/plugin/digital_ocean/master/create_command.rb
 - lib/kontena/plugin/digital_ocean/master/terminate_command.rb
@@ -134,12 +129,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Kontena DigitalOcean plugin