kontena-cli 0.16.0.pre7 → 0.16.0.pre8

data/lib/kontena/cli/cloud/login_command.rb

@@ -79,7 +79,7 @@ module Kontena::Cli::Cloud
       any_key_to_continue(10)
 
       puts "If the browser does not open, try visiting this URL manually:"
-      puts "<#{uri.to_s}>"
+      puts "#{uri.to_s}"
       puts
 
       server_thread  = Thread.new { Thread.main['response'] = web_server.serve_one }
@@ -116,7 +116,7 @@ module Kontena::Cli::Cloud
 
       response = client.get(path) rescue nil
       if response && response.kind_of?(Hash)
-        kontena_account.username = response['username']
+        kontena_account.username = response['data']['attributes']['username']
         config.write
         display_logo
         display_login_info(only: :account)

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

@@ -7,47 +7,127 @@ module Kontena::Cli::Cloud::Master
 
     requires_current_account_token
 
-    parameter "NAME", "Master name"
+    parameter "[NAME]", "Master name"
 
-    option ['--redirect-uri'], '[URL]',      'Se master redirect URL'
-    option ['--url'],          '[URL]',      'Se master URL'
-    option ['--provider'],     '[NAME]',     'Se master provider'
-    option ['--name'],         '[NAME]',     'Se master name',        hidden: true
-    option ['--version'],      '[VERSION]',  'Se master version',     hidden: true
-    option ['--owner'],        '[NAME]',     'Se master owner',       hidden: true
+    option ['--redirect-uri'], '[URL]',      'Set master redirect URL'
+    option ['--url'],          '[URL]',      'Set master URL'
+    option ['--provider'],     '[NAME]',     'Set master provider'
+    option ['--name'],         '[NAME]',     'Set master name',        hidden: true
+    option ['--version'],      '[VERSION]',  'Set master version',     hidden: true
+    option ['--owner'],        '[NAME]',     'Set master owner',       hidden: true
 
-    option ['--id'], :flag, 'Just output the ID'
-    option ['--arg'], :flag, 'Output as command line arguments'
+    option ['--id'],      :flag, 'Just output the ID'
+    option ['--return'],  :flag, 'Return the ID', hidden: true
+    option ['--force'],   :flag, "Don't ask questions"
 
-    option ['--return'], :flag, 'Return the ID', hidden: true
+    option ['--cloud-master-id'], '[ID]', "Use existing cloud master ID", hidden: true
+    option ['--current'], :flag, 'Register and configure current master', hidden: true
 
-    def execute
-      attributes = { 'name' => self.name }
-      attributes['url'] = self.url if self.url
-      attributes['provider'] = self.provider if self.provider
-      attributes['redirect-uri'] = self.redirect_uri if self.redirect_uri
-      attributes['version'] = self.version if self.version
-      attributes['owner'] = self.owner if self.owner
+    def register(name, url = nil, provider = nil, redirect_uri = nil, version = nil, owner = nil)
+      attributes = {}
+      attributes['name']         = name 
+      attributes['url']          = url if url
+      attributes['provider']     = provider if provider
+      attributes['redirect-uri'] = redirect_uri if redirect_uri
+      attributes['version']      = version if version
+      attributes['owner']        = owner if owner
 
       response = cloud_client.post('user/masters', { data: { attributes: attributes } })
-      if response.kind_of?(Hash)
-        if response['error']
-          puts "Failed: #{response['error']}"
-          exit 1
-        else
-          if self.return?
-            return response['data']['id']
-          elsif self.id?
-            puts response['data']['id']
-          elsif self.arg?
-            puts "--client-id #{response['data']['attributes']['client-id']} --client-secret #{response['data']['attributes']['client-secret']}"
-          else
-            puts "Created master.".colorize(:green)
-            puts "ID: #{response['data']['id']}"
-            puts "Client ID: #{response['data']['attributes']['client-id']}"
-            puts "Client Secret: #{response['data']['attributes']['client-secret']}"
-          end
+      exit_with_error "Failed (invalid response)" unless response.kind_of?(Hash)
+      exit_with_error "Failed (no data)" unless response['data']
+      exit_with_error "Failed: #{response['error']}" if response['error']
+      response
+    end
+
+    def get_existing(id)
+      cloud_client.get("user/masters/#{id}")
+    end
+
+    def cloud_masters
+      masters = []
+      spinner "Retrieving a list of your registered Kontena Masters in Kontena Cloud" do |spin|
+        begin
+          masters = Kontena.run("cloud master list --return", returning: :result)
+        rescue SystemExit
+          spin.fail
+        end
+      end
+      masters
+    end
+
+    def new_cloud_master_name(master_name)
+      masters = cloud_masters
+      return master_name if masters.empty?
+
+      existing_master = masters.find { |m| m['attributes']['name'] == master_name }
+      return master_name unless existing_master
+
+      new_name = "#{master_name}-2"
+      new_name.succ! until masters.find { |m| m['attributes']['name'] == new_name }.nil?
+      new_name
+    end
+
+    def register_current
+      require_api_url
+      require_token
+
+      unless self.force?
+        puts "Proceeding will:"
+        puts " * Register the Kontena Master #{current_master.name} to Kontena Cloud"
+        puts " * Configure the Kontena Master to use Kontena Cloud as the"
+        puts "   authentication provider"
+        puts
+        puts "After this:"
+        puts " * Users will not be able to reauthenticate without authorizing the"
+        puts "   Master to access their Kontena Cloud user information"
+        puts " * Users that have registered a different email address to Kontena"
+        puts "   Cloud than the one they currently have as their username in the"
+        puts "   master will not be able to authenticate before an administrator"
+        puts "   of the Kontena Master creates an invitation code for them"
+        puts "   (kontena master users invite old@email.example.com)"
+        exit_with_error "Aborted" unless prompt.yes?("Proceed?")
+      end
+
+      new_name = new_cloud_master_name(current_master.name)
+
+      if self.cloud_master_id
+        response = spinner "Retrieving Master information from Kontena Cloud using id" do
+          get_existing(self.cloud_master_id)
         end
+      else
+        response = spinner "Registering current Kontena Master '#{current_master.name}' #{" as '#{new_name}' " unless new_name == current_master.name}to Kontena Cloud" do
+          register(new_name, current_master.url)
+        end
+      end
+
+      spinner "Loading Kontena Cloud auth provider base configuration to Kontena Master" do
+        Kontena.run('master config import --force --preset kontena_auth_provider')
+      end
+
+      spinner "Updating OAuth2 client-id and client-secret to Kontena Master" do
+        Kontena.run("master config set oauth2.client_id=#{response['data']['attributes']['client-id'].shellescape} oauth2.client_secret=#{response['data']['attributes']['client-secret'].shellescape} server.root_url=#{current_master.url.shellescape} server.name=#{current_master.name.shellescape} cloud.provider_is_kontena=true")
+      end
+    end
+
+    def execute
+      unless cloud_client.authentication_ok?(kontena_account.userinfo_endpoint)
+        Kontena.run('cloud login')
+      end
+
+      return register_current if self.current?
+
+      exit_with_error 'Master name is required' unless self.name
+
+      response = register(self.name, self.url, self.provider, self.redirect_uri, self.version, self.owner)
+      if self.return?
+        return response['data']['id']
+      elsif self.id?
+        puts response['data']['id']
+      else
+        puts "Registered master.".colorize(:green)
+        puts "ID: #{response['data']['id']}"
+        puts "Client ID: #{response['data']['attributes']['client-id']}"
+        puts "Client Secret: #{response['data']['attributes']['client-secret']}"
       end
     end
   end

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

@@ -5,18 +5,21 @@ module Kontena::Cli::Cloud::Master
 
     callback_matcher 'cloud-master', 'list'
 
+    option '--return', :flag, 'Return the list', hidden: true
+
     requires_current_account_token
 
     def execute
       response = cloud_client.get('user/masters')
       unless response && response.kind_of?(Hash) && response['data'].kind_of?(Array)
-        puts "Listing masters failed".colorize(:red)
-        exit 1
+        abort "Listing masters failed".colorize(:red)
       end
 
       if response['data'].empty?
+        return [] if self.return?
         puts "No masters registered"
       else
+        return response['data'] if self.return?
         puts '%-26.26s %-24s %-12s %s' % ['ID', 'NAME', 'OWNER', 'URL']
         response['data'].each do |data|
           attr = data['attributes']

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

@@ -0,0 +1,69 @@
+module Kontena::Cli::Cloud::Master
+  class RemoveCommand < Kontena::Command
+
+    include Kontena::Cli::Common
+
+    callback_matcher 'cloud-master', 'delete'
+
+    requires_current_account_token
+
+    parameter "[MASTER_ID]", "Master ID"
+
+    option ['-f', '--force'], :flag, "Don't ask for confirmation"
+
+    def delete_server(id)
+      spinner "Deleting server #{id} from Kontena Cloud" do |spin|
+        begin
+          cloud_client.delete("user/masters/#{id}")
+        rescue
+          spin.fail
+        end
+      end
+    end
+
+    def run_interactive
+      response = nil
+      spinner "Retrieving a list of registered masters on Kontena Cloud" do
+        response = cloud_client.get('user/masters')
+        unless response && response.kind_of?(Hash) && response['data'].kind_of?(Array)
+          abort 'Listing masters failed'.colorize(:red)
+        end
+      end
+
+      if response['data'].empty?
+        puts "No registered masters"
+        return
+      end
+
+      servers_to_delete = prompt.multi_select("Select registered master(s) to delete:") do |menu|
+        response['data'].each do |server|
+          menu.choice "#{server['attributes']['name']} (#{server['attributes']['url'] || "?"})", server['id']
+        end
+      end
+
+      if servers_to_delete.empty?
+        puts "No masters selected"
+      else
+        puts "About to delete servers from Kontena Cloud:"
+        servers_to_delete.each do |id|
+          puts " * #{id}"
+        end
+        confirm unless self.force?
+        servers_to_delete.each do |id|
+          delete_server(id)
+        end
+      end
+    end
+
+    def execute
+      if self.master_id.nil?
+        run_interactive
+      else
+        confirm unless self.force?
+        delete_server(self.master_id)
+      end
+      exit 0
+    end
+  end
+end
+

data/lib/kontena/cli/cloud/master_command.rb

@@ -1,6 +1,6 @@
 require_relative 'master/add_command'
 require_relative 'master/list_command'
-require_relative 'master/delete_command'
+require_relative 'master/remove_command'
 require_relative 'master/update_command'
 require_relative 'master/show_command'
 
@@ -9,8 +9,8 @@ module Kontena::Cli::Cloud
     include Kontena::Cli::Common
 
     subcommand ['list', 'ls'], "List masters in Kontena Cloud", Kontena::Cli::Cloud::Master::ListCommand
+    subcommand ['remove', 'rm'], "Remove a master registration from Kontena Cloud", Kontena::Cli::Cloud::Master::RemoveCommand
     subcommand "add", "Register a master in Kontena Cloud", Kontena::Cli::Cloud::Master::AddCommand
-    subcommand "delete", "Delete a master in Kontena Cloud", Kontena::Cli::Cloud::Master::DeleteCommand
     subcommand "show", "Show master settings in Kontena Cloud", Kontena::Cli::Cloud::Master::ShowCommand
     subcommand "update", "Update master settings in Kontena Cloud", Kontena::Cli::Cloud::Master::UpdateCommand
 

data/lib/kontena/cli/common.rb

@@ -151,7 +151,7 @@ module Kontena
         @kontena_account ||= config.find_account(ENV['KONTENA_ACCOUNT'] || 'kontena')
       end
 
-      def kontena_auth?
+      def cloud_auth?
         return false unless kontena_account
         return false unless kontena_account.token
         return false unless kontena_account.token.access_token
@@ -289,33 +289,26 @@ module Kontena
         return nil unless $stdout.tty?
         start_time = Time.now.to_i
         end_time   = start_time + timeout
-        Thread.main['any_key.stop_prompt'] = false
         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.stop_prompt']
-            print "\r#{pastel.bright_cyan("#{msg.sub("?", time_left.to_s)}")} "
+          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"
-          Thread.main['any_key.timed_out'] = true
-        end
-
-        reader_thread = Thread.new do
-          Thread.main['any_key.char'] = STDIN.getch
-          Thread.main['any_key.stop_prompt'] = true
+          reader_thread.kill if reader_thread.alive?
         end
 
         countdown_thread.join
 
-        until Thread.main['any_key.char'] || Thread.main['any_key.timed_out']
-          sleep 0.1
-        end
-
-        reader_thread.kill if reader_thread.alive?
-
         if Thread.main['any_key.char'] == "\u0003"
           error "Canceled"
         end
@@ -355,7 +348,7 @@ module Kontena
       def display_master_login_info
         server = config.current_master
         if server
-          if server.token && server.access_token
+          if server.token && server.token.access_token
             puts [
               pastel.green('Authenticated to Kontena Master'),
               pastel.yellow(server.name),

data/lib/kontena/cli/config.rb

@@ -25,6 +25,7 @@ module Kontena
       class TokenExpiredError < StandardError;  end
 
       def initialize
+        super
         @logger = Logger.new(STDOUT)
         @logger.level = ENV["DEBUG"].nil? ? Logger::INFO : Logger::DEBUG
         @logger.progname = 'CONFIG'
@@ -116,9 +117,9 @@ module Kontena
         {
           name: 'kontena',
           url: 'https://cloud-api.kontena.io',
-          token_endpoint: 'https://auth2.kontena.io/v1/oauth2/token',
-          authorization_endpoint: 'https://cloud-beta.kontena.io/login/oauth/authorize',
-          userinfo_endpoint: 'https://auth2.kontena.io/v1/user',
+          token_endpoint: 'https://cloud-api.kontena.io/oauth2/token',
+          authorization_endpoint: 'https://cloud.kontena.io/login/oauth/authorize',
+          userinfo_endpoint: 'https://cloud-api.kontena.io/user',
           token_post_content_type: 'application/x-www-form-urlencoded',
           code_requires_basic_auth: false,
           token_method: 'post',

data/lib/kontena/cli/grids/env_command.rb

@@ -19,13 +19,13 @@ module Kontena::Cli::Grids
         grid = find_grid_by_name(name_or_current)
         exit_with_error("Grid not found") unless grid
 
+        grid_uri = self.current_master['url'].sub('http', 'ws')
+
+
         prefix = export? ? 'export ' : ''
 
-        server = settings['servers'].find{|s| s['name'] == settings['current_server']}
-        if server
-          puts "#{prefix}KONTENA_URI=#{server['url'].sub('http', 'ws')}"
-          puts "#{prefix}KONTENA_TOKEN=#{server['token']}"
-        end
+        puts "#{prefix}KONTENA_URI=#{grid_uri}"
+        puts "#{prefix}KONTENA_TOKEN=#{grid['token']}"
       end
     end
   end

data/lib/kontena/cli/localhost_web_server.rb

@@ -17,7 +17,7 @@ module Kontena
     attr_accessor :server, :success_response, :error_response, :port
 
     DEFAULT_ERROR_MESSAGE   = "Bad request"
-    SUCCESS_URL             = "https://cloud-beta.kontena.io/terminal-success"
+    SUCCESS_URL             = "https://cloud.kontena.io/terminal-success"
       
     # Get new server instance
     #

data/lib/kontena/cli/master/init_cloud_command.rb

@@ -0,0 +1,21 @@
+module Kontena::Cli::Master
+  class InitCloudCommand < Kontena::Command
+
+    include Kontena::Cli::Common
+
+    banner "Configures the current Kontena Master to use Kontena Cloud services and authentication"
+
+    option '--force',           :flag,  "Don't ask questions"
+    option '--cloud-master-id', '[ID]', "Use existing cloud master ID"
+
+    requires_current_master
+    requires_current_account_token
+
+    def execute
+      args = ["--current"]
+      args << "--force" if self.force?
+      args << "--cloud-master-id #{self.cloud_master_id}" if self.cloud_master_id
+      Kontena.run("cloud master add #{args.map(&:shellescape).join(' ')}")
+    end
+  end
+end

data/lib/kontena/cli/master/login_command.rb

@@ -17,6 +17,8 @@ module Kontena::Cli::Master
     option ['-f', '--force'], :flag, 'Force reauthentication'
     option ['-s', '--silent'], :flag, 'Reduce output verbosity'
 
+    option ['--no-login-info'], :flag, "Don't show login info", hidden: true
+
     def execute
       # rewrites self.url
       use_current_master_if_available || use_master_by_name
@@ -28,14 +30,18 @@ module Kontena::Cli::Master
       set_server_token(server)
 
       # set server token by exchanging code if --code given
-      use_authorization_code(server) if self.code
+      use_authorization_code(server, self.code) if self.code
 
       client = Kontena::Client.new(server.url, server.token)
 
       # Unless an invitation code was supplied, check auth and exit
       # if it works already.
       unless self.join || self.force?
-        exit_if_auth_works(server)
+        if auth_works?(server)
+          config.write
+          display_login_info(only: :master) unless self.no_login_info?
+          exit 0
+        end
       end
 
       # no local browser? tell user to launch an external one
@@ -50,22 +56,14 @@ module Kontena::Cli::Master
 
       # If the master responds with a code, then exchange it to a token
       if response['code']
-        vspinner "Exchanging authorization code for an access token from Kontena Master" do
-          response = client.exchange_code(response['code'])
-          unless response && response.kind_of?(Hash) && response['access_token']
-            exit_with_error "Code exchange failed"
-          end
-        end
-      end
-
-      if response['access_token']
+        use_authorization_code(server, response['code'])
+      elsif response['access_token']
         update_server_token(server, response)
         update_server_name(server, response)
         config.current_server = server.name
-        config.write
-        display_login_info(only: :master) unless running_silent?
-        exit 0
       end
+      config.write
+      display_login_info(only: :master) unless (running_silent? || self.no_login_info?)
     end
 
     def master_account
@@ -116,40 +114,41 @@ module Kontena::Cli::Master
       end
     end
 
-    def use_authorization_code(server)
-      vspinner "Exchanging authorization code for an access token from Master" do
+    def use_authorization_code(server, code)
+      vspinner "Exchanging authorization code for an access token from Kontena Master" do
         client = Kontena::Client.new(server.url, server.token)
-        response = client.exchange_code(self.code)
+        response = client.exchange_code(code) rescue nil
 
         if response && response.kind_of?(Hash) && !response.has_key?('error')
-          server.token.access_token = response['access_token']
-          server.token.refresh_token = response['refresh_token']
-          server.token.expires_at = response['expires_in'].to_i > 0 ? Time.now.utc.to_i + response['expires_in'].to_i : nil
-          server.token.username = response['user']['name'] || response['user']['email']
-          server.username = server.token.username
           if response['server'] && response['server']['name']
             server.name ||= response['server']['name']
+            server.username = response['user']['name'] || response['user']['email']
             config.current_server = server.name
           end
+
+          server.token = Kontena::Cli::Config::Token.new(
+            access_token: response['access_token'],
+            refresh_token: response['refresh_token'],
+            expires_at: response['expires_in'].to_i > 0 ? Time.now.utc.to_i + response['expires_in'].to_i : nil,
+          )
         else
           raise Kontena::Errors::StandardError.new(500, 'Code exchange failed')
         end
       end
+      true
     end
 
-    def exit_if_auth_works(server)
+    def auth_works?(server)
       if server && server.token && server.token.access_token
         # See if the existing or supplied authentication works without reauthenticating
         auth_ok = false
         vspinner "Testing if authentication works using current access token" do
           auth_ok = Kontena::Client.new(server.url, server.token).authentication_ok?(master_account.userinfo_endpoint)
-        end
-        if auth_ok
           config.current_master = server.name
-          config.write
-          display_login_info(only: :master) unless running_silent?
-          exit 0
         end
+        auth_ok
+      else
+        false
       end
     end
 
@@ -225,7 +224,7 @@ module Kontena::Cli::Master
       any_key_to_continue(10)
 
       puts "If the browser does not open, try visiting this URL manually:"
-      puts "<#{uri.to_s}>"
+      puts "#{uri.to_s}"
       puts
 
       server_thread  = Thread.new { Thread.main['response'] = web_server.serve_one }