kontena-cli 0.16.0.pre1 → 0.16.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dd79efbf65d99f1a53951c4064ae5361a6f45e7
-  data.tar.gz: 826215936d53f0c1e45896d648c21c3fbd2862b4
+  metadata.gz: 1dc5728b1347004899b102ebd4866c211042e5a0
+  data.tar.gz: 9db1ef29e2fc497e4714601c853fa05e8a348b7d
 SHA512:
-  metadata.gz: 226857ae59df5a8d5e4d9ae3eb22900360ee35eb3dc84754ad242d06c48e04dcc5130f47888abc555c850d438c9757eb716323474125cbb38c84e3e829d2046a
-  data.tar.gz: da4bc3d5892b56af1bb0adc7ab1d1fd2ab581fdcf0284675fa703d5d8ad8c27b1ca81db89ae73e7b78483f023448f1a3876cf82c22c037375ed4104a1eaccce6
+  metadata.gz: c6e669442d78dd7bed60f5946f45827f974db78c57f27a8c5d7443d6af316b816f3fd4d1a64bf5f53231964cdd1b3e5390d2c196381195d2bf383d2d10eecfa2
+  data.tar.gz: f965ff386e19547fafec5949b224eaaf3c8231a679232f8969ad3629922853eec714d4d6c760328caa00e0472cf720484210bc4dcc6a56ef12dde06038596911

data/Dockerfile

@@ -5,7 +5,7 @@ ADD https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 /usr/local/bin/dock
 ARG CLI_VERSION
 
 RUN apk update && \
-  apk --update add ruby ruby-json ruby-bigdecimal \
+  apk --update add ruby ruby-json ruby-bigdecimal ruby-io-console \
   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 && \

data/VERSION

@@ -1 +1 @@
-0.16.0.pre1
+0.16.0.pre2

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

@@ -23,8 +23,8 @@ module Kontena
       # 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
+        last_default = config.servers.map(&:name).select{ |n| n =~ /kontena\-master(?:\-\d+)?$/ }.sort.last
+        return "kontena-master" unless last_default
         unless last_default =~ /\d$/
           last_default << "-1"
         end
@@ -42,33 +42,13 @@ module Kontena
         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)
+        begin
+          spinner "Registering a new master '#{command.name}' to Kontena Cloud" do
+            master_id = Kontena.run("cloud master add --return #{command.name}", returning: :result)
+          end
+        rescue SystemExit
         end
         if master_id.to_s =~ /^[0-9a-f]{16,32}$/
           master_id
@@ -92,30 +72,34 @@ module Kontena
           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
+            answer = prompt.select("Select OAuth2 authentication provider: ") do |menu|
+              menu.choice 'Kontena Cloud (recommended)', :kontena_new
               menu.choice 'Custom', :custom
               menu.choice 'None (single user mode)', :none
             end
             case answer
-            when :kontena_new, :kontena_existing
+            when :kontena_new
               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
+              command.cloud_master_id = create_cloud_master
+              command.skip_auth_provider = false
             when :custom
+              puts
               puts 'Learn how to configure custom user authentication provider after installation at: www.kontena.io/docs/configuring-custom-auth-provider'
+              puts
+              command.cloud_master_id = nil
+              command.skip_auth_provider = true
             when :none
+              puts
               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"
+              puts
+              command.cloud_master_id = nil
+              command.skip_auth_provider = true
             else
               abort 'Should never be here'
             end
           end
-          command.skip_auth_provider = !command.cloud_master_id.nil?
         end
+        true
       end
     end
   end

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

@@ -18,10 +18,8 @@ module Kontena
 
       def configure_auth_provider(oauth_config)
         require 'shellwords'
-        spinner "Setting Kontena Cloud authentication provider base settings to Master config" do
+        spinner "Setting Kontena Cloud authentication provider 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

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

@@ -67,11 +67,11 @@ module Kontena::Cli::Cloud
       uri.query = URI.encode_www_form(params)
 
       puts "Opening a browser to #{uri.scheme}://#{uri.host}"
-      puts
-      puts "If you are running this command over an ssh connection or it's"
-      puts "otherwise not possible to open a browser from this terminal"
-      puts "then you must use a pregenerated access token using the --token"
-      puts "option : kontena cloud login --token <access_token>"
+      #puts
+      #puts "If you are running this command over an ssh connection or it's"
+      #puts "otherwise not possible to open a browser from this terminal"
+      #puts "then you must use a pregenerated access token using the --token"
+      #puts "option : kontena cloud login --token <access_token>"
       puts
       puts "Once the authentication is complete you can close the browser"
       puts "window or tab and return to this window to continue."
@@ -85,7 +85,9 @@ module Kontena::Cli::Cloud
       server_thread  = Thread.new { Thread.main['response'] = web_server.serve_one }
       browser_thread = Thread.new { Launchy.open(uri.to_s) }
       
-      server_thread.join
+      vspinner "Waiting for browser authorization response" do
+        server_thread.join
+      end
       browser_thread.join
 
       response = Thread.main['response']

data/lib/kontena/cli/master/config/import_command.rb

@@ -10,9 +10,9 @@ module Kontena::Cli::Master::Config
 
     parameter '[PATH]', "Input from file in PATH, default: STDIN", required: false
 
-    option ['--preset'], '[NAME]', 'Load preset'
+    option ['--preset'], '[NAME]', 'Load preset', hidden: true
 
-    option ['--format'], '[FORMAT]', "Specify output format (json, yaml) (default: guess from PATH or json)"
+    option ['--format'], '[FORMAT]', "Specify input format (json, yaml) (default: guess from PATH or json)"
     option ['--full'], :flag, "Perform full update, keys that are not present in the input are cleared"
     option ['-f', '--force'], :flag, "Don't ask for confirmation"
 

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

@@ -1,3 +1,5 @@
+#TODO: Something wrong with picking up wrong server in config using the url,
+#maybe remove that part altogether.
 require 'uri'
 
 module Kontena::Cli::Master
@@ -92,8 +94,8 @@ module Kontena::Cli::Master
     end
 
     def find_server_or_create_new(url)
-      existing_server = config.find_server_by(url: url)
-      if existing_server && (!self.name || existing_server.name == self.name)
+      existing_server = config.find_server_by(url: url, name: self.name)
+      if existing_server
         config.current_server = existing_server.name
         existing_server
       else

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

@@ -10,7 +10,8 @@ module Kontena::Cli::Master
         abort pastel.red("Could not resolve master by name '#{name}'.") +
               "\nFor a list of known masters please run: kontena master list"
       else
-        self.current_master = master['name']
+        config.current_master = master['name']
+        config.write
         puts "Using master: #{pastel.cyan(master['name'])} (#{master['url']})"
         puts "Using grid: #{current_grid ? pastel.cyan(current_grid) : "<none>"}"
       end

data/lib/kontena/presets/kontena_auth_provider.yml

@@ -4,7 +4,7 @@ oauth2.code_requires_basic_auth: false
 oauth2.token_endpoint: https://auth2.kontena.io/v1/oauth2/token
 oauth2.token_method: post
 oauth2.token_post_content_type: application/x-www-form-urlencoded
-oauth2.userinfo_endpoint: https://auth2.kontena.io/v1/user
+oauth2.userinfo_endpoint: https://cloud-api.kontena.io/user
 oauth2.userinfo_username_jsonpath: "$..username"
 oauth2.userinfo_email_jsonpath: "$..email"
 oauth2.userinfo_user_id_jsonpath: "$..id"

data/lib/kontena_cli.rb

@@ -8,10 +8,13 @@ module Kontena
   # @return [Fixnum] exit_code
   def self.run(cmdline = "", returning: :status)
     require 'shellwords'
+    ENV["DEBUG"] && puts("Running Kontena.run(#{cmdline.inspect}, returning: #{returning}")
     result = Kontena::MainCommand.new(File.basename(__FILE__)).run(cmdline.shellsplit)
+    ENV["DEBUG"] && puts("Command completed, result: #{result.inspect} status: 0")
     return 0 if returning == :status
     return result if returning == :result
   rescue SystemExit
+    ENV["DEBUG"] && puts("Command completed with failure, result: #{result.inspect} status: #{$!.status}")
     returning == :status ? $!.status : nil
   end
 

data/spec/kontena/cli/master/use_command_spec.rb

@@ -11,8 +11,9 @@ describe Kontena::Cli::Master::UseCommand do
 
   describe '#use' do
     it 'should update current master' do
-      expect(subject).to receive(:current_master=).with('some_master')
+      expect(subject.config).to receive(:write).and_return(true)
       subject.run(['some_master'])
+      expect(subject.config.current_server).to eq 'some_master'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.16.0.pre1
+  version: 0.16.0.pre2
 platform: ruby
 authors:
 - Kontena, Inc