kontena-cli 1.4.0 → 1.4.1.pre1

data/spec/kontena/cli/cloud/login_command_spec.rb

@@ -20,18 +20,15 @@ describe Kontena::Cli::Cloud::LoginCommand do
   end
 
   it 'should give error if trying to use --code and --force' do
-    expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-    subject.run(['--code', 'abcd', '--force'])
+    expect{subject.run(['--code', 'abcd', '--force'])}.to exit_with_error
   end
 
   it 'should give error if trying to use --token and --force' do
-    expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-    subject.run(['--token', 'abcd', '--force'])
+    expect{subject.run(['--token', 'abcd', '--force'])}.to exit_with_error
   end
 
   it 'should give error if trying to use --token and --code' do
-    expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-    subject.run(['--token', 'abcd', '--code', 'defg'])
+    expect{subject.run(['--token', 'abcd', '--code', 'defg'])}.to exit_with_error
   end
 
   context 'when config has token' do
@@ -180,8 +177,7 @@ describe Kontena::Cli::Cloud::LoginCommand do
           'error' => 'foo'
         })
         expect(Launchy).to receive(:open).and_return(true)
-        expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-        subject.run([])
+        expect{subject.run([])}.to exit_with_error.and output(/Authentication failed: foo/).to_stderr
       end
     end
   end
@@ -283,14 +279,12 @@ describe Kontena::Cli::Cloud::LoginCommand do
 
       it 'should exit with error if cloud responds with error' do
         expect(client).to receive(:get).and_return('error' => 'foo')
-        expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-        subject.update_userinfo
+        expect{subject.update_userinfo}.to exit_with_error
       end
 
       it 'should exit with error if cloud responds with something silly' do
         expect(client).to receive(:get).and_return('foo')
-        expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-        subject.update_userinfo
+        expect{subject.update_userinfo}.to exit_with_error
       end
     end
 
@@ -313,8 +307,7 @@ describe Kontena::Cli::Cloud::LoginCommand do
       end
 
       it 'should give error when response has error' do
-        expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-        subject.update_token('error' => 'fail!')
+        expect{subject.update_token('error' => 'fail!')}.to exit_with_error
       end
 
       it 'should raise if response is not a hash' do

data/spec/kontena/cli/helpers/exec_helper_spec.rb

@@ -57,6 +57,44 @@ describe Kontena::Cli::Helpers::ExecHelper do
           "\n",
         ).and raise_error(EOFError)
       end
+
+      it 'yields chunks of UTF-8 input that are JSON-encodable' do
+        data = "f\u00e5\u00e5".encode('UTF-8').force_encoding('ASCII-8BIT')
+
+        expect(stdin_raw).to receive(:readpartial).and_return(data[0..2])
+        expect(stdin_raw).to receive(:readpartial).and_return(data[3..4])
+        expect(stdin_raw).to receive(:readpartial).and_raise(EOFError)
+
+        chunks = []
+
+        expect{subject.read_stdin(tty: true) do |chunk|
+          chunks << JSON.dump('stdin' => chunk)
+        end}.to raise_error(EOFError)
+
+        expect(chunks).to eq [
+          '{"stdin":"f' + "\u00e5" + '"}',
+          '{"stdin":"' + "\u00e5" + '"}',
+        ]
+      end
+
+      it 'yields tty control characters that are JSON-encodable' do
+        data = "\x03\x04".force_encoding('ASCII-8BIT')
+
+        expect(stdin_raw).to receive(:readpartial).and_return(data[0])
+        expect(stdin_raw).to receive(:readpartial).and_return(data[1])
+        expect(stdin_raw).to receive(:readpartial).and_raise(EOFError)
+
+        chunks = []
+
+        expect{subject.read_stdin(tty: true) do |chunk|
+          chunks << JSON.dump('stdin' => chunk)
+        end}.to raise_error(EOFError)
+
+        expect(chunks).to eq [
+          '{"stdin":"\\u0003"}',
+          '{"stdin":"\\u0004"}',
+        ]
+      end
     end
   end
 

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

@@ -14,23 +14,19 @@ describe Kontena::Cli::Master::LoginCommand do
   let(:client) { double(:client) }
 
   it 'should exit with error if --code and --token both given' do
-    expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-    subject.run(%w(--code abcd --token defg))
+    expect{subject.run(%w(--code abcd --token defg))}.to exit_with_error
   end
 
   it 'should exit with error if --code and --join both given' do
-    expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-    subject.run(%w(--code abcd --join defg))
+    expect{subject.run(%w(--code abcd --join defg))}.to exit_with_error
   end
 
   it 'should exit with error if --code and --force both given' do
-    expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-    subject.run(%w(--code abcd --force))
+    expect{subject.run(%w(--code abcd --force))}.to exit_with_error
   end
 
   it 'should exit with error if --token and --force both given' do
-    expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-    subject.run(%w(--token abcd --force))
+    expect{subject.run(%w(--token abcd --force))}.to exit_with_error
   end
 
   describe '#select_a_server' do
@@ -49,8 +45,7 @@ describe Kontena::Cli::Master::LoginCommand do
 
       it 'exits with error if current_master not set' do
         expect(config).to receive(:current_master).and_return(nil)
-        expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-        subject.select_a_server(nil, nil)
+        expect{subject.select_a_server(nil, nil)}.to exit_with_error
       end
     end
 
@@ -88,8 +83,7 @@ describe Kontena::Cli::Master::LoginCommand do
         it 'should exit with error if a server with that name is found but it does not have an url' do
           server.url = nil
           expect(config).to receive(:find_server).with('foo').and_return(server)
-          expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-          subject.select_a_server('foo', nil)
+          expect{subject.select_a_server('foo', nil)}.to exit_with_error
         end
       end
     end
@@ -119,14 +113,12 @@ describe Kontena::Cli::Master::LoginCommand do
         it 'should exit with error if a server with that name is found but it does not have an url' do
           server.url = nil
           expect(config).to receive(:find_server).with('foo').and_return(server)
-          expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-          subject.select_a_server(nil, 'foo')
+          expect{subject.select_a_server(nil, 'foo')}.to exit_with_error
         end
 
         it 'should exit with error if a server with that name is not found' do
           expect(config).to receive(:find_server).with('foo').and_return(nil)
-          expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-          subject.select_a_server(nil, 'foo')
+          expect{subject.select_a_server(nil, 'foo')}.to exit_with_error
         end
       end
     end
@@ -350,24 +342,21 @@ describe Kontena::Cli::Master::LoginCommand do
       allow(Kontena::Client).to receive(:new).and_return(client)
       expect(client).to receive(:last_response).at_least(:once).and_return(OpenStruct.new(status: 400, headers: {}))
       expect(client).to receive(:request).and_return('error' => 'no good')
-      expect(subject).to receive(:exit_with_error).with(/no good/).and_throw(:exit_with_error)
-      subject.authentication_url_from_master('https://foo.example.com', remote: true)
+      expect{subject.authentication_url_from_master('https://foo.example.com', remote: true)}.to exit_with_error
     end
 
     it 'should exit with error if master returns text' do
       allow(Kontena::Client).to receive(:new).and_return(client)
       expect(client).to receive(:last_response).at_least(:once).and_return(OpenStruct.new(status: 400, headers: {}))
       expect(client).to receive(:request).and_return('Fail!')
-      expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-      subject.authentication_url_from_master('https://foo.example.com', remote: true)
+      expect{subject.authentication_url_from_master('https://foo.example.com', remote: true)}.to exit_with_error
     end
 
     it 'should exit with error if master returns nil' do
       allow(Kontena::Client).to receive(:new).and_return(client)
       expect(client).to receive(:last_response).at_least(:once).and_return(OpenStruct.new(status: 400, headers: {}))
       expect(client).to receive(:request).and_return(nil)
-      expect(subject).to receive(:exit_with_error).with(/Invalid.+?400/).and_throw(:exit_with_error)
-      subject.authentication_url_from_master('https://foo.example.com', remote: true)
+      expect{subject.authentication_url_from_master('https://foo.example.com', remote: true)}.to exit_with_error
     end
   end
 
@@ -399,8 +388,7 @@ describe Kontena::Cli::Master::LoginCommand do
     end
 
     it 'should exit with error if response has error' do
-      expect(subject).to receive(:exit_with_error).and_throw(:exit_with_error)
-      subject.update_server_token(server, "error" => "abcd")
+      expect{subject.update_server_token(server, "error" => "abcd")}.to exit_with_error
     end
 
     it 'should update the token if all is good' do

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

@@ -16,7 +16,7 @@ describe Kontena::Cli::Master::UseCommand do
     end
 
     it 'should abort with error message if master is not configured' do
-      expect { subject.run(['not_existing']) }.to output(/Could not resolve master with name: 'not_existing'/).to_stderr
+      expect { subject.run(['not_existing']) }.to exit_with_error.and output(/Could not resolve master by name 'not_existing'/).to_stderr
     end
 
     it 'should abort with error message if master is not given' do

data/spec/kontena/cli/nodes/remove_command_spec.rb

@@ -49,7 +49,7 @@ describe Kontena::Cli::Nodes::RemoveCommand do
     it 'does not remove the node' do
       expect(client).not_to receive(:delete)
 
-      expect{subject.run(['node-1'])}.to output(" [error] Node node-1 is still online. You must terminate the node before removing it.\n").to_stderr
+      expect{subject.run(['node-1'])}.to exit_with_error.and output(" [error] Node node-1 is still connected using a grid token. You must terminate the node before removing it.\n").to_stderr
     end
   end
 

data/spec/kontena/cli/stacks/upgrade_command_spec.rb

@@ -76,7 +76,7 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
           'stacks/test-grid/stack-a', anything
         ).and_return({})
         expect(Kontena).not_to receive(:run!).with(['stack', 'deploy', 'stack-a'])
-        subject.run(['--no-deploy', 'stack-a', fixture_path('kontena_v3.yml')])
+        subject.run(['--no-deploy', '--force', 'stack-a', fixture_path('kontena_v3.yml')])
       end
     end
 

data/spec/kontena/cli/stacks/yaml/opto/certificates_resolver_spec.rb

@@ -0,0 +1,81 @@
+require 'opto'
+require 'kontena/cli/stacks/yaml/opto/certificates_resolver'
+
+describe Kontena::Cli::Stacks::YAML::Opto::Resolvers::Certificates do
+  let(:client) { instance_double(Kontena::Client) }
+  let(:prompt) { double(:prompt) }
+  let(:prompt_menu) { double(:prompt_menu) }
+
+  let(:option_hint) { "Select SSL certificates" }
+  let(:option_default) { nil }
+  let(:option) { Opto::Option.new(default: option_default) }
+  subject { described_class.new(option_hint, option) }
+
+  before do
+    allow(subject).to receive(:current_master).and_return("test-master")
+    allow(subject).to receive(:current_grid).and_return("test-grid")
+    allow(subject).to receive(:client).and_return(client)
+    allow(subject).to receive(:prompt).and_return(prompt)
+  end
+
+  context 'with grid certificates' do
+    let(:certificates) { [
+      { 'subject' => 'test.example.com' },
+      { 'subject' => 'test-2.example.com' },
+    ] }
+
+    before do
+      allow(client).to receive(:get).with('grids/test-grid/certificates').and_return('certificates' => certificates)
+    end
+
+    it 'lists grid certificates and prompts' do
+      expect(prompt).to receive(:multi_select).with(option_hint) do |&block|
+        expect(prompt_menu).to_not receive(:default)
+        expect(prompt_menu).to receive(:choice).with('test.example.com')
+        expect(prompt_menu).to receive(:choice).with('test-2.example.com')
+
+        block.call(prompt_menu)
+
+        ['test.example.com']
+      end
+
+      expect(subject.resolve).to eq ['test.example.com']
+    end
+
+    context 'with default value' do
+      let(:option_default) { ['test.example.com'] }
+
+      it 'lists grid certificates and prompts' do
+        expect(prompt).to receive(:multi_select).with(option_hint) do |&block|
+          expect(prompt_menu).to receive(:default).with(1)
+          expect(prompt_menu).to receive(:choice).with('test.example.com')
+          expect(prompt_menu).to receive(:choice).with('test-2.example.com')
+
+          block.call(prompt_menu)
+
+          ['test.example.com']
+        end
+
+        expect(subject.resolve).to eq ['test.example.com']
+      end
+    end
+
+    context 'with default values' do
+      let(:option_default) { ['test.example.com', 'test-2.example.com'] }
+
+      it 'lists grid certificates and prompts' do
+        expect(prompt).to receive(:multi_select).with(option_hint) do |&block|
+          expect(prompt_menu).to receive(:default).with(1, 2)
+          expect(prompt_menu).to receive(:choice).with('test.example.com')
+          expect(prompt_menu).to receive(:choice).with('test-2.example.com')
+
+          block.call(prompt_menu)
+
+          ['test.example.com', 'test-2.example.com']
+        end
+
+        expect(subject.resolve).to eq ['test.example.com', 'test-2.example.com']
+      end
+    end
+  end
+end

data/spec/kontena/cli/stacks/yaml/reader_spec.rb

@@ -112,7 +112,21 @@ describe Kontena::Cli::Stacks::YAML::Reader do
               "links"=>[],
               "ports"=>[],
               "stateful"=>true,
-              "name"=>"mysql"
+              "name"=>"mysql",
+              "entrypoint" => "test"
+            )
+          )
+        end
+
+        it 'passes variables to extended file' do
+          allow(File).to receive(:exist?).with(fixture_path('docker-compose_v2_with_variables.yml')).and_call_original
+          allow(File).to receive(:read).with(fixture_path('docker-compose_v2_with_variables.yml')).and_call_original
+          allow(File).to receive(:exist?).with(fixture_path('kontena_v3.yml')).and_call_original
+          allow(File).to receive(:read).with(fixture_path('kontena_v3.yml')).and_return(fixture('kontena_v3_with_compose_variables.yml'))
+          expect(subject.execute['services']).to match array_including(
+            hash_including(
+              "name" => 'mysql',
+              "env" => ["ENV_VAR=abcd"]
             )
           )
         end
@@ -146,7 +160,6 @@ describe Kontena::Cli::Stacks::YAML::Reader do
         it 'extends services from the same file' do
           app_svc = subject.execute['services'].find { |s| s['name'] == 'app' }
           expect(app_svc).not_to be_nil
-          puts app_svc.inspect
           expect(app_svc).to match hash_including(
             "image" => "base:latest",
             "instances" => 2,
@@ -514,4 +527,11 @@ describe Kontena::Cli::Stacks::YAML::Reader do
       )
     end
   end
+
+  context "yaml with anchors" do
+    subject { described_class.new(fixture_path('stack-with-anchors.yml')) }
+    it 'parses correctly' do
+      expect(subject.execute['services'].all? { |svc| svc['affinity'] == ['abc==dfg']}).to be_truthy
+    end
+  end
 end

data/spec/kontena/cli/stacks/yaml/validator_v3_spec.rb

@@ -52,6 +52,23 @@ describe Kontena::Cli::Stacks::YAML::ValidatorV3 do
       expect(result.errors.key?('network_mode')).to be_falsey
     end
 
+    context 'entrypoint' do
+      it 'is optional' do
+        result = subject.validate_options({})
+        expect(result.errors.key?('entrypoint')).to be_falsey
+      end
+
+      it 'passes validation when string' do
+        result = subject.validate_options({'entrypoint' => 'abcd'})
+        expect(result.errors.key?('entrypoint')).to be_falsey
+      end
+
+      it 'fails validation when not a string' do
+        result = subject.validate_options({'entrypoint' => 1})
+        expect(result.errors.key?('entrypoint')).to be_truthy
+      end
+    end
+
     context 'affinity' do
       it 'is optional' do
         result = subject.validate_options({})

data/spec/kontena/command_spec.rb

@@ -0,0 +1,54 @@
+require 'kontena/command'
+
+describe Kontena::Command do
+  let(:subject) { described_class.new('kontena') }
+
+  context 'for a command that raises RuntimeError without including Kontena::Cli::Common' do
+    let(:command_class) { Class.new(Kontena::Command) do
+      def execute
+        fail 'test'
+      end
+    end}
+
+    subject { command_class.new('test') }
+
+    it 'logs an error and aborts' do
+      expect{subject.run([])}.to raise_error(SystemExit).and output(/\[error\] RuntimeError : test\s+See .* or run the command again with environment DEBUG=true set to see the full exception/m).to_stderr
+    end
+
+    context 'with DEBUG' do
+      before do
+        allow(Kontena).to receive(:debug?).and_return(true)
+      end
+
+      it 'lets the error raise through' do
+        expect{subject.run([])}.to raise_error(RuntimeError, 'test')
+      end
+
+    end
+  end
+
+  context 'for a command that raises StandardError without including Kontena::Cli::Common' do
+    let(:command_class) { Class.new(Kontena::Command) do
+      def execute
+        raise Kontena::Errors::StandardError.new(404, "Not Found")
+      end
+    end}
+
+    subject { command_class.new('test') }
+
+    it 'logs an error and aborts' do
+      expect{subject.run([])}.to raise_error(SystemExit).and output(" [error] 404 : Not Found\n").to_stderr
+    end
+
+    context 'with DEBUG' do
+      before do
+        allow(Kontena).to receive(:debug?).and_return(true)
+      end
+
+      it 'lets the error raise through' do
+        expect{subject.run([])}.to raise_error(Kontena::Errors::StandardError)
+      end
+    end
+  end
+end

data/spec/kontena/config_spec.rb

@@ -59,11 +59,11 @@ describe Kontena::Cli::Config do
       allow(File).to receive(:read).and_return <<-EOB
         {"current_server": "test123",
           "servers" : [
-            { 
+            {
               "name": "test123",
               "url": "https://foo.example.com"
             },
-            { 
+            {
               "name": "test123",
               "url": "https://foo2.example.com"
             }
@@ -82,6 +82,21 @@ describe Kontena::Cli::Config do
     end
   end
 
+  context 'environment variables' do
+    it 'sets cloud account on KONTENA_CLOUD_TOKEN' do
+      allow(ENV).to receive(:[]).with('KONTENA_CLOUD_TOKEN').and_return('abc')
+      expect(subject.current_account.token.access_token).to eq('abc')
+    end
+
+    it 'sets master information on KONTENA_URL, KONTENA_TOKEN & KONTENA_GRID' do
+      allow(ENV).to receive(:[]).with('KONTENA_URL').and_return('http://localhost')
+      allow(ENV).to receive(:[]).with('KONTENA_TOKEN').and_return('abc')
+      allow(ENV).to receive(:[]).with('KONTENA_GRID').and_return('test')
+      expect(subject.current_master.url).to eq('http://localhost')
+      expect(subject.current_master.grid).to eq('test')
+    end
+  end
+
   describe 'Token' do
     let(:subject) { Kontena::Cli::Config::Token.new(access_token: 'abcd', expires_at: Time.now.utc - 100) }