kontena-cli 0.16.0.pre7 → 0.16.0.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d4aed1a465c25c662ace1bc38e6de0a8a6ccdca
-  data.tar.gz: c000e53d82c7aa42fe5d12a187dcdaa39f6d75e3
+  metadata.gz: 549a20ff35d02d49d04d5589b5f5186b72de7ed6
+  data.tar.gz: e18b7450099a72993f8569ce271aaa72c5a3bf84
 SHA512:
-  metadata.gz: 34c99fe148e3d789cf87462b22dd33f1f74f9cb91c5bffd092854d8967add751307d20d39f196a8aa78dcb6aaa785eb2e01f7c9bef55793276dbacc1285c1828
-  data.tar.gz: 911f92be23c389ef095ddb579acd3f778d275eda7073be1422fb2404bf072b8e0d3e7cee7b32060f16a63cc2e1fc2004e0a49bc4853cfdbb978cd9da0479d3d1
+  metadata.gz: ffe9ff495c0eab3b8e7076b429a24916a6c2f8fd459f2bb6142b50f97e4f52b54fa52342c1b80d117975653c6d39e3ec5f4e7a60c0f9479019fd6cd613a06410
+  data.tar.gz: aeb28936bece1fe439c6d57d1293cf94a922f8d9bf741e982872f5db44b14a3bcc1e532fc463c8ed9c200100cf32fdfa7fb4fcf737e81c6cf93f177bdb43318c

data/VERSION

@@ -1 +1 @@
-0.16.0.pre7
+0.16.0.pre8

data/kontena-cli.gemspec

@@ -26,10 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "tty-prompt", "~> 0.7.1"
   spec.add_runtime_dependency "clamp", "~> 1.0.0"
   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"
+  spec.add_runtime_dependency "hash_validator", "~> 0.7.0"
+  spec.add_runtime_dependency "retriable", "~> 2.1.0"
 end

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

@@ -10,6 +10,7 @@ module Kontena
         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 ['--use-kontena-cloud'], :flag, "Use Kontena Cloud as authentication provider"
           option ['--cloud-master-id'], '[ID]', "Use Kontena Cloud Master ID for auth provider configuration"
         end
       end
@@ -32,34 +33,30 @@ module Kontena
       end
 
       def login_to_kontena
-        if kontena_auth?
+        if cloud_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 create_cloud_master
-        master_id = nil
-        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
-        else
-          exit_with_error 'Cloud Master registration failed'
+        Retriable.retriable do
+          cloud_client.authentication_ok?(kontena_account.userinfo_endpoint)
         end
       end
 
       def before
         unless_param(:name) do
-          if command.no_prompt?
+          if command.cloud_master_id
+            response = spinner "Receiving Master information from Kontena Cloud" do
+              cloud_client.get("user/masters/#{command.cloud_master_id}")
+            end
+            if response.kind_of?(Hash) && response.has_key?('data')
+              command.name = response['data']['attributes']['name']
+            else
+              exit_with_error "Unable to receive Master information using id"
+            end
+          elsif 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|
@@ -69,9 +66,7 @@ module Kontena
         end
 
         unless_param(:skip_auth_provider) do
-          if command.no_prompt?
-            command.cloud_master_id ||= create_cloud_master
-          elsif command.cloud_master_id.nil?
+          unless command.no_prompt? || command.use_kontena_cloud? || command.cloud_master_id
             answer = prompt.select("Select OAuth2 authentication provider: ") do |menu|
               menu.choice 'Kontena Cloud (recommended)', :kontena_new
               menu.choice 'Custom', :custom
@@ -80,7 +75,6 @@ module Kontena
             case answer
             when :kontena_new
               login_to_kontena || abort('You must login to Kontena Cloud')
-              command.cloud_master_id = create_cloud_master
               command.skip_auth_provider = false
             when :custom
               puts

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

@@ -44,9 +44,11 @@ module Kontena
         end
 
         require 'shellwords'
-        cmd = "master login --skip-grid-auto-select --verbose --name #{command.result[:name].shellescape} --code #{command.result[:code].shellescape} #{new_master.url.shellescape}"
-        ENV["DEBUG"] && puts("Running: #{cmd}")
-        Kontena.run(cmd)
+        cmd = "master login --no-login-info --skip-grid-auto-select --verbose --name #{command.result[:name].shellescape} --code #{command.result[:code].shellescape} #{new_master.url.shellescape}"
+        Retriable.retriable do
+          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

@@ -13,7 +13,9 @@ module Kontena
 
         cmd = "grid create --silent test"
         ENV["DEBUG"] && puts("Running: #{cmd}")
-        Kontena.run(cmd)
+        Retriable.retriable do
+          Kontena.run(cmd)
+        end
       end
     end
   end

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

@@ -6,22 +6,12 @@ module Kontena
 
       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
+      def configure_auth_provider_using_id(cloud_id)
+        Kontena.run("master init-cloud --force --cloud-master-id #{cloud_id.shellescape}")
       end
 
-      def configure_auth_provider(oauth_config)
-        require 'shellwords'
-        spinner "Setting Kontena Cloud authentication provider settings to Master config" do
-          Kontena.run("master config import --force --preset kontena_auth_provider")
-          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
+      def configure_auth_provider
+        Kontena.run("master init-cloud --force")
       end
 
       def after
@@ -35,10 +25,9 @@ module Kontena
         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
+          configure_auth_provider_using_id(command.cloud_master_id)
+        else
+          configure_auth_provider
         end
       end
     end

data/lib/kontena/callbacks/master/deploy/70_invite_self_after_deploy.rb

@@ -0,0 +1,93 @@
+module Kontena
+  module Callbacks
+    class InviteSelfAfterDeploy < Kontena::Callback
+
+      include Kontena::Cli::Common
+
+      matches_commands 'master create'
+
+      def cloud_user_data
+        return @cloud_user_data if @cloud_user_data
+        return nil unless cloud_auth?
+        user_data = {}
+        response = nil
+        spinner "Retrieving user information from Kontena Cloud" do
+          response = cloud_client.get(kontena_account.userinfo_endpoint)
+        end
+        if response && response.kind_of?(Hash) && response.has_key?('data') && response['data'].has_key?('attributes')
+          user_data[:email] = response['data']['attributes']['email']
+          user_data[:username] = response['data']['attributes']['username']
+          user_data[:verified] = response['data']['attributes']['verified']
+          @cloud_user_data = user_data
+        end
+        @cloud_user_data
+      end
+
+      def after
+        return unless current_master
+        return unless command.exit_code == 0
+        return unless current_master.username.to_s == 'admin'
+        return nil if command.skip_auth_provider?
+        return nil unless cloud_user_data
+
+        invite_response = nil
+        spinner "Creating user #{cloud_user_data[:email]} into Kontena Master" do |spin|
+          invite_response = Kontena.run("master users invite --return #{cloud_user_data[:email].shellescape}", returning: :result)
+          unless invite_response.kind_of?(Hash) && invite_response.has_key?('invite_code')
+            spin.fail
+          end
+        end
+
+        return nil unless invite_response
+        ENV["DEBUG"] && puts("Got invite code: #{invite_response['invite_code']}")
+
+        role_status = nil
+
+        spinner "Adding master_admin role for #{cloud_user_data[:email]}" do |spin|
+          role_status = Kontena.run("master users role add --silent master_admin #{cloud_user_data[:email].shellescape}")
+          spin.fail if role_status.to_i > 0
+        end
+
+        return nil if role_status.to_i > 0
+
+        new_user_token = nil
+        spinner "Creating an access token for #{cloud_user_data[:email]}" do |spin|
+          new_user_token = Kontena.run("master token create -e 0 -s user --return -u #{cloud_user_data[:email].shellescape}", returning: :result)
+        end
+
+        master_name = current_master.name.dup
+        master_url  = current_master.url
+        old_master  = current_master
+
+        spinner "Copying server '#{current_master.name}' to '#{current_master.name}-admin' in configuration" do
+          config.servers << Kontena::Cli::Config::Server.new(
+            name: "#{current_master.name}-admin",
+            url: current_master.url,
+            username: 'admin',
+            grid: current_master.grid,
+            token: Kontena::Cli::Config::Token.new(
+              access_token:  current_master.token.access_token,
+              refresh_token: current_master.token.refresh_token,
+              expires_at:    current_master.token.expires_at,
+              parent_type:   :master,
+              parent_name:   "#{current_master.name}-admin"
+            ),
+            account: 'master'
+          )
+        end
+
+        spinner "Authenticating as #{cloud_user_data[:email]} to Kontena Master '#{current_master.name}'" do
+          current_master.token = Kontena::Cli::Config::Token.new(
+            access_token:  new_user_token[:access_token],
+            refresh_token: new_user_token[:refresh_token],
+            expires_at:    new_user_token[:expires_in].to_i > 0 ? Time.now.utc.to_i + new_user_token[:expires_in].to_i : nil,
+            parent_type:   :master,
+            parent_name:   "#{current_master.name}"
+          )
+          current_master.username = new_user_token[:user_name].to_s == "" ? new_user_token[:user_email] : new_user_token[:user_name]
+          config.write
+        end
+      end
+    end
+  end
+end

data/lib/kontena/callbacks/master/deploy/90_proptip_after_deploy.rb

@@ -0,0 +1,33 @@
+module Kontena
+  module Callbacks
+    class SuggestInvitingYourself < Kontena::Callback
+
+      include Kontena::Cli::Common
+
+      matches_commands 'master create'
+
+      def after
+        return unless current_master
+        return unless command.exit_code == 0
+        return if current_master.username.to_s == 'admin'
+
+        puts
+        puts Kontena.pastel.green("Protip:")
+
+        if config.find_server("#{current_master.name}-admin")
+          puts "  You are currently using the Kontena Master '#{Kontena.pastel.yellow(current_master.name)}' as"
+          puts "  #{Kontena.pastel.yellow(current_master.username)}. To switch to the Kontena Master internal"
+          puts "  administrator you can use:"
+          puts "  #{Kontena.pastel.green.on_black("  kontena master use #{current_master.name}-admin  ")}"
+          puts
+        end
+        puts "  To invite more users you can use:"
+        puts "  #{Kontena.pastel.green.on_black("  kontena master users invite email_address@example.com  ")}"
+        puts
+        puts "  The users can then join the master by using the invite code: "
+        puts "  #{Kontena.pastel.green.on_black("  kontena master join #{current_master.url} <invite_code>  ")}"
+        puts
+      end
+    end
+  end
+end

data/lib/kontena/cli/apps/build_command.rb

@@ -10,13 +10,14 @@ module Kontena::Cli::Apps
     option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
     option ['--no-cache'], :flag, 'Do not use cache when building the image', default: false
+    option '--skip-validation', :flag, 'Skip YAML file validation', default: false
     parameter "[SERVICE] ...", "Services to build"
 
     attr_reader :services
 
     def execute
       require_config_file(filename)
-      @services = services_from_yaml(filename, service_list, service_prefix)
+      @services = services_from_yaml(filename, service_list, service_prefix, skip_validation?)
       if services.none?{ |name, service| service['build'] }
         error 'Not found any service with build option'
         abort

data/lib/kontena/cli/apps/common.rb

@@ -15,10 +15,11 @@ module Kontena::Cli::Apps
     # @param [String] filename
     # @param [Array<String>] service_list
     # @param [String] prefix
+    # @param [TrueClass|FalseClass] skip_validation
     # @return [Hash]
-    def services_from_yaml(filename, service_list, prefix)
+    def services_from_yaml(filename, service_list, prefix, skip_validation = false)
       set_env_variables(prefix, current_grid)
-      reader = YAML::Reader.new(filename)
+      reader = YAML::Reader.new(filename, skip_validation)
       outcome = reader.execute
       hint_on_validation_notifications(outcome[:notifications]) if outcome[:notifications].size > 0
       abort_on_validation_errors(outcome[:errors]) if outcome[:errors].size > 0

data/lib/kontena/cli/apps/config_command.rb

@@ -3,17 +3,17 @@ require 'pp'
 
 module Kontena::Cli::Apps
   class ConfigCommand < Kontena::Command
-    include Kontena::Cli::Common    
+    include Kontena::Cli::Common
     include Common
 
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
     option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
-
+    option '--skip-validation', :flag, 'Skip YAML file validation', default: false
     parameter "[SERVICE] ...", "Services to view"
 
     def execute
       require_config_file(filename)
-      services = services_from_yaml(filename, service_list, service_prefix)
+      services = services_from_yaml(filename, service_list, service_prefix, skip_validation?)
       services.each do |name, config|
         config['cmd'] = config['cmd'].join(" ") if config['cmd']
         config.delete_if {|key, value| value.nil? || (value.respond_to?(:empty?) && value.empty?) }

data/lib/kontena/cli/apps/deploy_command.rb

@@ -16,6 +16,7 @@ module Kontena::Cli::Apps
     option '--force', :flag, 'Force deploy even if service does not have any changes'
     option '--force-deploy', :flag, '[DEPRECATED: use --force]'
 
+    option '--skip-validation', :flag, 'Skip YAML file validation', default: false
     parameter "[SERVICE] ...", "Services to start"
 
     attr_reader :services, :deploy_queue

data/lib/kontena/cli/apps/docker_helper.rb

@@ -34,15 +34,15 @@ module Kontena::Cli::Apps
     def build_docker_image(service, no_cache = false)
       dockerfile = dockerfile = service['build']['dockerfile'] || 'Dockerfile'
       build_context = service['build']['context']
-      cmd = ["docker build -t #{service['image']}"]
-      cmd << "-f #{File.join(File.expand_path(build_context), dockerfile)}" if dockerfile != "Dockerfile"
-      cmd << "--no-cache" if no_cache
+      cmd = ['docker', 'build', '-t', service['image']]
+      cmd << ['-f', File.join(File.expand_path(build_context), dockerfile)] if dockerfile != "Dockerfile"
+      cmd << '--no-cache' if no_cache
       args = service['build']['args'] || {}
       args.each do |k, v|
-        cmd << "--build-arg #{k}=#{v}"
+        cmd << "--build-arg=#{k}=#{v}"
       end
       cmd << build_context
-      ret = system(cmd.join(' '))
+      ret = system(*cmd.flatten)
       raise ("Failed to build image #{service['image'].colorize(:cyan)}") unless ret
       ret
     end
@@ -50,7 +50,7 @@ module Kontena::Cli::Apps
     # @param [String] image
     # @return [Integer]
     def push_docker_image(image)
-      ret = system("docker push #{image}")
+      ret = system('docker', 'push', image)
       raise ("Failed to push image #{image.colorize(:cyan)}") unless ret
       ret
     end
@@ -58,7 +58,7 @@ module Kontena::Cli::Apps
     # @param [String] image
     # @return [Boolean]
     def image_exist?(image)
-      `docker history #{image} 2>&1` ; $?.success?
+      system("docker history '#{image}' >/dev/null 2>/dev/null")
     end
 
     # @param [String] path

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

@@ -16,7 +16,7 @@ module Kontena::Cli::Apps
     def execute
       require_config_file(filename)
 
-      @services = services_from_yaml(filename, service_list, service_prefix)
+      @services = services_from_yaml(filename, service_list, service_prefix, true)
       if services.size > 0
         show_services(services)
       elsif !service_list.empty?

data/lib/kontena/cli/apps/logs_command.rb

@@ -16,7 +16,7 @@ module Kontena::Cli::Apps
     def execute
       require_config_file(filename)
 
-      services = services_from_yaml(filename, service_list, service_prefix)
+      services = services_from_yaml(filename, service_list, service_prefix, true)
 
       if services.empty? && !service_list.empty?
         signal_error "No such service: #{service_list.join(', ')}"

data/lib/kontena/cli/apps/monitor_command.rb

@@ -15,8 +15,8 @@ module Kontena::Cli::Apps
 
     def execute
       require_config_file(filename)
-            
-      @services = services_from_yaml(filename, service_list, service_prefix)
+
+      @services = services_from_yaml(filename, service_list, service_prefix, true)
       if services.size > 0
         show_monitor(services)
       elsif !service_list.empty?

data/lib/kontena/cli/apps/remove_command.rb

@@ -20,7 +20,7 @@ module Kontena::Cli::Apps
       require_config_file(filename)
       confirm unless forced?
 
-      @services = services_from_yaml(filename, service_list, service_prefix)
+      @services = services_from_yaml(filename, service_list, service_prefix, true)
       if services.size > 0
         remove_services(services)
       elsif !service_list.empty?