kontena-cli 1.4.0.pre6 → 1.4.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 750f17967025517060b46f32a63528d34aa6c578
-  data.tar.gz: bd34c1c6c26e981984e15ce74cf0a03f9e96425e
+  metadata.gz: dd17b046ef3c5df923edb5330692544a30c68f31
+  data.tar.gz: 86ab9db88b8bffe961692ad0c7716aacc450e556
 SHA512:
-  metadata.gz: 7e3574f15562be1bb53e0fa6c8c0f7db14a7925760174b9d794d411c976cbe08f49aa0f80d0a106de24c8b9495110811b4e611bc4d6ad521009b5a0f71a74fc3
-  data.tar.gz: 77e86e97a2691c16e210589d3d60ef41dfcd07087f9743b215a03628a65f2b804f9390e815fa2d179d9d74be3596ab8dec732d842d8a49694941996b3280696e
+  metadata.gz: 9ce3ee493ee6919a392b71e4218bc301849caf3d8a0f25a4aa831c81aaeab1a6e57e3d88927cee4e0c9a50bac10ec195476eb5d6b88cb934234d6fc1c09119e2
+  data.tar.gz: 1a257b2cb1d8f72f4c9d69dd4ca1b5530fd1ecf51dac56a7e3b787b3d579e574ba85e625e7e0350d9512d34875778aa02961e0b45623efc2b4bbc8b57b7f5556

data/Gemfile

@@ -8,5 +8,5 @@ group :development, :test do
   gem "kontena-plugin-hello", path: "./examples/kontena-plugin-hello"
   gem 'pry', require: false
   gem 'pry-byebug', require: false
-  gem 'webmock', require: false
+  gem 'webmock', '~> 3.0', require: false
 end

data/VERSION

@@ -1 +1 @@
-1.4.0.pre6
+1.4.0.pre7

data/bin/kontena

@@ -14,6 +14,6 @@ if ARGV[0] == 'complete'
 else
   ENV['DEBUG'] ||= "true" if ARGV.any? { |arg| arg == '-D' || arg == '--debug'}
   require 'kontena_cli'
-  Kontena::PluginManager.instance.init unless ENV['NO_PLUGINS']
+  Kontena::PluginManager.init unless ENV['NO_PLUGINS']
   Kontena::MainCommand.run
 end

data/kontena-cli.gemspec

@@ -23,15 +23,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_runtime_dependency "excon", "~> 0.49.0"
-  spec.add_runtime_dependency "tty-prompt", "0.12.0"
+  spec.add_runtime_dependency "tty-prompt", "0.13.1"
   spec.add_runtime_dependency "clamp", "~> 1.1.0"
   spec.add_runtime_dependency "ruby_dig", "~> 0.0.2"
   spec.add_runtime_dependency "launchy", "~> 2.4.3"
   spec.add_runtime_dependency "hash_validator", "~> 0.7.1"
   spec.add_runtime_dependency "retriable", "~> 2.1.0"
-  spec.add_runtime_dependency "opto", "1.8.5"
+  spec.add_runtime_dependency "opto", "1.8.7"
   spec.add_runtime_dependency "semantic", "~> 1.5"
   spec.add_runtime_dependency "liquid", "~> 4.0.0"
   spec.add_runtime_dependency "tty-table", "~> 0.8.0"
-  spec.add_runtime_dependency "kontena-websocket-client", "~> 0.1.0"
+  spec.add_runtime_dependency "kontena-websocket-client", "~> 0.1.1"
 end

data/lib/kontena/cli/certificate/authorize_command.rb

@@ -1,22 +1,83 @@
+require_relative '../services/services_helper'
 
 module Kontena::Cli::Certificate
   class AuthorizeCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Cli::Services::ServicesHelper
 
+    class DeployFailedError < StandardError; end
 
     parameter "DOMAIN", "Domain to authorize"
 
+    option '--type', 'AUTHORIZATION_TYPE', 'Authorization type, either tls-sni-01 or dns-01', default: 'dns-01'
+    option '--linked-service', "LINKED_SERVICE", 'A service (usually LB) where the tls-sni-01 challenge certificate is bundled to'
+
     def execute
       require_api_url
       token = require_token
 
-      data = {domain: domain}
-      response = client(token).post("certificates/#{current_grid}/authorize", data)
-      puts "Authorization successfully created. Use the following details to create necessary validations:"
-      puts "Record name: #{response['record_name']}.#{domain}"
-      puts "Record type: #{response['record_type']}"
-      puts "Record content: #{response['record_content']}"
+      exit_with_error "Service link needs to be given with tls-sni-01 auth type" if self.type == 'tls-sni-01' && self.linked_service.nil?
+
+      data = {
+        domain: domain,
+        authorization_type: self.type
+      }
+      data['linked_service'] = service_path(self.linked_service) if self.type == 'tls-sni-01'
+      retried = false
+
+      response = nil
+      retry_on_le_registration do
+        response = client(token).post("grids/#{current_grid}/domain_authorizations", data)
+      end
+
+      case self.type
+      when 'dns-01'
+        puts "Authorization successfully created. Use the following details to create necessary validations:"
+        puts "Record name: #{response.dig('challenge_opts', 'record_name')}.#{domain}"
+        puts "Record type: #{response.dig('challenge_opts', 'record_type')}"
+        puts "Record content: #{response.dig('challenge_opts', 'record_content')}"
+      when 'tls-sni-01'
+        state = nil
+        spinner "Waiting for tls-sni-01 certificate to be deployed into #{response.dig('linked_service', 'id').colorize(:cyan)} " do
+          state = wait_for_domain_auth_deployed(token, response['id'])
+        end
+        if state == 'deploy_error'
+          puts "Linked services deploy failed. Check service events for details"
+        else
+          puts "TLS-SNI challenge certificate is deployed, you can now request the actual certificate"
+        end
+      else
+        exit_with_error "Unknown authorization type: #{self.type}"
+      end
+
+    end
+
+    def wait_for_domain_auth_deployed(token, domain_auth_id)
+      state = nil
+      Timeout.timeout(300) {
+        sleep 1 until (state = client(token).get("domain_authorizations/#{domain_auth_id}")['status']) != 'deploying'
+      }
+      state
+    end
+
+    def service_path(linked_service)
+      unless linked_service.include?('/')
+        "null/#{linked_service}"
+      else
+        linked_service
+      end
+    end
+
+    def retry_on_le_registration
+      yield
+    rescue Kontena::Errors::StandardErrorHash => exc
+      raise unless exc.errors.has_key?('le_registration')
+      # Run through registration
+      puts "Let's Encrypt registration missing, creating one."
+      email = prompt.ask("Email for Let's Encrypt:")
+      Kontena.run!(['certificate', 'register', email])
+      yield
     end
   end
 end

data/lib/kontena/cli/certificate/get_command.rb

@@ -4,6 +4,9 @@ module Kontena::Cli::Certificate
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
+    BANNER = "This command is now deprecated in favor of 'kontena certificate request' command".colorize(:red)
+
+    banner BANNER
 
     option '--secret-name', 'SECRET_NAME', 'The name for the secret to store the certificate in'
     option '--cert-type', 'CERT_TYPE', 'The type of certificate to get: fullchain, chain or cert', default: 'fullchain'
@@ -11,16 +14,20 @@ module Kontena::Cli::Certificate
 
 
     def execute
+      puts BANNER
+
       require_api_url
       token = require_token
       secret = secret_name || "LE_CERTIFICATE_#{domain_list[0].gsub('.', '_')}"
       data = {domains: domain_list, secret_name: secret}
+
       response = client(token).post("certificates/#{current_grid}/certificate", data)
       puts "Certificate successfully received and stored into vault with keys:"
       response.each do |secret|
         puts secret.colorize(:green)
       end
       puts "Use the #{secret}_BUNDLE with Kontena loadbalancer!"
+
     end
   end
 end

data/lib/kontena/cli/certificate/list_command.rb

@@ -0,0 +1,75 @@
+require_relative '../services/services_helper'
+
+module Kontena::Cli::Certificate
+  class ListCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Kontena::Cli::TableGenerator::Helper
+    include Kontena::Util
+
+    requires_current_master
+    requires_current_master_token
+    requires_current_grid
+
+    SEVEN_DAYS = 7 * 24 * 60 * 60
+    THREE_DAYS = 3 * 24 * 60 * 60
+
+    def fields
+      quiet? ? ['subject'] : {subject: 'subject', "expiration" => 'expires_in'}
+    end
+
+    def certificates
+      client.get("grids/#{current_grid}/certificates")['certificates']
+    end
+
+    def status_icon(expires_in)
+      icon = '⊛'.freeze
+
+      if expires_in < 0
+        icon.colorize(:red)
+      else
+        icon.colorize(:green)
+      end
+
+    end
+
+    def status_color(expires_in)
+
+      if expires_in < 0
+        :red
+      elsif expires_in < THREE_DAYS
+        :bright_yellow
+      elsif expires_in < SEVEN_DAYS
+        :yellow
+      else
+        :green
+      end
+
+    end
+
+    def expires_in(certificate)
+      valid_until = Time.parse(certificate['valid_until'])
+      (valid_until - Time.now).to_i
+    end
+
+    def expires_in_human(expires_in)
+      if expires_in > 0
+        text = seconds_to_human(expires_in)
+      else
+        text = seconds_to_human(-1 * expires_in) + ' ago'
+      end
+
+      text.colorize(status_color(expires_in))
+    end
+
+    def execute
+      print_table(certificates) do |certificate|
+        expires_in = expires_in(certificate)
+        certificate['subject'] = status_icon(expires_in) + " " + certificate['subject'] unless quiet?
+        next if quiet? # No need to fiddle with colors when they will not get printed
+        certificate['expires_in'] = expires_in_human(expires_in)
+      end
+    end
+
+  end
+end

data/lib/kontena/cli/certificate/register_command.rb

@@ -7,13 +7,24 @@ module Kontena::Cli::Certificate
 
     parameter "EMAIL", "Email to register"
 
+    option '--agree-tos', :flag, "Automatically agree on Let's Encrypt Terms of Service"
+
     def execute
       require_api_url
       token = require_token
 
       data = {email: email}
-      response = client(token).post("certificates/#{current_grid}/register", data)
-      puts 'Email registered to LetsEncrypt'
+
+      if self.agree_tos? || ask_continue
+        response = client(token).post("certificates/#{current_grid}/register", data)
+        puts 'Email registered to LetsEncrypt'
+      end
+    end
+
+    def ask_continue
+      puts "By registering, you agree on Let's Encrypt Terms of Service: https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf"
+      exit_with_error "Registration canceled!" unless prompt.yes?("Continue?")
+      true
     end
   end
 end

data/lib/kontena/cli/certificate/request_command.rb

@@ -0,0 +1,20 @@
+
+module Kontena::Cli::Certificate
+  class RequestCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    parameter "DOMAIN ...", "Domain(s) to get certificate for"
+
+    def execute
+      require_api_url
+      token = require_token
+      data = {domains: domain_list}
+
+      spinner "Requesting certificate for #{domain_list.join(',').colorize(:cyan)} " do
+        response = client(token).post("grids/#{current_grid}/certificates", data)
+      end
+
+    end
+  end
+end

data/lib/kontena/cli/certificate/show_command.rb

@@ -0,0 +1,19 @@
+require_relative '../services/services_helper'
+
+module Kontena::Cli::Certificate
+  class ShowCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    parameter "SUBJECT", "Certificate subject"
+
+    requires_current_master
+    requires_current_master_token
+    requires_current_grid
+
+    def execute
+      certificate = client.get("certificates/#{current_grid}/#{self.subject}")
+      puts YAML.dump(certificate)
+    end
+  end
+end

data/lib/kontena/cli/certificate_command.rb

@@ -1,11 +1,14 @@
 
 class Kontena::Cli::CertificateCommand < Kontena::Command
 
-
+  subcommand ["list", "ls"], "List certificates", load_subcommand('certificate/list_command')
+  subcommand "show", "Show certificate details", load_subcommand('certificate/show_command')
   subcommand "register", "Register to LetsEncrypt", load_subcommand('certificate/register_command')
   subcommand "authorize", "Create DNS authorization for domain", load_subcommand('certificate/authorize_command')
+  subcommand "request", "Request certificate for domain", load_subcommand('certificate/request_command')
   subcommand "get", "Get certificate for domain", load_subcommand('certificate/get_command')
 
+
   def execute
   end
 end

data/lib/kontena/cli/cloud/master/add_command.rb

@@ -47,7 +47,7 @@ module Kontena::Cli::Cloud::Master
       masters = []
       spinner "Retrieving a list of your registered Kontena Masters in Kontena Cloud" do |spin|
         begin
-          masters = Kontena.run!(%w(cloud master list --return))
+          masters = Kontena.run!(%w(cloud master list --return --quiet))
         rescue SystemExit
           spin.fail
         end

data/lib/kontena/cli/common.rb

@@ -117,6 +117,24 @@ module Kontena
         end
       end
 
+      # Output a message like: "> Reading foofoo .."
+      # @param message [String] the message to display
+      # @param dots [TrueClass,FalseClass] set to false if you don't want to add ".." after the message
+      def caret(msg, dots: true)
+        puts "#{pastel.green('>')} #{msg}#{" #{pastel.green('..')}" if dots}"
+      end
+
+      # Run a spinner with a message for the block if a truthy value or a proc returns true.
+      # @example
+      #   spin_if(proc { prompt.yes?("for real?") }, "Doing as requested") do
+      #     # doing stuff
+      #   end
+      #   spin_if(a == 1, "Value of 'a' is 1, so let's do this") do
+      #     # doing stuff
+      #   end
+      # @param obj_or_proc [Object,Proc] something that responds to .call or is truthy/falsey
+      # @param message [String] the message to display
+      # @return anything the block returns
       def spin_if(obj_or_proc, message, &block)
         if (obj_or_proc.respond_to?(:call) && obj_or_proc.call) || obj_or_proc
           spinner(message, &block)
@@ -244,8 +262,8 @@ module Kontena
         if self.respond_to?(:force?) && self.force?
           return
         end
-        exit_with_error 'Command requires --force' unless $stdout.tty? && $stdin.tty?
         puts message if message
+        exit_with_error 'Command requires --force' unless $stdout.tty? && $stdin.tty?
         puts "Destructive command. To proceed, type \"#{name}\" or re-run this command with --force option."
 
         ask("Enter '#{name}' to confirm: ") == name || error("Confirmation did not match #{name}. Aborted command.")
@@ -276,44 +294,14 @@ module Kontena
       def any_key_to_continue_with_timeout(timeout=9)
         return nil if running_silent?
         return nil unless $stdout.tty?
-        start_time = Time.now.to_i
-        end_time   = start_time + timeout
-        Thread.main['any_key.timed_out']   = false
-        msg = "Press any key to continue or ctrl-c to cancel.. (Automatically continuing in ? seconds)"
-
-        reader_thread = Thread.new do
-          Thread.main['any_key.char'] = $stdin.getch
-        end
-
-        countdown_thread = Thread.new do
-          time_left = timeout
-          while time_left > 0 && Thread.main['any_key.char'].nil?
-            print "\r#{pastel.bright_white("#{msg.sub("?", time_left.to_s)}")} "
-            time_left = end_time - Time.now.to_i
-            sleep 0.1
-          end
-          print "\r#{' ' * msg.length}  \r"
-          reader_thread.kill if reader_thread.alive?
-        end
-
-        countdown_thread.join
-
-        if Thread.main['any_key.char'] == "\u0003"
-          error "Canceled"
-        end
+        prompt.keypress("Press any key to continue or ctrl-c to cancel (Automatically continuing in :countdown seconds) ...", timeout: timeout)
       end
 
       def any_key_to_continue(timeout = nil)
         return nil if running_silent?
         return nil unless $stdout.tty?
         return any_key_to_continue_with_timeout(timeout) if timeout
-        msg = "Press any key to continue or ctrl-c to cancel.. "
-        print pastel.bright_cyan("#{msg}")
-        char = $stdin.getch
-        print "\r#{' ' * msg.length}\r"
-        if char == "\u0003"
-          error "Canceled"
-        end
+        prompt.keypress("Press any key to continue or ctrl-c to cancel.. ")
       end
 
       def display_account_login_info

data/lib/kontena/cli/etcd/health_command.rb

@@ -13,47 +13,41 @@ module Kontena::Cli::Etcd
     requires_current_grid
 
     def execute
-      require_api_url
-      token = require_token
-
-      health = true
+      ret = true
 
       if self.node
-        node_health = client.get("nodes/#{current_grid}/#{self.node}/health")
-
-        health = show_node_health(node_health)
+        ret = show_etcd_health("#{current_grid}/#{self.node}")
       else
         nodes = client.get("grids/#{current_grid}/nodes")['nodes']
 
         nodes.each do |node|
-          node_health = client.get("nodes/#{node['id']}/health")
-
-          if !show_node_health(node_health)
-            health = false
+          if !show_etcd_health(node['id'])
+            ret = false
           end
         end
       end
 
-      return health
+      return ret
     end
 
+    # @param id [String] :grid/:node
     # @return [Boolean]
-    def show_node_health(node_health)
-      etcd_health = node_health['etcd_health']
-
-      if !node_health['connected']
-        puts "#{health_icon :offline} Node #{node_health['name']} is offline"
-        return false
-      elsif etcd_health['health']
-        puts "#{health_icon :ok} Node #{node_health['name']} is healthy"
-        return true
-      elsif etcd_health['error']
-        puts "#{health_icon :error} Node #{node_health['name']} is unhealthy: #{etcd_health['error']}"
-        return false
-      else
-        puts "#{health_icon :error} Node #{node_health['name']} is unhealthy"
-        return false
+    def show_etcd_health(id)
+      node_health = client.get("nodes/#{id}/health")
+      etcd_health, status = node_etcd_health(node_health['etcd_health'])
+
+      puts "#{health_icon etcd_health} Node #{node_health['name']} etcd is #{status}"
+
+      return etcd_health == :ok
+      
+    rescue Kontena::Errors::StandardErrorHash => exc
+      raise unless exc.status == 422
+
+      exc.errors.each do |what, error|
+        puts "#{health_icon :offline} Node #{id} #{what} error: #{error}"
       end
+
+      return false
     end
   end
 end