kontena-plugin-upcloud 0.3.0 → 0.3.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c4c7355ad5cb678eae3164eab3d4e7a431737b0
-  data.tar.gz: f2cacd22c569d7f9c71ea3dbfa10d54d385dc36a
+  metadata.gz: aa71abdd5e6d879f8868bfb1e14f669a5879d197
+  data.tar.gz: 35cd56ca6f880a201813cfc4ed2724c01a84cbd8
 SHA512:
-  metadata.gz: 6ab242dc67aa75f27f53bae70f0c2cd1ccebc5d139e286ffdb725950a074982b6c45fef817d33f7cd6e21abb030595971f45461d2c57785732ffe2777f73ef84
-  data.tar.gz: 7ea9fb517948d7225fe869a542fcc0e7b742f1695f1147cb3846784c780384d6bf1318e17e8bb25bbf1c6cf0e0c15ee5938bac92a10279e22ede1a70d7b83138
+  metadata.gz: 5c82aabaaa2c8b6f97d0ad708590e67178aede22b22955d8e1aa7c4320951b7c3b1ea730dafc7a019bb7176aed4f46905439685a4837be72bc8551d2d60fa8a3
+  data.tar.gz: 0791e9666f8b9fad40fb3b6558046b1c4cbd0004cc0fc5e9772f841db61aa33c5b22356a1d6e7e13d6c770a4ab897459ba2834c10d190fe202c93e06feea3082

data/lib/kontena/machine/upcloud/client.rb

@@ -0,0 +1,92 @@
+require 'excon'
+require 'json'
+
+module Kontena
+  module Machine
+    module Upcloud
+      class Client
+
+        API_URL = 'https://api.upcloud.com'.freeze
+        ACCEPT = 'Accept'.freeze
+        CTYPE = 'Content-Type'.freeze
+        APP_JSON = 'application/json'.freeze
+        CTYPE_HEAD = { CTYPE => APP_JSON }
+
+        attr_reader :http_client
+
+        def initialize(username, password)
+          @http_client = Excon.new(
+            API_URL,
+            omit_default_port: true,
+            user: username,
+            password: password,
+          )
+        end
+
+        def get(path)
+          request(method: :get, path: path)
+        end
+
+        def post(path, body)
+          request(method: :post, path: path, body: body, headers: CTYPE_HEAD)
+        end
+
+        def delete(path)
+          request(method: :delete, path: path)
+        end
+
+        def find_template(name)
+          get('storage/template')[:storages][:storage].find{|s| s[:title].downcase.start_with?(name.downcase)}
+        end
+
+        def find_plan(name)
+          list_plans.find{|s| s[:name].downcase.eql?(name.downcase)}
+        end
+
+        def list_plans
+          get('plan')[:plans][:plan]
+        end
+
+        def list_zones
+          get('zone')[:zones][:zone]
+        end
+
+        def zone_exist?(name)
+          list_zones.any? { |zone| zone[:id] == name }
+        end
+
+        def get_server(id)
+          get("server/#{id}").fetch(:server, nil)
+        end
+
+        def api_access?
+          response = get('account')
+          response.kind_of?(Hash) && response.has_key?(:account)
+        rescue
+          false
+        end
+
+        private
+
+        def request(opts)
+          response = http_client.request(
+            opts.merge(
+              path: "/1.2/#{opts[:path]}",
+              headers: (opts[:headers] || {}).merge(ACCEPT => APP_JSON),
+            )
+          )
+
+          if (200..299).cover?(response.status)
+            if response.body && response.body.start_with?('{'.freeze)
+              JSON.parse(response.body, symbolize_names: true)
+            else
+              { success: true }
+            end
+          else
+            raise "Request to Upcloud failed: #{response.status} #{response.body}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -9,23 +9,17 @@ module Kontena
       class MasterProvisioner
         include RandomName
         include Machine::CertHelper
-        include UpcloudCommon
         include Kontena::Cli::Common
 
-        attr_reader :http_client, :username, :password
+        attr_reader :http_client, :uc_client
 
         # @param [String] token Upcloud token
         def initialize(upcloud_username, upcloud_password)
-          @username = upcloud_username
-          @password = upcloud_password
+          @uc_client = Kontena::Machine::Upcloud::Client.new(upcloud_username, upcloud_password)
         end
 
         def run!(opts)
-          if File.readable?(File.expand_path(opts[:ssh_key]))
-            ssh_key = File.read(File.expand_path(opts[:ssh_key])).strip
-          end
-
-          abort('Invalid ssh key') unless ssh_key && ssh_key.start_with?('ssh-')
+          abort('Invalid ssh key') unless opts[:ssh_key].to_s.start_with?('ssh-')
 
           if opts[:ssl_cert]
             abort('Invalid ssl cert') unless File.exists?(File.expand_path(opts[:ssl_cert]))
@@ -36,11 +30,9 @@ module Kontena
             end
           end
 
-          abort_unless_api_access
-
-          abort('CoreOS template not found on Upcloud') unless coreos_template = find_template('CoreOS Stable')
-          abort('Server plan not found on Upcloud') unless plan = find_plan(opts[:plan])
-          abort('Zone not found on Upcloud') unless zone_exist?(opts[:zone])
+          abort('CoreOS template not found on Upcloud') unless coreos_template = uc_client.find_template('CoreOS Stable')
+          abort('Server plan not found on Upcloud') unless plan = uc_client.find_plan(opts[:plan])
+          abort('Zone not found on Upcloud') unless uc_client.zone_exist?(opts[:zone])
 
           if opts[:name]
             server_name = opts[:name]
@@ -61,7 +53,7 @@ module Kontena
           device_data = {
             server: {
               zone: opts[:zone],
-              title: server_name,
+              title: hostname,
               hostname: hostname,
               plan: plan[:name],
               vnc: 'off',
@@ -83,21 +75,21 @@ module Kontena
                 create_password: 'no',
                 username: 'root',
                 ssh_keys: {
-                  ssh_key: [ssh_key]
+                  ssh_key: [opts[:ssh_key]]
                 }
               }
             }
           }.to_json
 
           spinner "Creating an Upcloud server #{hostname.colorize(:cyan)} " do
-            response = post('server', body: device_data)
+            response = uc_client.post('server', device_data)
             if response.has_key?(:error)
               abort("\nUpcloud server creation failed (#{response[:error].fetch(:error_message, '')})")
             end
             device_data = response[:server]
 
             until device_data && device_data.fetch(:state, nil).to_s == 'maintenance'
-              device_data = get("server/#{device[:uuid]}").fetch(:server, {}) rescue nil
+              device_data = uc_client.get("server/#{device[:uuid]}").fetch(:server, {}) rescue nil
               sleep 5
             end
           end
@@ -128,7 +120,8 @@ module Kontena
             public_ip: device_public_ip[:address],
             provider: 'upcloud',
             version: master_version,
-            code: opts[:initial_admin_code]
+            code: opts[:initial_admin_code],
+            ssl_certificate: (respond_to?(:certificate_public_key) && !opts[:ssl_cert]) ? certificate_public_key(ssl_cert) : nil
           }
         end
 

data/lib/kontena/machine/upcloud/node_destroyer.rb

@@ -3,24 +3,20 @@ module Kontena
     module Upcloud
       class NodeDestroyer
         include RandomName
-        include UpcloudCommon
         include Kontena::Cli::ShellSpinner
 
-        attr_reader :api_client, :username, :password
+        attr_reader :api_client, :uc_client
 
         # @param [Kontena::Client] api_client Kontena api client
         # @param [String] token Upcloud token
         def initialize(api_client, upcloud_username, upcloud_password)
           @api_client = api_client
-          @username = upcloud_username
-          @password = upcloud_password
+          @uc_client = Kontena::Machine::Upcloud::Client.new(upcloud_username, upcloud_password)
         end
 
         def run!(grid, name)
 
-          abort_unless_api_access
-
-          servers = get('server')
+          servers = uc_client.get('server')
           unless servers && servers.has_key?(:servers)
             abort('Upcloud API error')
           end
@@ -29,7 +25,7 @@ module Kontena
 
           abort "Cannot find node #{name.colorize(:cyan)} in UpCloud" unless server
 
-          server_data = get("server/#{server[:uuid]}")
+          server_data = uc_client.get("server/#{server[:uuid]}")
 
           storage_devices = server_data.fetch(:server, {}).fetch(:storage_devices, {}).fetch(:storage_device, [])
           storage_uuids = storage_devices.map{|s| s[:storage]}
@@ -39,8 +35,8 @@ module Kontena
           if server
             unless server[:state].eql?('stopped')
               spinner "Shutting down UpCloud node #{name.colorize(:cyan)} " do
-                device_data = post(
-                  "server/#{server[:uuid]}/stop", body: {
+                device_data = uc_client.post(
+                  "server/#{server[:uuid]}/stop", {
                     stop_server: {
                       stop_type: 'soft',
                       timeout: 120
@@ -49,20 +45,20 @@ module Kontena
                 )
 
                 until device_data && device_data.fetch(:state, nil).to_s.eql?('stopped')
-                  device_data = get("server/#{server[:uuid]}").fetch(:server, {}) rescue nil
+                  device_data = uc_client.get("server/#{server[:uuid]}").fetch(:server, {}) rescue nil
                   sleep 5
                 end
               end
             end
 
             spinner "Terminating UpCloud node #{name.colorize(:cyan)} " do
-              response = delete("server/#{server[:uuid]}")
+              response = uc_client.delete("server/#{server[:uuid]}")
               abort "Cannot delete node #{name.colorize(:cyan)} in Upcloud" unless response[:success]
             end
 
             storage_uuids.each do |uuid|
               spinner "Deleting UpCloud storage device '#{uuid.colorize(:cyan)}' " do
-                response = delete("storage/#{uuid}")
+                response = uc_client.delete("storage/#{uuid}")
                 unless response[:success]
                   puts "#{"WARNING".colorize(:red)}: Couldn't delete UpCloud storage '#{uuid.colorize(:cyan)}', check manually."
                 end

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

@@ -7,26 +7,20 @@ module Kontena
     module Upcloud
       class NodeProvisioner
         include RandomName
-        include UpcloudCommon
         include Kontena::Cli::ShellSpinner
 
-        attr_reader :api_client, :username, :password
+        attr_reader :api_client, :uc_client
 
         # @param [Kontena::Client] api_client Kontena api client
         # @param [String] upcloud_username Upcloud username
         # @param [String] upcloud_password Upcloud password
         def initialize(api_client, upcloud_username, upcloud_password)
           @api_client = api_client
-          @username = upcloud_username
-          @password = upcloud_password
+          @uc_client = Kontena::Machine::Upcloud::Client.new(upcloud_username, upcloud_password)
         end
 
         def run!(opts)
-          if File.readable?(File.expand_path(opts[:ssh_key]))
-            ssh_key = File.read(File.expand_path(opts[:ssh_key])).strip
-          end
-
-          abort('Invalid ssh key') unless ssh_key && ssh_key.start_with?('ssh-')
+          abort('Invalid ssh key') unless opts[:ssh_key].to_s.start_with?('ssh-')
 
           count = opts[:count].to_i
           userdata_vars = {
@@ -35,11 +29,9 @@ module Kontena
             grid_token: opts[:grid_token],
           }
 
-          abort_unless_api_access
-
-          abort('CoreOS template not found on Upcloud') unless coreos_template = find_template('CoreOS Stable')
-          abort('Server plan not found on Upcloud') unless plan = find_plan(opts[:plan])
-          abort('Zone not found on Upcloud') unless zone_exist?(opts[:zone])
+          abort('CoreOS template not found on Upcloud') unless coreos_template = uc_client.find_template('CoreOS Stable')
+          abort('Server plan not found on Upcloud') unless plan = uc_client.find_plan(opts[:plan])
+          abort('Zone not found on Upcloud') unless uc_client.zone_exist?(opts[:zone])
 
           count.times do |i|
             if opts[:name]
@@ -72,14 +64,14 @@ module Kontena
                   create_password: 'no',
                   username: 'root',
                   ssh_keys: {
-                    ssh_key: [ssh_key]
+                    ssh_key: [opts[:ssh_key]]
                   }
                 }
               }
             }.to_json
 
             spinner "Creating UpCloud node #{hostname.colorize(:cyan)} " do
-              response = post('server', body: device_data)
+              response = uc_client.post('server', device_data)
 
               if response.has_key?(:error)
                 abort("\nUpCloud server creation failed (#{response[:error].fetch(:error_message, '')})")
@@ -87,7 +79,7 @@ module Kontena
               device_data = response[:server]
 
               until device_data && device_data.fetch(:state, nil).to_s == 'maintenance'
-                device_data = get("server/#{device[:uuid]}").fetch(:server, {}) rescue nil
+                device_data = uc_client.get("server/#{device[:uuid]}").fetch(:server, {}) rescue nil
                 sleep 5
               end
             end

data/lib/kontena/machine/upcloud/node_restarter.rb

@@ -3,22 +3,19 @@ module Kontena
     module Upcloud
       class NodeRestarter
         include RandomName
-        include UpcloudCommon
         include Kontena::Cli::ShellSpinner
 
-        attr_reader :username, :password
+        attr_reader :uc_client
 
         # @param [String] upcloud_username Upcloud username
         # @param [String] upcloud_password Upcloud password
         def initialize(upcloud_username, upcloud_password)
-          @username = upcloud_username
-          @password = upcloud_password
+          @uc_client = Kontena::Machine::Upcloud::Client.new(upcloud_username, upcloud_password)
         end
 
         def run!(name)
-          abort_unless_api_access
 
-          servers = get('server')
+          servers = uc_client.get('server')
           unless servers && servers.has_key?(:servers)
             abort('Upcloud API error')
           end
@@ -27,8 +24,8 @@ module Kontena
 
           if server
             spinner "Restarting UpCloud node #{name.colorize(:cyan)} " do
-              result = post(
-                "server/#{server[:uuid]}/restart", body: {
+              result = uc_client.post(
+                "server/#{server[:uuid]}/restart", {
                   restart_server: {
                     stop_type: 'soft',
                     timeout: 600,

data/lib/kontena/machine/upcloud.rb

@@ -1,6 +1,6 @@
 require 'kontena/machine/random_name'
 require 'kontena/machine/cert_helper'
-require_relative 'upcloud/upcloud_common'
+require_relative 'upcloud/client'
 require_relative 'upcloud/node_provisioner'
 require_relative 'upcloud/node_destroyer'
 require_relative 'upcloud/node_restarter'

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

@@ -1,24 +1,24 @@
 require 'securerandom'
+require 'kontena/plugin/upcloud/prompts'
 
 module Kontena::Plugin::Upcloud::Master
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
 
     option "--name", "[NAME]", "Set Kontena Master name"
-    option "--username", "USER", "Upcloud username", required: true, environment_variable: 'UPCLOUD_USERNAME'
-    option "--password", "PASS", "Upcloud password", required: true, environment_variable: 'UPCLOUD_PASSWORD'
-    option "--ssh-key", "SSH_KEY", "Path to ssh public key", default: '~/.ssh/id_rsa.pub'
+
+    include Kontena::Plugin::Upcloud::Prompts::Create
+
     option "--ssl-cert", "SSL CERT", "SSL certificate file (optional)"
-    option "--plan", "PLAN", "Server plan", required: true
-    option "--zone", "ZONE", "Zone", required: true
     option "--vault-secret", "VAULT_SECRET", "Secret key for Vault (optional)"
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (optional)"
     option "--mongodb-uri", "URI", "External MongoDB uri (optional)"
-    option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
     def execute
       require_relative '../../../machine/upcloud'
 
+      abort_unless_api_access
+
       provisioner.run!(
           name: self.name,
           ssh_key: ssh_key,
@@ -36,29 +36,5 @@ module Kontena::Plugin::Upcloud::Master
     def provisioner
       Kontena::Machine::Upcloud::MasterProvisioner.new(username, password)
     end
-
-    def default_username
-      prompt.ask('UpCloud username:', echo: true)
-    end
-
-    def default_password
-      prompt.ask('UpCloud password:', echo: false)
-    end
-
-    def default_plan
-      prompt.select("Choose plan:") do |menu|
-        Kontena::Plugin::Upcloud::PLANS.each do |plan, name|
-          menu.choice name, plan
-        end
-      end
-    end
-
-    def default_zone
-      prompt.select("Choose availability zone:") do |menu|
-        Kontena::Plugin::Upcloud::ZONES.each do |zone, name|
-          menu.choice name, zone
-        end
-      end
-    end
   end
 end

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

@@ -1,21 +1,23 @@
+require 'kontena/plugin/upcloud/prompts'
+
 module Kontena::Plugin::Upcloud::Nodes
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
     parameter "[NAME]", "Node name"
-    option "--username", "USER", "Upcloud username", required: true, environment_variable: 'UPCLOUD_USERNAME'
-    option "--password", "PASS", "Upcloud password", required: true, environment_variable: 'UPCLOUD_PASSWORD'
-    option "--ssh-key", "SSH_KEY", "Path to ssh public key", default: '~/.ssh/id_rsa.pub'
+
+    include Kontena::Plugin::Upcloud::Prompts::Create
+
     option "--count", "COUNT", "How many nodes should be created"
-    option "--zone", "ZONE", "Zone", required: true
-    option "--plan", "PLAN", "Server size", required: true
-    option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
     requires_current_master_token
 
     def execute
       require_relative '../../../machine/upcloud'
+
+      abort_unless_api_access
+
       grid = fetch_grid
       provisioner = Kontena::Machine::Upcloud::NodeProvisioner.new(client, username, password)
       provisioner.run!(
@@ -37,33 +39,8 @@ module Kontena::Plugin::Upcloud::Nodes
       client.get("grids/#{current_grid}")
     end
 
-
-    def default_username
-      prompt.ask('UpCloud username:', echo: true)
-    end
-
-    def default_password
-      prompt.ask('UpCloud password:', echo: false)
-    end
-
     def default_count
       prompt.ask('How many servers:', default: 1)
     end
-
-    def default_plan
-      prompt.select("Choose plan:") do |menu|
-        Kontena::Plugin::Upcloud::PLANS.each do |plan, name|
-          menu.choice name, plan
-        end
-      end
-    end
-
-    def default_zone
-      prompt.select("Choose availability zone:") do |menu|
-        Kontena::Plugin::Upcloud::ZONES.each do |zone, name|
-          menu.choice name, zone
-        end
-      end
-    end
   end
 end

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

@@ -1,16 +1,19 @@
+require 'kontena/plugin/upcloud/prompts'
+
 module Kontena::Plugin::Upcloud::Nodes
   class RestartCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
-    parameter "NAME", "Node name"
-    option "--username", "USER", "Upcloud username", required: true, environment_variable: 'UPCLOUD_USERNAME'
-    option "--password", "PASS", "Upcloud password", required: true, environment_variable: 'UPCLOUD_PASSWORD'
+    include Kontena::Plugin::Upcloud::Prompts::NodeName
+    include Kontena::Plugin::Upcloud::Prompts::Common
 
     def execute
       require_api_url
       require_current_grid
 
+      abort_unless_api_access
+
       require 'kontena/machine/upcloud'
 
       restarter = Kontena::Machine::Upcloud::NodeRestarter.new(username, password)

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

@@ -1,17 +1,18 @@
+require 'kontena/plugin/upcloud/prompts'
 module Kontena::Plugin::Upcloud::Nodes
   class TerminateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
-    parameter "[NAME]", "Node name"
-    option "--username", "USER", "Upcloud username", required: true, environment_variable: 'UPCLOUD_USERNAME'
-    option "--password", "PASS", "Upcloud password", required: true, environment_variable: 'UPCLOUD_PASSWORD'
+    include Kontena::Plugin::Upcloud::Prompts::NodeName
+    include Kontena::Plugin::Upcloud::Prompts::Common
 
     option  '--force', :flag, "Force terminate", attribute_name: :forced
 
     requires_current_master_token
 
     def execute
+      abort_unless_api_access
       require_relative '../../../machine/upcloud'
       confirm_command(name) unless forced?
       grid = client.get("grids/#{current_grid}")

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

@@ -0,0 +1,99 @@
+require 'kontena/machine/upcloud/client'
+
+module Kontena
+  module Plugin
+    module Upcloud
+      module Prompts
+        module Common
+          def self.included(base)
+            base.prepend Defaults
+            base.option "--username", "USER", "Upcloud username", required: true, environment_variable: 'UPCLOUD_USERNAME'
+            base.option "--password", "PASS", "Upcloud password", required: true, environment_variable: 'UPCLOUD_PASSWORD'
+          end
+
+          def upcloud_client
+            @upcloud_client ||=  Kontena::Machine::Upcloud::Client.new(username, password)
+          end
+
+          def abort_unless_api_access
+            unless upcloud_client.api_access?
+              exit_with_error('Upcloud API authentication failed. Check that API access is enabled for the user.')
+            end
+          end
+
+          module Defaults
+            def default_username
+              prompt.ask('UpCloud username:', echo: true)
+            end
+
+            def default_password
+              pass = prompt.ask('UpCloud password:', echo: false)
+            end
+          end
+        end
+
+        module NodeName
+          def self.included(base)
+            base.prepend Defaults
+            base.parameter "[NAME]", "Node name"
+          end
+
+          module Defaults
+            def default_name
+              nodes = client.get("grids/#{current_grid}/nodes")
+              nodes = nodes['nodes'].select{ |n|
+                n['labels'] && n['labels'].include?('provider=upcloud'.freeze)
+              }
+              raise "Did not find any nodes with label provider=upcloud" if nodes.empty?
+              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']
+                end
+              end
+            end
+          end
+        end
+
+        module Create
+          def self.included(base)
+            base.include Common
+            base.prepend Defaults
+            base.option "--ssh-key", "SSH_KEY", "Path to ssh public key", attribute_name: :ssh_key_path
+            base.option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
+            base.option "--zone", "ZONE", "Zone", required: true
+            base.option "--plan", "PLAN", "Server size", required: true
+          end
+
+          def ssh_key
+            return File.read(ssh_key_path) unless ssh_key_path.nil?
+            default = File.read(Defaults::DEFAULT_SSH_KEY_PATH).strip rescue nil
+            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
+          end
+
+          module Defaults
+            DEFAULT_SSH_KEY_PATH = File.join(Dir.home, '.ssh', 'id_rsa.pub')
+
+            def default_plan
+              prompt.select("Choose plan:") do |menu|
+                upcloud_client.list_plans.each do |plan|
+                  menu.choice "#{plan[:name]} (#{plan[:memory_amount]}MB #{plan[:storage_size]}GB #{plan[:storage_tier]})", plan[:name]
+                end
+              end
+            end
+
+            def default_zone
+              prompt.select("Choose availability zone:") do |menu|
+                upcloud_client.list_zones.each do |zone|
+                  menu.choice zone[:description], zone[:id]
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kontena/plugin/upcloud.rb

@@ -1,23 +1,7 @@
 module Kontena
   module Plugin
     module Upcloud
-      VERSION = "0.3.0"
-
-      ZONES = {
-        'nl-ams1' => 'Amsterdam #1',
-        'us-chi1' => 'Chicago #1',
-        'de-fra1' => 'Frankfurt #1',
-        'fi-hel1' => 'Helsinki #1',
-        'uk-lon1' => 'London #1',
-        'sg-sin1' => 'Singapore #1'
-      }.freeze
-
-      PLANS = {
-        '1xCPU-1GB' => '1024MB / 1 CPU, 30GB MaxIOPS disk, 2048GB transfer',
-        '2xCPU-2GB' => '2048MB / 2 CPU, 50GB MaxIOPS disk, 3072GB transfer',
-        '4xCPU-4GB' => '4096MB / 4 CPU, 100GB MaxIOPS disk, 4096GB transfer',
-        '6xCPU-8GB' => '8192MB / 6 CPU, 200GB MaxIOPS disk, 8192GB transfer'
-      }.freeze
+      VERSION = "0.3.1.rc1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-upcloud
 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-07-20 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -67,13 +67,13 @@ files:
 - README.md
 - kontena-plugin-upcloud.gemspec
 - lib/kontena/machine/upcloud.rb
+- lib/kontena/machine/upcloud/client.rb
 - lib/kontena/machine/upcloud/cloudinit.yml
 - lib/kontena/machine/upcloud/cloudinit_master.yml
 - lib/kontena/machine/upcloud/master_provisioner.rb
 - lib/kontena/machine/upcloud/node_destroyer.rb
 - lib/kontena/machine/upcloud/node_provisioner.rb
 - lib/kontena/machine/upcloud/node_restarter.rb
-- lib/kontena/machine/upcloud/upcloud_common.rb
 - lib/kontena/plugin/upcloud.rb
 - lib/kontena/plugin/upcloud/master/create_command.rb
 - lib/kontena/plugin/upcloud/master_command.rb
@@ -81,6 +81,7 @@ files:
 - lib/kontena/plugin/upcloud/nodes/create_command.rb
 - lib/kontena/plugin/upcloud/nodes/restart_command.rb
 - lib/kontena/plugin/upcloud/nodes/terminate_command.rb
+- lib/kontena/plugin/upcloud/prompts.rb
 - lib/kontena/plugin/upcloud_command.rb
 - lib/kontena_cli_plugin.rb
 homepage: https://github.com/kontena/kontena-plugin-upcloud
@@ -98,9 +99,9 @@ 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

data/lib/kontena/machine/upcloud/upcloud_common.rb

@@ -1,72 +0,0 @@
-require 'excon'
-require 'json'
-
-module Kontena
-  module Machine
-    module Upcloud
-      module UpcloudCommon
-
-        attr_reader :username
-        attr_reader :password
-        
-        def upcloud_client
-          @upcloud_client ||= Excon.new(
-            'https://api.upcloud.com',
-            omit_default_port: true,
-            user: username,
-            password: password,
-            headers: { "Accept-Encoding" => 'application/json' }
-          )
-        end
-
-        def find_template(name)
-          get('storage/template')[:storages][:storage].find{|s| s[:title].downcase.start_with?(name.downcase)}
-        end
-        
-        def find_plan(name)
-          get('plan')[:plans][:plan].find{|s| s[:name].downcase.eql?(name.downcase)}
-        end
-
-        def zone_exist?(name)
-          get('zone')[:zones][:zone].map{|p| p[:id]}.include?(name)
-        end
-
-        def get_server(id)
-          get("server/#{id}").fetch(:server, nil)
-        end
-
-        def api_access?
-          response = get('account')
-          response.kind_of?(Hash) && response.has_key?(:account)
-        rescue
-          false
-        end
-
-        def abort_unless_api_access
-          unless api_access?
-            abort('Upcloud API authentication failed. Check that API access is enabled for the user.')
-          end
-        end
-
-        [:get, :post, :delete].each do |http_method|
-          define_method http_method do |path, options={}|
-            response = upcloud_client.send(
-              http_method,
-              { 
-                path: File.join('/1.2', path),
-                headers: { 'Content-Type' => 'application/json' }
-              }.merge(options)
-            )
-            if response.body && response.body.start_with?('{')
-              JSON.parse(response.body, symbolize_names: true)
-            elsif response.status.to_s.start_with?('2')
-              {success: true}
-            else
-              {error: response.status}
-            end
-          end
-        end
-      end
-    end
-  end
-end