kontena-cli 1.4.3 → 1.5.0.pre1

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

@@ -1,6 +1,6 @@
 require 'kontena/cli/cloud/login_command'
 require 'kontena/cli/localhost_web_server'
-require 'launchy'
+require 'kontena/cli/browser_launcher'
 
 describe Kontena::Cli::Cloud::LoginCommand do
 
@@ -145,7 +145,7 @@ describe Kontena::Cli::Cloud::LoginCommand do
         expect(webserver).to receive(:serve_one).and_return({
           'access_token' => 'abcd'
         })
-        expect(Launchy).to receive(:open).and_return(true)
+        expect(Kontena::Cli::BrowserLauncher).to receive(:open).and_return(true)
         expect(subject).to receive(:finish).and_return(true)
         subject.run([])
         expect(account.token.access_token).to eq 'abcd'
@@ -159,7 +159,7 @@ describe Kontena::Cli::Cloud::LoginCommand do
         expect(webserver).to receive(:serve_one).and_return({
           'code' => 'abcd'
         })
-        expect(Launchy).to receive(:open).and_return(true)
+        expect(Kontena::Cli::BrowserLauncher).to receive(:open).and_return(true)
         expect(client).to receive(:exchange_code).with('abcd').and_return({
           'access_token' => 'abcdefg'
         })
@@ -176,7 +176,7 @@ describe Kontena::Cli::Cloud::LoginCommand do
         expect(webserver).to receive(:serve_one).and_return({
           'error' => 'foo'
         })
-        expect(Launchy).to receive(:open).and_return(true)
+        expect(Kontena::Cli::BrowserLauncher).to receive(:open).and_return(true)
         expect{subject.run([])}.to exit_with_error.and output(/Authentication failed: foo/).to_stderr
       end
     end

data/spec/kontena/cli/common_spec.rb

@@ -137,8 +137,15 @@ describe Kontena::Cli::Common do
       it 'returns true if input matches' do
         allow(subject).to receive(:ask).and_return('name-to-confirm')
 
-        expect(subject.confirm_command('name-to-confirm')).to be_truthy
         expect{subject.confirm_command('name-to-confirm')}.to_not raise_error
+        expect(subject.confirm_command('name-to-confirm')).to be_truthy
+      end
+
+      it 'returns true if input matches and param is not a string' do
+        allow(subject).to receive(:ask).and_return('123')
+
+        expect{subject.confirm_command(123)}.to_not raise_error
+        expect(subject.confirm_command(123)).to be_truthy
       end
 
       it 'raises error unless input matches' do

data/spec/kontena/cli/grids/update_command_spec.rb

@@ -51,6 +51,19 @@ describe Kontena::Cli::Grids::UpdateCommand do
         subject.run(['--no-statsd-server', 'test'])
       end
 
+      it 'should send "none" as log forwarder when --no-log-forwarder given' do
+        expect(client).to receive(:put).with(
+          'grids/test', hash_including(
+            logs: hash_including(forwarder: 'none')
+          )
+        )
+        subject.run(['--no-log-forwarder', 'test'])
+      end
+
+      it 'should exit with error if --log-forwarder and --no-log-forwarder given' do
+        expect{subject.run(['--log-forwarder', 'fluentd', '--no-log-forwarder', 'test'])}.to exit_with_error.and output(/together/).to_stderr
+      end
+
       it 'should send empty default_affinity when --no-default-affinity given' do
         expect(client).to receive(:put).with(
           'grids/test', hash_including({

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

@@ -1,7 +1,4 @@
 require 'kontena/cli/master/join_command'
-require 'kontena/cli/localhost_web_server'
-require 'launchy'
-require 'ostruct'
 
 describe Kontena::Cli::Master::JoinCommand do
 
@@ -30,4 +27,4 @@ describe Kontena::Cli::Master::JoinCommand do
     expect(Kontena).to receive(:run!).with(%w(master login --join xyz --verbose someurl))
     subject.run(%w(--verbose someurl xyz))
   end
-end
+end

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

@@ -1,6 +1,6 @@
 require 'kontena/cli/master/login_command'
 require 'kontena/cli/localhost_web_server'
-require 'launchy'
+require 'kontena/cli/browser_launcher'
 require 'ostruct'
 
 describe Kontena::Cli::Master::LoginCommand do
@@ -147,7 +147,7 @@ describe Kontena::Cli::Master::LoginCommand do
       allow(File).to receive(:exist?).and_return(true)
       allow(File).to receive(:readable?).and_return(true)
       allow(Kontena::Client).to receive(:new).and_return(client)
-      allow(Launchy).to receive(:open).and_return(true)
+      allow(Kontena::Cli::BrowserLauncher).to receive(:open).and_return(true)
       allow(Kontena::LocalhostWebServer).to receive(:port).and_return(12345)
       allow(Kontena::LocalhostWebServer).to receive(:serve_one).and_return(
         { 'code' => 'abcd1234' }
@@ -254,7 +254,7 @@ describe Kontena::Cli::Master::LoginCommand do
         expect(opts[:path]).to eq "/authenticate?redirect_uri=http%3A%2F%2Flocalhost%3A12345%2Fcb&expires_in=7200"
         expect(opts[:http_method]).to eq :get
       end.and_return({})
-      expect(Launchy).to receive(:open).with('http://authprovider.example.com/authplz').and_return(true)
+      expect(Kontena::Cli::BrowserLauncher).to receive(:open).with('http://authprovider.example.com/authplz').and_return(true)
       expect(client).to receive(:exchange_code).with('abcd1234').and_return('access_token' => 'defg456', 'server' => { 'name' => 'foobar' }, 'user' => { 'name' => 'testuser' })
       subject.run(%w(--no-remote --skip-grid-auto-select http://foobar.example.com))
       expect(subject.config.servers.size).to eq 1
@@ -328,7 +328,7 @@ describe Kontena::Cli::Master::LoginCommand do
     it 'changes current master to created master' do
       allow(client).to receive(:last_response).at_least(:once).and_return(OpenStruct.new(status: 302, headers: { 'Location' => 'http://authprovider.example.com/authplz' }))
       allow(client).to receive(:request).and_return({})
-      allow(Launchy).to receive(:open).with('http://authprovider.example.com/authplz').and_return(true)
+      allow(Kontena::Cli::BrowserLauncher).to receive(:open).with('http://authprovider.example.com/authplz').and_return(true)
       allow(client).to receive(:exchange_code).with('abcd1234').and_return('access_token' => 'defg456', 'server' => { 'name' => 'foobar' }, 'user' => { 'name' => 'testuser' })
       subject.config.current_master = 'fooserver'
       subject.config.current_master

data/spec/kontena/cli/master/token/create_command_spec.rb

@@ -0,0 +1,132 @@
+require 'kontena/cli/master/token_command'
+require 'kontena/cli/master/token/create_command'
+
+describe Kontena::Cli::Master::Token::CreateCommand do
+  include ClientHelpers
+  include RequirementsHelper
+  include OutputHelpers
+
+  expect_to_require_current_master
+  expect_to_require_current_master_token
+
+  let(:response) do
+    {
+      "id" => "123",
+      "token_type" => "bearer",
+      "access_token" => '1234abcd',
+      "refresh_token" => '2345defg',
+      "access_token_last_four" => "abcd",
+      "refresh_token_last_four" => "defg",
+      "expires_in" => 100,
+      "scopes" => "user",
+      "user" => {
+        "id" => "abc",
+        "email" => "user@email",
+        "name" => "username"
+      },
+      "server" => {
+        "name" => "foo"
+      },
+      "description" => "description test"
+    }
+  end
+
+  context '--description' do
+    it 'adds a description to token create request' do
+      expect(client).to receive(:post) do |path, data|
+        expect(path).to eq '/oauth2/authorize'
+        expect(data[:description]).to eq 'description test'
+      end.and_return(response)
+      expect{subject.run(['--description', 'description test'])}.not_to exit_with_error
+    end
+  end
+
+  context '--scopes' do
+    it 'accepts a comma separated list of scopes' do
+      expect(client).to receive(:post) do |path, data|
+        expect(path).to eq '/oauth2/authorize'
+        expect(data[:scope]).to eq 'xyz,zyx'
+      end.and_return(response)
+      expect{subject.run(['--scopes', 'xyz,zyx'])}.not_to exit_with_error
+    end
+  end
+
+  context '--code' do
+    it 'can request an authorization_code' do
+      expect(client).to receive(:post) do |path, data|
+        expect(path).to eq '/oauth2/authorize'
+        expect(data[:response_type]).to eq 'code'
+      end.and_return(response)
+      expect{subject.run(['--code'])}.not_to exit_with_error
+    end
+  end
+
+  context '--expires-in' do
+    it 'can request a token without expiration' do
+      expect(client).to receive(:post) do |path, data|
+        expect(path).to eq '/oauth2/authorize'
+        expect(data[:expires_in]).to eq '0'
+      end.and_return(response)
+      expect{subject.run(['--expires-in', '0'])}.not_to exit_with_error
+    end
+  end
+
+  context '--token' do
+    it 'requests a token and outputs the generated token' do
+      expect(client).to receive(:post) do |path, data|
+        expect(path).to eq '/oauth2/authorize'
+        expect(data[:response_type]).to eq 'token'
+      end.and_return(response)
+      expect{subject.run(['--token'])}.to output(/\A1234abcd\Z/).to_stdout
+    end
+  end
+
+  context '--id' do
+    it 'requests a token and outputs the generated token id' do
+      expect(client).to receive(:post) do |path, data|
+        expect(path).to eq '/oauth2/authorize'
+        expect(data[:response_type]).to eq 'token'
+      end.and_return(response)
+      expect{subject.run(['--id'])}.to output(/\A123\Z/).to_stdout
+    end
+  end
+
+  context '--user' do
+    it 'can request a token for another user' do
+      expect(client).to receive(:post) do |path, data|
+        expect(path).to eq '/oauth2/authorize'
+        expect(data[:user]).to eq 'foo@example.com'
+      end.and_return(response)
+      expect{subject.run(['--user', 'foo@example.com'])}.not_to exit_with_error
+    end
+  end
+
+  context 'no parameters' do
+    it 'requests an expiring user scoped token with an empty description and outputs token and refresh token' do
+      expect(client).to receive(:post) do |path, data|
+        expect(path).to eq '/oauth2/authorize'
+        expect(data[:user]).to be_nil
+        expect(data[:description]).to be_nil
+        expect(data[:response_type]).to eq 'token'
+        expect(data[:expires_in]).to eq '7200'
+        expect(data[:scope]).to eq 'user'
+      end.and_return(response)
+      expect{subject.run([])}.to output_yaml(
+        123 => {
+          'access_token' => '1234abcd',
+          'refresh_token' => '2345defg',
+          'access_token_last_four' => 'abcd',
+          'refresh_token_last_four' => 'defg',
+          'expires_in' => 100,
+          'token_type' => 'bearer',
+          'scopes' => 'user',
+          'user_id' => 'abc',
+          'user_email' => 'user@email',
+          'user_name' => 'username',
+          'server_name' => 'foo',
+          'description' => 'description test'
+        }
+      )
+    end
+  end
+end

data/spec/kontena/cli/master/token/show_command_spec.rb

@@ -0,0 +1,90 @@
+require 'kontena/cli/master/token_command'
+require 'kontena/cli/master/token/show_command'
+
+describe Kontena::Cli::Master::Token::ShowCommand do
+
+  include ClientHelpers
+  include RequirementsHelper
+  include OutputHelpers
+
+  expect_to_require_current_master
+  expect_to_require_current_master_token
+
+  context 'for an access token' do
+    let(:response) do
+      {
+        "id" => "123",
+        "token_type" => "bearer",
+        "access_token" => nil,
+        "refresh_token" => nil,
+        "access_token_last_four" => "abcd",
+        "refresh_token_last_four" => "efgh",
+        "expires_in" => 100,
+        "scopes" => "user",
+        "user" => {
+          "id" => "abc",
+          "email" => "user@email",
+          "name" => "username"
+        },
+        "server" => {
+          "name" => "foo"
+        },
+        "description" => "description test"
+      }
+    end
+
+    it 'requests token data from master and displays it' do
+      expect(client).to receive(:get).with("/oauth2/tokens/123").and_return(response)
+      expect{subject.run(['123'])}.to output_yaml(
+        123 => {
+          'token_type' => 'bearer',
+          'scopes' => 'user',
+          'user_id' => 'abc',
+          'user_email' => 'user@email',
+          'user_name' => 'username',
+          'server_name' => 'foo',
+          'access_token_last_four' => 'abcd',
+          'refresh_token_last_four' => 'efgh',
+          'expires_in' => 100,
+          'description' => 'description test'
+        }
+      )
+    end
+  end
+
+  context 'for an authorization code' do
+    let(:response) do
+      {
+        "id" => 123,
+        "grant_type" => "authorization_code",
+        "code" => "abcd",
+        "scopes" => "user",
+        "user" => {
+          "id" => "abc",
+          "email" => "user@email",
+          "name" => "username"
+        },
+        "server" => {
+          "name" => "foo"
+        },
+        "description" => 'description test'
+      }
+    end
+
+    it 'requests auth code data from master and displays it' do
+      expect(client).to receive(:get).with("/oauth2/tokens/123").and_return(response)
+      expect{subject.run(['123'])}.to output_yaml(
+        123 => {
+          'code' => 'abcd',
+          'token_type' => 'authorization_code',
+          'scopes' => 'user',
+          'user_id' => 'abc',
+          'user_email' => 'user@email',
+          'user_name' => 'username',
+          'server_name' => 'foo',
+          'description' => 'description test'
+        }
+      )
+    end
+  end
+end

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

@@ -18,11 +18,20 @@ describe Kontena::Cli::Nodes::Labels::RemoveCommand do
       }
     end
 
-    it "doesn't remove anything" do
-      expect(client).to receive(:put).with('nodes/test-grid/node', {
-          labels: [],
-      })
-      subject.run(['node', 'test=yes'])
+    context "when removing an unknown label" do
+      context "with --force" do
+        it 'does nothing' do
+          expect(client).not_to receive(:put)
+          expect{subject.run(['--force', 'node', 'test=yes'])}.not_to exit_with_error
+        end
+      end
+
+      context "without --force" do
+        it "exits with error" do
+          expect(client).not_to receive(:put)
+          expect{subject.run(['node', 'test=yes'])}.to exit_with_error.and output(/not found/).to_stderr
+        end
+      end
     end
   end
 
@@ -53,5 +62,26 @@ describe Kontena::Cli::Nodes::Labels::RemoveCommand do
 
       subject.run(['node', 'test=yes', 'test=no'])
     end
+
+    context "when removing an unknown label" do
+      context "without --force" do
+        it "exits with error" do
+          expect{subject.run(['node', 'test=yes', 'test=no', 'test=maybe'])}.to exit_with_error.and output(/Label test=maybe not found/).to_stderr
+        end
+
+        it "exits with plural error" do
+          expect{subject.run(['node', 'test=yes', 'test=no', 'test=maybe', 'test=almost'])}.to exit_with_error.and output(/Labels test=maybe, test=almost not found/).to_stderr
+        end
+      end
+      context "with --force" do
+        it 'ignores any labels that were not found with --force' do
+          expect(client).to receive(:put).with('nodes/test-grid/node', {
+              labels: ['test=yes'],
+          })
+
+          expect{subject.run(['--force', 'node', 'test=no', 'test=maybe', 'test=almost'])}.not_to exit_with_error
+        end
+      end
+    end
   end
 end

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

@@ -24,7 +24,7 @@ describe Kontena::Cli::Stacks::InstallCommand do
         'volumes' => [],
         'dependencies' => nil,
         'source' => /stack:/,
-        'parent_name' => nil,
+        'parent' => nil,
         'expose' => nil
       }
     end
@@ -73,10 +73,14 @@ describe Kontena::Cli::Stacks::InstallCommand do
     end
 
     context 'with a stack including dependencies' do
-
       it 'installs all the dependencies' do
-        expect(Kontena).to receive(:run!).with(["stack", "install", "-n", "deptest-dep_1", "--parent-name", "deptest", '-v', 'dep_1.dep_var=1', '--no-deploy', fixture_path('stack-with-dependencies-dep-1.yml')])
-        expect(Kontena).to receive(:run!).with(["stack", "install", "-n", "deptest-dep_2", "--parent-name", "deptest", "-v", "dep_var=1", '--no-deploy', fixture_path('stack-with-dependencies-dep-2.yml')])
+        expect(Kontena).to receive(:run!).with([
+          "stack", "install", "-n", "deptest-dep_1", "--parent-name", "deptest", "--no-deploy",
+          '-v', 'dep_1.dep_var=1', fixture_path('stack-with-dependencies-dep-1.yml')
+        ])
+        expect(Kontena).to receive(:run!).with([
+          "stack", "install", "-n", "deptest-dep_2", "--parent-name", "deptest", '--no-deploy',
+          "-v", "dep_var=1", fixture_path('stack-with-dependencies-dep-2.yml')])
         expect(client).to receive(:post).with('grids/test-grid/stacks', hash_including('stack' => 'user/depstack1', 'name' => 'deptest'))
         subject.run(['-n', 'deptest', '--no-deploy', '-v', 'dep_1.dep_1.dep_var=1', fixture_path('stack-with-dependencies.yml')])
       end
@@ -143,8 +147,14 @@ describe Kontena::Cli::Stacks::InstallCommand do
           'children' => [ ]
         )
 
-        expect(Kontena).to receive(:run!).with(["stack", "install", "-n", "deptest-dep_1", "--parent-name", "deptest", '-v', 'dep1var=test', '-v', 'dep_1.dep1dep1var=test11', '--no-deploy', fixture_path('stack-with-dependencies-dep-1.yml')]).and_return(true)
-        expect(Kontena).to receive(:run!).with(["stack", "install", "-n", "deptest-dep_2", "--parent-name", "deptest", '-v', 'dep_var=1', '-v', 'dep2var=test2', '--no-deploy', fixture_path('stack-with-dependencies-dep-2.yml')]).and_return(true)
+        expect(Kontena).to receive(:run!).with([
+          "stack", "install", "-n", "deptest-dep_1", "--parent-name", "deptest", "--no-deploy",
+          '-v', 'dep1var=test', '-v', 'dep_1.dep1dep1var=test11', fixture_path('stack-with-dependencies-dep-1.yml')
+        ]).and_return(true)
+        expect(Kontena).to receive(:run!).with([
+          "stack", "install", "-n", "deptest-dep_2", "--parent-name", "deptest", "--no-deploy",
+          '-v', 'dep_var=1', '-v', 'dep2var=test2', fixture_path('stack-with-dependencies-dep-2.yml')
+        ]).and_return(true)
 
         allow(client).to receive(:post).and_return({})
 

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

@@ -50,9 +50,11 @@ describe Kontena::Cli::Stacks::RemoveCommand do
           { 'children' => [ { 'name' => 'foofoo' }, { 'name' => 'foobar' } ] }
         end
 
-        it 'removes the children' do
+        before(:each) do
           allow(subject).to receive(:wait_stack_removal)
+        end
 
+        it 'removes the children' do
           expect(client).to receive(:get).with('stacks/test-grid/test-stack').and_return(
             stack_response_with_children
           )
@@ -61,7 +63,26 @@ describe Kontena::Cli::Stacks::RemoveCommand do
           expect(Kontena).to receive(:run!).with(['stack', 'remove', '--force', 'foobar'])
 
           expect(subject).to receive(:remove_stack).with('test-stack')
-          expect{subject.run(['--force', 'test-stack'])}.not_to exit_with_error
+          expect {
+            subject.run(['--force', 'test-stack'])
+          }.not_to exit_with_error
+        end
+
+        it 'does not remove the children if keep dependencies given' do
+          allow(subject).to receive(:confirm_command)
+          expect(client).to receive(:get).with('stacks/test-grid/test-stack').and_return(
+            stack_response_with_children
+          )
+
+          expect(Kontena).not_to receive(:run!).with(['stack', 'remove', '--force', 'foofoo'])
+          expect(Kontena).not_to receive(:run!).with(['stack', 'remove', '--force', 'foobar'])
+
+          expect(subject).to receive(:remove_stack).with('test-stack')
+          expect {
+            expect {
+              subject.run(['--keep-dependencies', 'test-stack'])
+            }.not_to output(/depends on/).to_stdout
+          }.not_to exit_with_error
         end
       end
     end