kontena-cli 0.16.0.pre7 → 0.16.0.pre8

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

@@ -0,0 +1,58 @@
+module Kontena::Cli::Master
+  class RemoveCommand < Kontena::Command
+    include Kontena::Cli::Common
+
+    parameter '[NAME]', "Master name"
+
+    banner "Note: This command only removes the master from your local configuration file"
+
+    option '--force', :flag, "Don't ask questions"
+
+    def run_interactive
+      selections = prompt.multi_select("Select masters to remove from configuration file:") do |menu|
+        config.servers.each do |server|
+          menu.choice " #{pastel.green("* ") if config.current_server == server.name}#{server.name} (#{server.username || 'unknown'} @ #{server.url})", server
+        end
+      end
+      if selections.empty?
+        puts "No masters selected"
+        exit 0
+      end
+      delete_servers(selections)
+    end
+
+    def delete_servers(servers)
+      case servers.size
+      when 0
+        abort "Master not found in configuration"
+      when 1
+        config.servers.delete(config.servers.delete(servers.first))
+        puts "Removed Master '#{servers.first.name}'"
+      else
+        unless self.force?
+          abort("Aborted") unless prompt.yes?("Remove #{servers.size} masters from configuration?")
+        end
+        config.servers.delete_if {|s| servers.include?(s) }
+        puts "Removed #{servers.size} masters from configuration"
+      end
+      unless config.find_server(config.current_server)
+        puts
+        puts "Current master was removed, to select a new current master use:"
+        puts "  " + pastel.green.on_black("  kontena master use <master_name>  ")
+        puts "Or log into another master by using:"
+        puts "  " + pastel.green.on_black("  kontena master login <master_url>  ")
+        config.current_server = nil
+      end
+      config.write
+    end
+
+    def execute
+      if self.name.nil?
+        run_interactive
+      else
+        delete_servers(config.servers.select {|s| s.name == self.name})
+      end
+    end
+  end
+end
+

data/lib/kontena/cli/master/token/create_command.rb

@@ -12,17 +12,23 @@ module Kontena::Cli::Master::Token
     option ['-s', '--scopes'], '[SCOPES]', "Comma separated list of access scopes for the generated token", default: 'user'
     option ['-e', '--expires-in'], '[SECONDS]', "Access token expiration time. Use 0 for never.", default: '7200'
     option ['-c', '--code'], :flag, "Generate an authorization code"
+    option ['-u', '--user'], '[EMAIL]', 'Generate a token for another user'
     option ['--id'], :flag, "Only output the token ID"
     option ['--token'], :flag, "Only output the access_token (or authorization code)"
 
+    option ['--return'], :flag, "Return the response hash", hidden: true
+
     def execute
       params = {
         response_type: self.code? ? 'code' : 'token',
         scope: self.scopes,
         expires_in: self.expires_in
       }
+      params[:user] = self.user if self.user
       data = token_data_to_hash(client.post("/oauth2/authorize", params))
 
+      return data if self.return?
+
       if self.id?
         puts data[:id]
         exit 0

data/lib/kontena/cli/master/users/invite_command.rb

@@ -9,6 +9,7 @@ module Kontena::Cli::Master::Users
 
     option ['-r', '--roles'], '[ROLES]', 'Comma separated list of roles to assign to the invited users'
     option ['-c', '--code'], :flag, 'Only output the invite code'
+    option '--return', :flag, 'Return the code', hidden: true
 
     requires_current_master
     requires_current_master_token
@@ -26,6 +27,8 @@ module Kontena::Cli::Master::Users
           response = client.post('/oauth2/authorize', data)
           if self.code?
             puts response['invite_code']
+          elsif self.return?
+            return response
           else
             puts "Invitation created for #{response['email']}".colorize(:green)
             puts "  * code:    #{response['invite_code']}"
@@ -35,7 +38,7 @@ module Kontena::Cli::Master::Users
             Kontena.run("master users role add #{role.shellescape} #{email.shellescape}")
           end
         rescue
-          puts "Failed to invite #{email}".colorize(:red)
+          STDERR.puts "Failed to invite #{email}".colorize(:red)
           ENV["DEBUG"] && puts("#{$!} - #{$!.message} -- #{$!.backtrace}")
         end
       end

data/lib/kontena/cli/master/users/roles/add_command.rb

@@ -8,6 +8,8 @@ module Kontena::Cli::Master::Users
       parameter "ROLE", "Role name"
       parameter "USER ...", "List of users"
 
+      option '--silent', :flag, 'Reduce output verbosity'
+
       def execute
         require_api_url
         token = require_token
@@ -16,10 +18,9 @@ module Kontena::Cli::Master::Users
         user_list.each do |email|
           begin
             response = client(token).post("users/#{email}/roles", data)
-            puts "Added role #{role} to #{email}"
+            puts "Added role #{role} to #{email}" unless running_silent?
           rescue => exc
-            puts "Failed to add role #{role} to #{email}".colorize(:red)
-            puts exc.message
+            abort "Failed to add role #{role} to #{email} : #{exc.message}".colorize(:red)
           end
         end
       end

data/lib/kontena/cli/master_command.rb

@@ -1,5 +1,6 @@
 require_relative '../main_command'
 require_relative 'master/use_command'
+require_relative 'master/remove_command'
 require_relative 'master/list_command'
 require_relative 'master/users_command'
 require_relative 'master/current_command'
@@ -9,16 +10,13 @@ require_relative 'master/logout_command'
 require_relative 'master/join_command'
 require_relative 'master/audit_log_command'
 require_relative 'master/token_command'
-
-if ENV["DEV"]
-  begin
-    require_relative 'master/create_command'
-  rescue LoadError
-  end
-end
+require_relative 'master/init_cloud_command'
 
 class Kontena::Cli::MasterCommand < Kontena::Command
+  include Kontena::Util
+
   subcommand ["list", "ls"], "List masters where client has logged in", Kontena::Cli::Master::ListCommand
+  subcommand ["remove", "rm"], "Remove a master from configuration file", Kontena::Cli::Master::RemoveCommand
   subcommand ["config", "cfg"], "Configure master settings", Kontena::Cli::Master::ConfigCommand
   subcommand "use", "Switch to use selected master", Kontena::Cli::Master::UseCommand
   subcommand "users", "Users specific commands", Kontena::Cli::Master::UsersCommand
@@ -28,8 +26,9 @@ class Kontena::Cli::MasterCommand < Kontena::Command
   subcommand "token", "Manage Kontena Master access tokens", Kontena::Cli::Master::TokenCommand
   subcommand "join", "Join Kontena Master using an invitation code", Kontena::Cli::Master::JoinCommand
   subcommand "audit-log", "Show master audit logs", Kontena::Cli::Master::AuditLogCommand
-
-  if ENV["DEV"]
+  subcommand "init-cloud", "Configure current master to use Kontena Cloud services", Kontena::Cli::Master::InitCloudCommand
+  if experimental?
+    require_relative 'master/create_command'
     subcommand "create", "Install a new Kontena Master", Kontena::Cli::Master::CreateCommand
   end
 

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

@@ -24,13 +24,14 @@ module Kontena::Cli::Services
         }.join(", ")
         health = health_status(service)
         vars = [
-          "#{health_status_icon(health)} #{service['name']}",
+          health_status_icon(health),
+          "#{service['name']}",
           instances,
           stateful,
           service['state'],
           ports
         ]
-        puts "%-74s %-10.10s %-8s %-10s %-50s" % vars
+        puts "%s %-58s %-10.10s %-8s %-10s %-50s" % vars
       end
     end
   end

data/lib/kontena/cli/services/services_helper.rb

@@ -424,7 +424,7 @@ module Kontena
             icon.colorize(:green)
           else
             icon = '⊝'.freeze
-            icon.colorize(:clear)
+            icon.colorize(:dim)
           end
         end
 

data/lib/kontena/client.rb

@@ -130,22 +130,12 @@ module Kontena
       return false unless token['access_token']
       return false unless token_verify_path
 
-      uri = URI.parse(token_verify_path)
-      host_options = {}
-      host_options[:host] = uri.host if uri.host
-      host_options[:port] = uri.port if uri.port
-
-      if uri.host
-        client = Kontena::Client.new("#{uri.scheme}://#{uri.host}:#{uri.port}", token)
-      else
-        client = self
-      end
-
-      final_path = uri.path.gsub(/\:access\_token/, token['access_token'])
-      logger.debug "Requesting user info from #{final_path} - #{host_options}"
-      client.request(path: final_path)
+      final_path = token_verify_path.gsub(/\:access\_token/, token['access_token'])
+      logger.debug "Requesting user info from #{final_path}"
+      request(path: final_path)
       true
     rescue
+      ENV["DEBUG"] && puts("Authentication verification exception: #{$!} #{$!.message} #{$!.backtrace}")
       false
     end
 
@@ -154,35 +144,20 @@ module Kontena
     def exchange_code(code)
       return nil unless token_account
       return nil unless token_account['token_endpoint']
-      uri = URI.parse(token_account['token_endpoint'])
-      host_options = {}
-      host_options[:host] = uri.host if uri.host
-      host_options[:port] = uri.port if uri.port
 
-      if uri.host
-        client = Kontena::Client.new("#{uri.scheme}://#{uri.host}:#{uri.port}")
-      else
-        client = self
-      end
-
-      client.request(
-        {
-          http_method: token_account['token_method'].downcase.to_sym,
-          path: uri.path,
-          headers: { CONTENT_TYPE => token_account['token_post_content_type'] },
-          body: {
-            'grant_type' => 'authorization_code',
-            'code' => code,
-            'client_id' => Kontena::Client::CLIENT_ID,
-            'client_secret' => Kontena::Client::CLIENT_SECRET
-          },
-          expects: [200,201],
-          auth: false
-        }
+      request(
+        http_method: token_account['token_method'].downcase.to_sym,
+        path: token_account['token_endpoint'],
+        headers: { CONTENT_TYPE => token_account['token_post_content_type'] },
+        body: {
+          'grant_type' => 'authorization_code',
+          'code' => code,
+          'client_id' => Kontena::Client::CLIENT_ID,
+          'client_secret' => Kontena::Client::CLIENT_SECRET
+        },
+        expects: [200,201],
+        auth: false
       )
-    rescue
-      logger.debug "Code exchange exception: #{$!} #{$!.message}\n#{$!.backtrace}"
-      nil
     end
 
     # Return server version from a Kontena master by requesting '/'
@@ -317,14 +292,23 @@ module Kontena
       end
       request_headers.merge!('Content-Length' => body_content.bytesize)
 
+      uri = URI.parse(path)
       host_options = {}
-      host_options[:host] = host if host
-      host_options[:port] = port if port
+
+      if uri.host
+        host_options[:host]   = uri.host
+        host_options[:port]   = uri.port
+        host_options[:scheme] = uri.scheme
+        path                  = uri.request_uri
+      else
+        host_options[:host] = host if host
+        host_options[:port] = port if port
+      end
 
       request_options = {
           method: http_method,
           expects: Array(expects),
-          path: path.start_with?('/') ? path : request_uri(path),
+          path: path_with_prefix(path),
           headers: request_headers,
           body: body_content,
           query: query
@@ -443,12 +427,12 @@ module Kontena
     end
 
 
-    # Get full request uri
+    # Get prefixed request path unless path starts with /
     #
     # @param [String] path
     # @return [String]
-    def request_uri(path)
-      "#{path_prefix}#{path}"
+    def path_with_prefix(path)
+      path.to_s.start_with?('/') ? path : "#{path_prefix}#{path}"
     end
 
 

data/lib/kontena/presets/kontena_auth_provider.yml

@@ -1,7 +1,7 @@
 ---
-oauth2.authorize_endpoint: https://cloud-beta.kontena.io/login/oauth/authorize
+oauth2.authorize_endpoint: https://cloud.kontena.io/login/oauth/authorize
 oauth2.code_requires_basic_auth: false
-oauth2.token_endpoint: https://auth2.kontena.io/v1/oauth2/token
+oauth2.token_endpoint: https://cloud-api.kontena.io/oauth2/token
 oauth2.token_method: post
 oauth2.token_post_content_type: application/x-www-form-urlencoded
 oauth2.userinfo_endpoint: https://cloud-api.kontena.io/user

data/lib/kontena_cli.rb

@@ -15,7 +15,11 @@ module Kontena
   rescue SystemExit
     ENV["DEBUG"] && puts("Command completed with failure, result: #{result.inspect} status: #{$!.status}")
     returning == :status ? $!.status : nil
+  rescue
+    ENV["DEBUG"] && puts("Command raised #{$!} with message: #{$!.message}\n  #{$!.backtrace.join("  \n")}")
+    returning == :status ? 1 : nil
   end
+    
 
   def self.version
     "kontena-cli/#{Kontena::Cli::VERSION}"
@@ -47,6 +51,14 @@ class String
   end
 end
 
+require 'retriable'
+Retriable.configure do |c|
+  c.on_retry = Proc.new do |exception, try, elapsed_time, next_interval|
+    return true unless ENV["DEBUG"]
+    puts "Retriable retry: #{try} - Exception: #{exception} - #{exception.message}. Elapsed: #{elapsed_time} Next interval: #{next_interval}"
+  end
+end
+
 require 'ruby_dig'
 require 'shellwords'
 require_relative 'kontena/cli/version'

data/spec/kontena/cli/app/docker_helper_spec.rb

@@ -46,6 +46,11 @@ describe Kontena::Cli::Apps::DockerHelper do
     }
   end
 
+  before :each do
+    # image does not exist
+    allow(subject).to receive(:image_exist?).with('test_service').and_return(false)
+  end
+
   describe '#validate_image_name' do
     context 'when image name is valid' do
       it 'returns true' do
@@ -109,7 +114,7 @@ describe Kontena::Cli::Apps::DockerHelper do
         'build' => { 'context' => '.' },
         'image' => 'test_service'
       }
-      expect(subject).to receive(:system).with("docker build -t test_service ."). and_return(true)
+      expect(subject).to receive(:system).with('docker', 'build', '-t', 'test_service', '.'). and_return(true)
       subject.build_docker_image(service)
     end
 
@@ -118,7 +123,7 @@ describe Kontena::Cli::Apps::DockerHelper do
         'build' => { 'context' => '.' },
         'image' => 'test_service'
       }
-      expect(subject).to receive(:system).with("docker build -t test_service --no-cache ."). and_return(true)
+      expect(subject).to receive(:system).with('docker', 'build', '-t', 'test_service', '--no-cache', '.'). and_return(true)
       subject.build_docker_image(service, true)
     end
 
@@ -128,7 +133,7 @@ describe Kontena::Cli::Apps::DockerHelper do
         'image' => 'test_service'
       }
       expected_path = File.join(File.expand_path('.'), 'other_dockerfile')
-      expect(subject).to receive(:system).with("docker build -t test_service -f #{expected_path} ."). and_return(true)
+      expect(subject).to receive(:system).with('docker', 'build', '-t', 'test_service', '-f', expected_path, '.'). and_return(true)
       subject.build_docker_image(service)
     end
 
@@ -143,7 +148,7 @@ describe Kontena::Cli::Apps::DockerHelper do
         },
         'image' => 'test_service'
       }
-      expect(subject).to receive(:system).with("docker build -t test_service --build-arg FOO=bar --build-arg BAR=foo ."). and_return(true)
+      expect(subject).to receive(:system).with('docker', 'build', '-t', 'test_service', '--build-arg=FOO=bar', '--build-arg=BAR=foo', '.'). and_return(true)
       subject.build_docker_image(service)
     end
   end

data/spec/kontena/cli/app/yaml/validator_spec.rb

@@ -2,134 +2,129 @@ require_relative '../../../../spec_helper'
 require 'kontena/cli/apps/yaml/validator'
 
 describe Kontena::Cli::Apps::YAML::Validator do
-  describe '#validate_keys' do
-    it 'returns error on invalid key' do
-      result = subject.validate_keys('name' => 'wordpress')
-      expect(result['name'].size).to eq(1)
-    end
-  end
 
   describe '#validate_options' do
     context 'build' do
       it 'is optional' do
         result = subject.validate_options({})
-        expect(result.success?).to be_truthy
-        expect(result.messages.key?('build')).to be_falsey
+        expect(result.valid?).to be_truthy
+
+        expect(result.errors.key?('build')).to be_falsey
       end
 
       it 'must be string' do
         result = subject.validate_options('build' => 12345)
-        expect(result.messages.key?('build')).to be_truthy
+        expect(result.errors.key?('build')).to be_truthy
 
         result = subject.validate_options('build' => '.')
-        expect(result.messages.key?('build')).to be_falsey
+        expect(result.errors.key?('build')).to be_falsey
       end
     end
 
     context 'image' do
       it 'is optional' do
         result = subject.validate_options('build' => '.')
-        expect(result.success?).to be_truthy
-        expect(result.messages.key?('image')).to be_falsey
+        expect(result.valid?).to be_truthy
+        expect(result.errors.key?('image')).to be_falsey
       end
 
       it 'must be string' do
         result = subject.validate_options('image' => 10)
-        expect(result.success?).to be_falsey
-        expect(result.messages.key?('image')).to be_truthy
+        expect(result.valid?).to be_falsey
+        expect(result.errors.key?('image')).to be_truthy
       end
     end
 
     it 'validates stateful is boolean' do
       result = subject.validate_options('stateful' => 'bool')
-      expect(result.messages.key?('stateful')).to be_truthy
+      expect(result.errors.key?('stateful')).to be_truthy
     end
 
     it 'validates net is host or bridge' do
       result = subject.validate_options('net' => 'invalid')
-      expect(result.messages.key?('net')).to be_truthy
+      expect(result.errors.key?('net')).to be_truthy
 
       result = subject.validate_options('net' => 'bridge')
-      expect(result.messages.key?('net')).to be_falsey
+      expect(result.errors.key?('net')).to be_falsey
 
       result = subject.validate_options('net' => 'host')
-      expect(result.messages.key?('net')).to be_falsey
+      expect(result.errors.key?('net')).to be_falsey
     end
 
     context 'affinity' do
       it 'is optional' do
         result = subject.validate_options({})
-        expect(result.messages.key?('affinity')).to be_falsey
+        expect(result.errors.key?('affinity')).to be_falsey
       end
 
       it 'must be array' do
         result = subject.validate_options('affinity' => 'node==node1')
-        expect(result.messages.key?('affinity')).to be_truthy
+        expect(result.errors.key?('affinity')).to be_truthy
         result = subject.validate_options('affinity' => ['node==node1'])
-        expect(result.messages.key?('affinity')).to be_falsey
+        expect(result.errors.key?('affinity')).to be_falsey
       end
 
       it 'validates format' do
         result = subject.validate_options('affinity' => ['node=node1'])
-        expect(result.messages.key?('affinity')).to be_truthy
+        expect(result.errors.key?('affinity')).to be_truthy
 
         result = subject.validate_options('affinity' => ['node==node1', 'service!=mariadb'])
-        expect(result.messages.key?('affinity')).to be_falsey
+        expect(result.errors.key?('affinity')).to be_falsey
       end
     end
 
     context 'deploy' do
       it 'is optional' do
         result = subject.validate_options({})
-        expect(result.messages.key?('deploy')).to be_falsey
+        expect(result.errors.key?('deploy')).to be_falsey
       end
 
       context 'strategy' do
         it 'accepts daemon' do
           result = subject.validate_options('deploy' => {'strategy' => 'daemon'})
-          expect(result.messages.key?('deploy')).to be_falsey
+          expect(result.errors.key?('deploy')).to be_falsey
         end
 
         it 'accepts random' do
           result = subject.validate_options('deploy' => {'strategy' => 'random'})
-          expect(result.messages.key?('deploy')).to be_falsey
+          expect(result.errors.key?('deploy')).to be_falsey
         end
 
         it 'accepts ha' do
           result = subject.validate_options('deploy' => {'strategy' => 'ha'})
-          expect(result.messages.key?('deploy')).to be_falsey
+          expect(result.errors.key?('deploy')).to be_falsey
         end
 
         it 'rejects invalid values' do
           result = subject.validate_options('deploy' => {'strategy' => 'global'})
-          expect(result.messages.key?('deploy')).to be_truthy
+          expect(result.errors.key?('deploy')).to be_truthy
         end
       end
 
       context 'interval' do
         it 'rejects wrong format' do
           result = subject.validate_options('deploy' => {'interval' => '1xyz'})
-          expect(result.messages.key?('deploy')).to be_truthy
+          expect(result.errors.key?('deploy')).to be_truthy
         end
 
         it 'accepts 1min as value' do
           result = subject.validate_options('deploy' => {'interval' => '1min'})
-          expect(result.messages.key?('deploy')).to be_falsey
+          expect(result.errors.key?('deploy')).to be_falsey
         end
 
         it 'accepts 1h as value' do
           result = subject.validate_options('deploy' => {'interval' => '1h'})
-          expect(result.messages.key?('deploy')).to be_falsey
+          expect(result.errors.key?('deploy')).to be_falsey
         end
 
         it 'accepts 1d as value' do
           result = subject.validate_options('deploy' => {'interval' => '1d'})
-          expect(result.messages.key?('deploy')).to be_falsey
+          expect(result.errors.key?('deploy')).to be_falsey
         end
 
         it 'accepts integer as value' do
           result = subject.validate_options('deploy' => {'interval' => '100'})
-          expect(result.messages.key?('deploy')).to be_falsey
+          expect(result.errors.key?('deploy')).to be_falsey
         end
       end
     end
@@ -137,59 +132,59 @@ describe Kontena::Cli::Apps::YAML::Validator do
     context 'command' do
       it 'is optional' do
         result = subject.validate_options({})
-        expect(result.messages.key?('command')).to be_falsey
+        expect(result.errors.key?('command')).to be_falsey
       end
 
       it 'must be string or empty' do
         result = subject.validate_options('command' => 1234)
-        expect(result.messages.key?('command')).to be_truthy
+        expect(result.errors.key?('command')).to be_truthy
 
         result = subject.validate_options('command' => nil)
-        expect(result.messages.key?('command')).to be_falsey
+        expect(result.errors.key?('command')).to be_falsey
 
         result = subject.validate_options('command' => 'bundle exec rails s')
-        expect(result.messages.key?('command')).to be_falsey
+        expect(result.errors.key?('command')).to be_falsey
       end
     end
 
     it 'validates cpu_shares is integer' do
       result = subject.validate_options('cpu_shares' => '1m')
-      expect(result.messages.key?('cpu_shares')).to be_truthy
+      expect(result.errors.key?('cpu_shares')).to be_truthy
       result = subject.validate_options('cpu_shares' => 1024)
-      expect(result.messages.key?('cpu_shares')).to be_falsey
+      expect(result.errors.key?('cpu_shares')).to be_falsey
       result = subject.validate_options({})
-      expect(result.messages.key?('cpu_shares')).to be_falsey
+      expect(result.errors.key?('cpu_shares')).to be_falsey
     end
 
     it 'validates environment is array or hash' do
       result = subject.validate_options('environment' => 'KEY=VALUE')
-      expect(result.messages.key?('environment')).to be_truthy
+      expect(result.errors.key?('environment')).to be_truthy
       result = subject.validate_options('environment' => ['KEY=VALUE'])
-      expect(result.messages.key?('environment')).to be_falsey
+      expect(result.errors.key?('environment')).to be_falsey
       result = subject.validate_options('environment' => { 'KEY' => 'VALUE' })
-      expect(result.messages.key?('environment')).to be_falsey
+      expect(result.errors.key?('environment')).to be_falsey
     end
 
     context 'validates secrets' do
       it 'must be array' do
         result = subject.validate_options('secrets' => {})
-        expect(result.messages.key?('secrets')).to be_truthy
+        expect(result.errors.key?('secrets')).to be_truthy
       end
 
       context 'item' do
         it 'must contain secret' do
           result = subject.validate_options('secrets' => [{ 'name' => 'test', 'type' => 'env' }])
-          expect(result.messages.key?('secrets')).to be_truthy
+          expect(result.errors.key?('secrets')).to be_truthy
         end
 
         it 'must contain name' do
           result = subject.validate_options('secrets' => [{ 'secret' => 'test', 'type' => 'env' }])
-          expect(result.messages.key?('secrets')).to be_truthy
+          expect(result.errors.key?('secrets')).to be_truthy
         end
 
         it 'must contain type' do
           result = subject.validate_options('secrets' => [{ 'secret' => 'test', 'name' => 'test' }])
-          expect(result.messages.key?('secrets')).to be_truthy
+          expect(result.errors.key?('secrets')).to be_truthy
         end
 
         it 'accepts valid input' do
@@ -201,7 +196,7 @@ describe Kontena::Cli::Apps::YAML::Validator do
                 'type' => 'env'
               }
             ])
-          expect(result.messages.key?('secrets')).to be_falsey
+          expect(result.errors.key?('secrets')).to be_falsey
         end
       end
     end
@@ -209,20 +204,20 @@ describe Kontena::Cli::Apps::YAML::Validator do
     context 'validates extends' do
       it 'accepts string value' do
         result = subject.validate_options('extends' => 'web')
-        expect(result.messages.key?('extends')).to be_falsey
+        expect(result.errors.key?('extends')).to be_falsey
       end
 
       context 'when value is hash' do
         it 'must contain service' do
           result = subject.validate_options('extends' => { 'file' => 'docker_compose.yml'})
-          expect(result.messages.key?('extends')).to be_truthy
+          expect(result.errors.key?('extends')).to be_truthy
         end
       end
 
       context 'when value is not string or hash' do
         it 'returns error' do
           result = subject.validate_options('extends' => ['array is invalid'])
-          expect(result.messages.key?('extends')).to be_truthy
+          expect(result.errors.key?('extends')).to be_truthy
         end
       end
     end
@@ -230,7 +225,7 @@ describe Kontena::Cli::Apps::YAML::Validator do
       context 'validates pre_build' do
         it 'must be array' do
           result = subject.validate_options('hooks' => { 'pre_build' => {} })
-          expect(result.messages.key?('hooks')).to be_truthy
+          expect(result.errors.key?('hooks')).to be_truthy
           data = {
             'hooks' => {
               'pre_build' => [
@@ -241,13 +236,13 @@ describe Kontena::Cli::Apps::YAML::Validator do
             }
           }
           result = subject.validate_options(data)
-          expect(result.messages.key?('hooks')).to be_falsey
+          expect(result.errors.key?('hooks')).to be_falsey
         end
       end
       context 'validates post_start' do
         it 'must be array' do
           result = subject.validate_options('hooks' => { 'post_start' => {} })
-          expect(result.messages.key?('hooks')).to be_truthy
+          expect(result.errors.key?('hooks')).to be_truthy
           data = {
             'hooks' => {
               'post_start' => [
@@ -260,7 +255,7 @@ describe Kontena::Cli::Apps::YAML::Validator do
             }
           }
           result = subject.validate_options(data)
-          expect(result.messages.key?('hooks')).to be_falsey
+          expect(result.errors.key?('hooks')).to be_falsey
         end
 
         context 'item' do
@@ -274,7 +269,7 @@ describe Kontena::Cli::Apps::YAML::Validator do
                 }
               ]
             })
-            expect(result.messages.key?('hooks')).to be_truthy
+            expect(result.errors.key?('hooks.post_start')).to be_truthy
           end
 
           it 'must contain cmd' do
@@ -287,7 +282,7 @@ describe Kontena::Cli::Apps::YAML::Validator do
                 }
               ]
             })
-            expect(result.messages.key?('hooks')).to be_truthy
+            expect(result.errors.key?('hooks.post_start')).to be_truthy
           end
 
           it 'must contain instance number or *' do
@@ -299,7 +294,7 @@ describe Kontena::Cli::Apps::YAML::Validator do
                 }
               ]
             })
-            expect(result.messages.key?('hooks')).to be_truthy
+            expect(result.errors.key?('hooks.post_start')).to be_truthy
             data = {
               'hooks' => {
                 'post_start' => [
@@ -313,7 +308,7 @@ describe Kontena::Cli::Apps::YAML::Validator do
               }
             }
             result = subject.validate_options(data)
-            expect(result.messages.key?('hooks')).to be_truthy
+            expect(result.errors.key?('hooks.post_start')).to be_truthy
           end
 
           it 'may contain boolean oneshot' do
@@ -330,24 +325,24 @@ describe Kontena::Cli::Apps::YAML::Validator do
               }
             }
             result = subject.validate_options(data)
-            expect(result.messages.key?('hooks')).to be_truthy
+            expect(result.errors.key?('hooks.post_start')).to be_truthy
           end
         end
 
         it 'validates volumes is array' do
           result = subject.validate_options('volumes' => '/app')
-          expect(result.messages.key?('volumes')).to be_truthy
+          expect(result.errors.key?('volumes')).to be_truthy
 
           result = subject.validate_options('volumes' => ['/app'])
-          expect(result.messages.key?('volumes')).to be_falsey
+          expect(result.errors.key?('volumes')).to be_falsey
         end
 
         it 'validates volumes_from is array' do
           result = subject.validate_options('volumes_from' => 'mysql_data')
-          expect(result.messages.key?('volumes_from')).to be_truthy
+          expect(result.errors.key?('volumes_from')).to be_truthy
 
           result = subject.validate_options('volumes_from' => ['mysql_data'])
-          expect(result.messages.key?('volumes_from')).to be_falsey
+          expect(result.errors.key?('volumes_from')).to be_falsey
         end
       end
     end
@@ -355,31 +350,31 @@ describe Kontena::Cli::Apps::YAML::Validator do
     context 'validates health_check' do
       it 'validates health_check' do
         result = subject.validate_options('health_check' => {})
-        expect(result.messages.key?('health_check')).to be_truthy
+        expect(result.errors.key?('health_check')).to be_truthy
       end
 
       it 'validates health_check port ' do
         result = subject.validate_options('health_check' => { 'protocol' => 'http', 'port' => 'abc'})
-        expect(result.messages.key?('health_check')).to be_truthy
+        expect(result.errors.key?('health_check')).to be_truthy
 
         result = subject.validate_options('health_check' => { 'protocol' => 'http', 'port' => 8080})
-        expect(result.messages.key?('health_check')).to be_falsey
+        expect(result.errors.key?('health_check')).to be_falsey
       end
 
       it 'validates health_check uri' do
         result = subject.validate_options('health_check' => { 'protocol' => 'http', 'port' => 8080, 'uri' => 'foobar'})
-        expect(result.messages.key?('health_check')).to be_truthy
+        expect(result.errors.key?('health_check')).to be_truthy
 
         result = subject.validate_options('health_check' => { 'protocol' => 'http', 'port' => 8080, 'uri' => '/health/foo/bar'})
-        expect(result.messages.key?('health_check')).to be_falsey
+        expect(result.errors.key?('health_check')).to be_falsey
       end
 
       it 'validates health_check protocol' do
         result = subject.validate_options('health_check' => { 'protocol' => 'foo', 'port' => 8080, 'uri' => 'foobar'})
-        expect(result.messages.key?('health_check')).to be_truthy
+        expect(result.errors.key?('health_check')).to be_truthy
 
         result = subject.validate_options('health_check' => { 'protocol' => 'tcp', 'port' => 3306 })
-        expect(result.messages.key?('health_check')).to be_falsey
+        expect(result.errors.key?('health_check')).to be_falsey
       end
     end
   end