kontena-cli 0.15.5 → 0.16.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 079f30719baffc353268aacf9888a55cdc8bcc47
-  data.tar.gz: 4811e07b537b72b0cc7a38d487e156bab702f005
+  metadata.gz: 6dd79efbf65d99f1a53951c4064ae5361a6f45e7
+  data.tar.gz: 826215936d53f0c1e45896d648c21c3fbd2862b4
 SHA512:
-  metadata.gz: 11cfafd1ca12b7d2035a26279a33ea59f7bf516953abb7ced8d2ae21c3d058bb2324f5701add4b6a5a71c44d5eef951d6250850c724bacdec50c0e02a7ee5104
-  data.tar.gz: d0e72504efba04edc5b35c5a56005f6c408d05887b64d1fb8bdeeeb6238284dbfc2b3597d67b6d0b1576487e6171d5ad0e91433c517fc5936115f547a5f9d15e
+  metadata.gz: 226857ae59df5a8d5e4d9ae3eb22900360ee35eb3dc84754ad242d06c48e04dcc5130f47888abc555c850d438c9757eb716323474125cbb38c84e3e829d2046a
+  data.tar.gz: da4bc3d5892b56af1bb0adc7ab1d1fd2ab581fdcf0284675fa703d5d8ad8c27b1ca81db89ae73e7b78483f023448f1a3876cf82c22c037375ed4104a1eaccce6

data/Dockerfile

@@ -9,12 +9,9 @@ RUN apk update && \
   ca-certificates libssl1.0 openssl libstdc++ && \
   gem install kontena-cli --no-rdoc --no-ri -v ${CLI_VERSION} && \
   adduser kontena -D -h /home/kontena -s /bin/sh && \
-  echo "gem: --user-install" > /home/kontena/.gemrc && \
   chown -R kontena.kontena /home/kontena && \
   chmod +sx /usr/local/bin/docker
 
-ENV PATH=$PATH:/home/kontena/.gem/ruby/2.3.0/bin
-
 VOLUME ["/home/kontena"]
 WORKDIR /home/kontena
 USER kontena

data/Gemfile

@@ -4,5 +4,8 @@ source 'https://rubygems.org'
 gemspec
 group :development, :test do
   gem "rspec"
+  gem 'simplecov', :require => false, :group => :test
   gem "kontena-plugin-hello", path: "./examples/kontena-plugin-hello"
+  gem 'pry', require: false
+  gem 'pry-byebug', require: false
 end

data/LOGO

@@ -0,0 +1,8 @@
+ _               _
+| | _____  _ __ | |_ ___ _ __   __ _
+| |/ / _ \| '_ \| __/ _ \ '_ \ / _` |
+|   < (_) | | | | ||  __/ | | | (_| |
+|_|\_\___/|_| |_|\__\___|_| |_|\__,_|
+-------------------------------------
+Copyright (c)2016 Kontena, Inc.
+

data/VERSION

@@ -1 +1 @@
-0.15.5
+0.16.0.pre1

data/kontena-cli.gemspec

@@ -23,14 +23,13 @@ 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 "colorize", "~> 0.8.1"
+  spec.add_runtime_dependency "tty-prompt", "~> 0.7.1"
   spec.add_runtime_dependency "clamp", "~> 1.0.0"
-  spec.add_runtime_dependency "highline", "~> 1.7.8"
-  spec.add_runtime_dependency "shell-spinner", "~> 1.0.4"
   spec.add_runtime_dependency "ruby_dig", "~> 0.0.2"
   spec.add_runtime_dependency "dry-validation", "0.8.0"
   spec.add_runtime_dependency "dry-types", "0.8.0"
   spec.add_runtime_dependency "dry-configurable", "0.1.6"
   spec.add_runtime_dependency "dry-monads", "0.1.1"
   spec.add_runtime_dependency "dry-logic", "0.3.0"
+  spec.add_runtime_dependency "launchy", "~> 2.4.3"
 end

data/lib/kontena/callback.rb

@@ -0,0 +1,57 @@
+class Kontena::Callback
+
+  attr_reader :command
+
+  def initialize(command)
+    @command = command
+  end
+
+  # Register callback for command types it is supposed to run with.
+  def self.matches_commands(*commands)
+    cmd_types = {}
+    
+    commands.each do |cmd|
+      cmd_class, cmd_type = cmd.split(' ', 2)
+
+      if cmd_class == '*'
+        cmd_class = :all
+      end
+
+      if cmd_type.nil? || cmd_type == '*'
+        cmd_type = :all
+      else
+        cmd_type = cmd_type.to_sym
+      end
+      cmd_types[cmd_class.to_sym] = cmd_type
+    end
+
+    # Finally it should be normalized into a hash that looks like :cmd_class => :cmd_type, :app => :init, :grid => :all
+    cmd_types.each do |cmd_class, cmd_type|
+      Kontena::Callback.callbacks[cmd_class] ||= {}
+      Kontena::Callback.callbacks[cmd_class][cmd_type] ||= []
+      Kontena::Callback.callbacks[cmd_class][cmd_type] << self
+    end
+  end
+
+  def self.callbacks
+    @@callbacks ||= {}
+  end
+
+  def self.run_callbacks(cmd_type, state, obj)
+    [cmd_type.last, :all].compact.uniq.each do |cmdtype|
+      [cmd_type.first, :all].compact.uniq.each do |cmdclass|
+        callbacks.fetch(cmdclass, {}).fetch(cmdtype, []).each do |klass|
+          if klass.instance_methods.include?(state)
+            cb = klass.new(obj)
+            if cb.send(state).kind_of?(FalseClass)
+              ENV["DEBUG"] && puts("Execution aborted by #{klass}")
+              exit 1
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+Dir[File.expand_path('../callbacks/**/*.rb', __FILE__)].sort_by{ |file| File.basename(file) }.each { |file| require file }

data/lib/kontena/callbacks/auth/01_list_and_select_grid_after_master_auth.rb

@@ -0,0 +1,27 @@
+module Kontena
+  module Callbacks
+    class ListAndSelectGrid < Kontena::Callback
+
+      include Kontena::Cli::Common
+
+      matches_commands 'master auth'
+
+      def after_load
+        command.class_eval do
+          option ['--skip-grid-auto-select'], :flag, 'Do not auto select grid'
+        end
+      end
+
+      # Runs kontena grids list --use which will auto join the first available
+      # grid
+      def after
+        return if command.skip_grid_auto_select?
+        return unless current_master
+        return unless command.exit_code == 0
+        return unless current_master.grid.nil?
+
+        Kontena.run('grid list --use --verbose')
+      end
+    end
+  end
+end

data/lib/kontena/callbacks/master/01_clear_current_master_after_terminate.rb

@@ -0,0 +1,20 @@
+module Kontena
+  module Callbacks
+    class ClearCurrentMasterAfterTerminate < Kontena::Callback
+
+      include Kontena::Cli::Common
+
+      matches_commands 'master terminate'
+
+      def after
+        return unless command.exit_code == 0
+        return unless config.current_master
+
+        ENV["DEBUG"] && puts("Removing current master from config")
+        config.servers.delete_at(config.find_server_index(config.current_master.name))
+        config.current_server = nil
+        config.write
+      end
+    end
+  end
+end

data/lib/kontena/callbacks/master/deploy/01_show_logo_before_deploy.rb

@@ -0,0 +1,15 @@
+module Kontena
+  module Callbacks
+    class DisplayLogoBeforeMasterDeploy < Kontena::Callback
+
+      include Kontena::Cli::Common
+
+      matches_commands 'master create'
+
+      def before
+        display_logo
+      end
+    end
+  end
+end
+

data/lib/kontena/callbacks/master/deploy/05_before_deploy_configuration_wizard.rb

@@ -0,0 +1,124 @@
+module Kontena
+  module Callbacks
+    class BeforeDeployConfigurationWizard < Kontena::Callback
+
+      include Kontena::Cli::Common
+
+      matches_commands 'master create'
+
+      def after_load
+        command.class_eval do
+          option ['--no-prompt'], :flag, "Don't ask questions"
+          option ['--skip-auth-provider'], :flag, "Skip auth provider configuration (single user mode)"
+          option ['--cloud-master-id'], '[ID]', "Use Kontena Cloud Master ID for auth provider configuration"
+        end
+      end
+
+      def unless_param(param, &block)
+        return if command.respond_to?(param) && !command.send(param).nil?
+        return if command.respond_to?("#{param}?".to_sym) && command.send("#{param}?".to_sym)
+        yield
+      end
+
+      # Scans config server names and returns default-2 if default exists,
+      # default-3 if default-2 exists, etc.
+      def next_default_name
+        last_default = config.servers.map(&:name).select{ |n| n =~ /default(?:\-\d+)?$/ }.sort.last
+        return "default" unless last_default
+        unless last_default =~ /\d$/
+          last_default << "-1"
+        end
+        last_default.succ
+      end
+
+      def login_to_kontena
+        if kontena_auth?
+          return true if cloud_client.authentication_ok?(kontena_account.userinfo_endpoint)
+        end
+        puts
+        puts "You don't seem to be logged in to Kontena Cloud"
+        puts
+        Kontena.run("cloud login --verbose")
+        cloud_client.authentication_ok?(kontena_account.userinfo_endpoint)
+      end
+
+      def select_cloud_master
+        masters = []
+        spinner "Retrieving a list of registered masters on your Kontena Cloud account" do
+          masters = cloud_client.get("user/masters")["data"]
+        end
+        if masters.empty?
+          puts
+          puts "You have no registered masters. Adding a new master."
+          puts
+          return create_cloud_master
+        else
+          puts
+          return prompt.select("Select master") do |menu|
+            masters.each do |master|
+              name       = master['attributes']['name']
+              url        = master['attributes']['url']
+              master_id  = master['id']
+              menu.choice "#{master['attributes']['name']} (#{url.nil? ? "setup not done" : url})", master_id
+            end
+          end
+        end
+      end
+
+      def create_cloud_master
+        master_id = nil
+        spinner "Registering a new cloud master '#{command.name}'" do
+          master_id = Kontena.run("cloud master add --return #{command.name}", returning: :result)
+        end
+        if master_id.to_s =~ /^[0-9a-f]{16,32}$/
+          master_id
+        else
+          abort 'Cloud Master registration failed'
+        end
+      end
+
+      def before
+        unless_param(:name) do
+          if command.no_prompt?
+            command.name = next_default_name
+          else
+            command.name = prompt.ask("Enter a name for this Kontena Master: ", default: next_default_name, required: true) do |q|
+              q.validate /^[a-z0-9\_\-\.]+$/, 'Name should only include lower case letters, numbers and -._, example: "master-4"'
+            end
+          end
+        end
+
+        unless_param(:skip_auth_provider) do
+          if command.no_prompt?
+            command.cloud_master_id ||= create_cloud_master
+          elsif command.cloud_master_id.nil?
+            answer = prompt.select("Select user authentication provider") do |menu|
+              menu.choice 'Kontena Cloud (add a new master)', :kontena_new
+              menu.choice 'Kontena Cloud (use an existing master)', :kontena_existing
+              menu.choice 'Custom', :custom
+              menu.choice 'None (single user mode)', :none
+            end
+            case answer
+            when :kontena_new, :kontena_existing
+              login_to_kontena || abort('You must login to Kontena Cloud')
+              if answer == :kontena_new
+                command.cloud_master_id = create_cloud_master
+              else
+                command.cloud_master_id = select_cloud_master
+              end
+            when :custom
+              puts 'Learn how to configure custom user authentication provider after installation at: www.kontena.io/docs/configuring-custom-auth-provider'
+            when :none
+              puts "You have selected to use Kontena Master in single user mode. You can configure an authentication provider later. For more information, see here: www.kontena.io/docs/configuring-custom-auth-provider"
+            else
+              abort 'Should never be here'
+            end
+          end
+          command.skip_auth_provider = !command.cloud_master_id.nil?
+        end
+      end
+    end
+  end
+end
+
+

data/lib/kontena/callbacks/master/deploy/50_authenticate_after_deploy.rb

@@ -0,0 +1,53 @@
+
+module Kontena
+  module Callbacks
+    class AuthenticateAfterDeploy < Kontena::Callback
+
+      include Kontena::Cli::Common
+
+      matches_commands 'master create'
+
+      def after
+        ENV["DEBUG"] && puts("Command result: #{command.result.inspect}")
+        ENV["DEBUG"] && puts("Command exit code: #{command.exit_code.inspect}")
+        return unless command.exit_code == 0
+        return unless command.result.kind_of?(Hash)
+        return unless command.result.has_key?(:public_ip)
+        return unless command.result.has_key?(:code)
+        return unless command.result.has_key?(:name)
+
+        # In case there already is a server with the same name add random characters to name
+        if config.find_server(command.result[:name])
+          command.result[:name] = "#{command.result[:name]}-#{SecureRandom.hex(2)}"
+        end
+
+        new_master = Kontena::Cli::Config::Server.new(
+          url: "https://#{command.result[:public_ip]}",
+          name: command.result[:name]
+        )
+
+        retried = false
+
+        # Figure out if HTTPS works, if not, try HTTP
+        begin
+          ENV["DEBUG"] && puts("Trying to request / from #{new_master.url}")
+          client = Kontena::Client.new(new_master.url, nil, ignore_ssl_errors: true)
+          client.get('/')
+        rescue
+          ENV["DEBUG"] && puts("HTTPS test failed: #{$!} #{$!.message}")
+          unless retried
+            new_master.url = "http://#{command.result[:public_ip]}"
+            retried = true
+            retry
+          end
+          return
+        end
+
+        require 'shellwords'
+        cmd = "master login --verbose --name #{command.result[:name].shellescape} --code #{command.result[:code].shellescape} #{new_master.url.shellescape}"
+        ENV["DEBUG"] && puts("Running: #{cmd}")
+        Kontena.run(cmd)
+      end
+    end
+  end
+end

data/lib/kontena/callbacks/master/deploy/55_create_initial_grid_after_deploy.rb

@@ -0,0 +1,32 @@
+module Kontena
+  module Callbacks
+    # Runs kontena master auth-provider config after deployment if
+    # auth provider configuration options have been supplied.
+    #
+    # Runs the config command with --preset kontena if the user has
+    # authenticated to Kontena unless --no-auth-config is used.
+    class CreateInitialGridAfterDeploy < Kontena::Callback
+
+      include Kontena::Cli::Common
+
+      matches_commands 'master create'
+
+      def after
+        return unless command.exit_code == 0
+        return unless config.current_master
+        return unless config.current_master.name == command.result[:name]
+
+        cmd = "grid create --silent test"
+        ENV["DEBUG"] && puts("Running: #{cmd}")
+      
+        spinner "Creating initial grid 'test'" do
+          Kontena.run(cmd)
+        end
+
+        spinner "Selecting 'test' as current grid" do
+          Kontena.run("grid use test")
+        end
+      end
+    end
+  end
+end

data/lib/kontena/callbacks/master/deploy/60_configure_auth_provider_after_deploy.rb

@@ -0,0 +1,49 @@
+module Kontena
+  module Callbacks
+    class ConfigureAuthProviderAfterDeploy < Kontena::Callback
+
+      include Kontena::Cli::Common
+
+      matches_commands 'master create'
+
+      def get_oauth_app_config(master_id)
+        attrs = nil
+        spinner "Retrieving master OAuth2 application settings from Kontena Cloud" do
+          attrs = cloud_client.get("user/masters/#{master_id}")["data"]["attributes"]
+        end
+        attrs
+      rescue
+        nil
+      end
+
+      def configure_auth_provider(oauth_config)
+        require 'shellwords'
+        spinner "Setting Kontena Cloud authentication provider base settings to Master config" do
+          Kontena.run("master config import --force --preset kontena_auth_provider")
+        end
+        spinner "Setting Kontena Cloud authentication provider consumer credentials to Master config" do
+          Kontena.run("master config set oauth2.client_id=#{oauth_config['client-id'].shellescape} oauth2.client_secret=#{oauth_config['client-secret'].shellescape} server.root_url=#{config.current_master.url.shellescape}")
+        end
+      end
+
+      def after
+        return unless command.exit_code == 0
+        return unless command.result.kind_of?(Hash)
+        return unless command.result.has_key?(:name)
+        return unless config.current_master
+        return unless config.current_master.name == command.result[:name]
+        if command.respond_to?(:skip_auth_provider) && command.skip_auth_provider?
+          return
+        end
+
+        if command.respond_to?(:cloud_master_id) && command.cloud_master_id
+          oauth_config = get_oauth_app_config(command.cloud_master_id)
+          if oauth_config
+            configure_auth_provider(oauth_config)
+          end
+        end
+      end
+    end
+  end
+end
+