kontena-cli 0.16.1.rc1 → 0.16.1.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a140696639e10214728770220b852bd2c1278bb0
-  data.tar.gz: 4493f5eda8a877cde4e939041982b5f902df3b45
+  metadata.gz: be3c8f5234712118a790b7f856228bb23ffbf71f
+  data.tar.gz: 7ecf734b79afacd69b7e627d76d39713f72f42dc
 SHA512:
-  metadata.gz: 35927d1ad63168a93767327ecb4a781c9367b06d5649e68986f89bc454bd4f011ec6151d82bfd4cf1d7a706508ab7ba0d7a6d7c70cd96f1e04a8863a00058efc
-  data.tar.gz: 9f403db6a2463f36ed270c49ce1867b4de8e77f4b8ed75e3abe3d8e10422f0a41e719ae5f641b9f1606d20eba4e0e6c042dd631fc276fe536c77b7eb8ef707d0
+  metadata.gz: c100040a30909a54ce1c780f0a18702a318f18bdf17e0c478ca41caf7b1cdac0f6a7a49e86608a65d86d02b4d5a382212ac98e561bad3267bced1c0980754a20
+  data.tar.gz: c9c71d667d60fa94d37fc73c87008d57e6e44d391e67f23805e932148db29d86437ef69377eaab0bc379523f634aad1faae36c3bc22265deae746e71223b49f8

data/VERSION

@@ -1 +1 @@
-0.16.1.rc1
+0.16.1.rc2

data/lib/kontena/cli/cloud/master/add_command.rb

@@ -34,8 +34,8 @@ module Kontena::Cli::Cloud::Master
 
       response = cloud_client.post('user/masters', { data: { attributes: attributes } })
       exit_with_error "Failed (invalid response)" unless response.kind_of?(Hash)
-      exit_with_error "Failed (no data)" unless response['data']
       exit_with_error "Failed: #{response['error']}" if response['error']
+      exit_with_error "Failed (no data)" unless response['data']
       response
     end
 
@@ -100,13 +100,14 @@ module Kontena::Cli::Cloud::Master
               args = []
               args << "--provider #{self.provider.shellescape}" if self.provider
               args << "--version #{self.version.shellescape}" if self.version
+              args << self.cloud_master_id
               Kontena.run("cloud master update #{args.join(' ')}")
             end
           end
         end
       else
         response = spinner "Registering current Kontena Master '#{current_master.name}' #{" as '#{new_name}' " unless new_name == current_master.name}to Kontena Cloud" do
-          register(new_name, current_master.url)
+          register(new_name, current_master.url, self.provider, nil, self.version)
         end
       end
 

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

@@ -98,7 +98,7 @@ module Kontena::Cli::Master
         config.current_server = existing_server.name
         existing_server
       else
-        new_server = Kontena::Cli::Config::Server.new(url: self.url, name: self.name)
+        new_server = Kontena::Cli::Config::Server.new(url: url, name: self.name)
         config.servers << new_server
         config.current_server = new_server.name
         new_server
@@ -127,17 +127,19 @@ module Kontena::Cli::Master
 
         if response['server'] && response['server']['name']
           server.name ||= response['server']['name']
+        end
+
+        if response['user']
           server.username = response['user']['name'] || response['user']['email']
-          config.current_server = server.name
-        else
-          raise Kontena::Errors::StandardError.new(500, 'Code exchange invalid response')
         end
 
         server.token = Kontena::Cli::Config::Token.new(
           access_token: response['access_token'],
           refresh_token: response['refresh_token'],
-          expires_at: response['expires_in'].to_i > 0 ? Time.now.utc.to_i + response['expires_in'].to_i : nil,
+          expires_at: in_to_at(response['expires_in']),
         )
+
+        config.current_server = server.name
       end
       true
     end
@@ -200,7 +202,7 @@ module Kontena::Cli::Master
         sputs url
       else
         puts "Visit this URL in a browser:"
-        puts "<#{url}>"
+        puts "#{url}"
         puts
         puts "Then complete the authentication by using:"
         puts "kontena master login --code <CODE FROM BROWSER>"
@@ -269,10 +271,12 @@ module Kontena::Cli::Master
         server.name = self.name
       elsif response['server'] && response['server']['name']
         server.name = response['server']['name']
-      elsif config.find_server('default')
-        server.name = "default-#{SecureRandom.hex(2)}"
+      elsif config.find_server('kontena-master')
+        new_name = "kontena-master-2"
+        new_name.succ! until config.find_server(new_name).nil?
+        server.name = new_name
       else
-        server.name = "default"
+        server.name = "kontena-master"
       end
     end
 

data/spec/kontena/cli/cloud/master/add_command_spec.rb

@@ -0,0 +1,121 @@
+require_relative "../../../../spec_helper"
+require 'kontena/cli/cloud/master/add_command'
+
+describe Kontena::Cli::Cloud::Master::AddCommand do
+
+  include ClientHelpers
+
+  let(:subject) do
+    described_class.new(File.basename($0))
+  end
+
+  let(:client) { double }
+
+  before(:each) do
+    allow(subject).to receive(:cloud_client).and_return(client)
+  end
+
+  describe "#register" do
+    it 'posts valid data to cloud' do
+      expect(client).to receive(:post).with(
+        'user/masters',
+        hash_including(
+          data: {
+            attributes: {
+              'name' => 'name',
+              'url' => 'url',
+              'provider' => 'provider',
+              'redirect-uri' => 'redirect-uri',
+              'version' => 'version',
+              'owner' => 'owner',
+            }
+          }
+        )
+      ).and_return({'data' => { attributes: {}}})
+      subject.register("name", "url", "provider", "redirect-uri", "version", "owner")
+    end
+
+    it 'raises if cloud respons with error' do
+      expect(client).to receive(:post).and_return({'error' => 'foofoo'})
+      expect(subject).to receive(:exit_with_error).at_least(:once)
+      subject.register("name", "url", "provider", "redirect-uri", "version", "owner")
+    end
+  end
+
+  describe "#new_cloud_master_name" do
+    it 'returns a suffixed name if duplicates exist' do
+      allow(subject).to receive(:cloud_masters).and_return(
+        [
+          {
+            "attributes" => {
+              "name" => "foofoo"
+            }
+          }
+        ]
+      )
+
+      expect(subject.new_cloud_master_name("foofoo2")).to eq "foofoo2"
+      expect(subject.new_cloud_master_name("foofoo")).to eq "foofoo-2"
+    end
+  end
+
+  describe '#register_current' do
+    let(:current_master) { Kontena::Cli::Config::Server.new(name: 'foofoo', url: 'foofoofoo') }
+    let(:success_response) {
+        {
+          'data' => {
+            'attributes' => { 
+              'client-id' => '123',
+              'client-secret' => '345',
+              'provider' => 'foo',
+              'version' => '0.0.0',
+              'owner' => 'pwner'
+            }
+          }
+        }
+    }
+
+    before(:each) do
+      allow(subject).to receive(:require_api_url).and_return(true)
+      allow(subject).to receive(:require_token).and_return(true)
+      allow(subject).to receive(:force?).and_return(true)
+      allow(subject).to receive(:current_master).and_return(current_master)
+      allow(subject).to receive(:cloud_masters).and_return([])
+      allow(client).to receive(:post).and_return(success_response)
+    end
+
+    it 'calls register with proper arguments without cloud-master-id' do
+      expect(subject).to receive(:register) do |name, url, provider, redirect_uri, version|
+        expect(name).to eq current_master.name
+        expect(url).to eq current_master.url
+        expect(provider).to eq 'provider'
+        expect(version).to eq '10.10.10'
+        expect(redirect_uri).to be_nil
+      end.and_return(success_response)
+
+      subject.provider = 'provider'
+      subject.version  = '10.10.10'
+
+      expect(Kontena).to receive(:run).with('master config import --force --preset kontena_auth_provider')
+      expect(Kontena).to receive(:run).with('master config set oauth2.client_id=123 oauth2.client_secret=345 server.root_url=foofoofoo server.name=foofoo cloud.provider_is_kontena=true')
+
+      subject.register_current
+    end
+
+    it 'calls register with proper arguments with cloud-master-id' do
+      expect(subject).to receive(:get_existing).with('abcd').and_return(success_response)
+
+      subject.provider = 'provider'
+      subject.version  = '10.10.10'
+      subject.cloud_master_id = 'abcd'
+
+      expect(Kontena).to receive(:run).with('cloud master update --provider provider --version 10.10.10 abcd').and_return(true)
+      expect(Kontena).to receive(:run).with('master config import --force --preset kontena_auth_provider').and_return(true)
+      expect(Kontena).to receive(:run).with('master config set oauth2.client_id=123 oauth2.client_secret=345 server.root_url=foofoofoo server.name=foofoo cloud.provider_is_kontena=true').and_return(true)
+
+      subject.register_current
+    end
+
+  end
+end
+

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

@@ -0,0 +1,215 @@
+require_relative "../../../spec_helper"
+require 'kontena/cli/master/login_command'
+
+describe Kontena::Cli::Master::LoginCommand do
+
+  include ClientHelpers
+
+  let(:subject) do
+    described_class.new(File.basename($0))
+  end
+
+  let(:config) { double }
+
+  before(:each) do
+    allow(subject).to receive(:config).and_return(config)
+  end
+
+  describe '#use_current_master_if_available' do
+    context 'url not given' do
+      it 'sets local url current master url if defined' do
+        expect(config).to receive(:current_master).twice.and_return(Kontena::Cli::Config::Server.new(url: 'foo'))
+        expect(subject).to receive(:url=).with('foo')
+        expect(subject.use_current_master_if_available).to be_truthy
+      end
+
+      it 'raises if no current master and no url' do
+        subject.url = nil
+        expect(config).to receive(:current_master).and_return(nil)
+        expect(subject).to receive(:exit_with_error)
+        subject.use_current_master_if_available
+      end
+    end
+
+    context 'url given' do
+      it 'returns nil' do
+        subject.url = 'foofoo'
+        expect(subject.use_current_master_if_available).to be_nil
+      end
+    end
+  end
+
+  describe '#use_master_by_name' do
+    context 'url given' do
+      it 'should return nil when url looks like an url' do
+        subject.url = 'http://foo'
+        expect(subject).not_to receive(:config)
+        expect(subject.use_master_by_name).to be_nil
+      end
+    end
+
+    context 'name given' do
+      it 'should try to look for servers by name' do
+        expect(config).to receive(:find_server).and_return(Kontena::Cli::Config::Server.new(url: 'https://foo'))
+        subject.url = 'foomaster'
+        expect(subject).to receive(:url=).with('https://foo')
+        subject.use_master_by_name
+      end
+    end
+  end
+
+  describe '#find_server_or_create_new' do
+
+    let(:existing_server) { Kontena::Cli::Config::Server.new(url: 'https://foo', name: 'existing') }
+
+    it 'should try to pick up an existing server from config' do
+      subject.name = 'name'
+      expect(config).to receive(:find_server_by).with(url: 'foo', name: 'name').and_return(existing_server)
+      expect(config).to receive(:current_server=).with(existing_server.name)
+      expect(subject.find_server_or_create_new('foo')).to eq existing_server
+    end
+
+    it 'should create a new server instance if existing not found' do
+      expect(config).to receive(:find_server_by).and_return(nil)
+      subject.name = "foofoo1"
+      servers = []
+      expect(config).to receive(:servers).and_return(servers)
+      expect(config).to receive(:current_server=).with('foofoo1')
+      expect(subject.find_server_or_create_new('http://foo').name).to eq 'foofoo1'
+      expect(servers.first.url).to eq 'http://foo'
+      expect(servers.first.name).to eq 'foofoo1'
+    end
+  end
+
+  describe '#set_server_token' do
+    let(:server) { Kontena::Cli::Config::Server.new(name: 'some_server') }
+    let(:token) { Kontena::Cli::Config::Token.new(access_token: 'bartoken') }
+
+    it 'should set token from parameters as the servers access token' do
+      subject.token = 'footoken'
+      expect(server).to receive(:token=) do |token|
+        expect(token.access_token).to eq 'footoken'
+      end
+      subject.set_server_token(server)
+    end
+
+    it 'should clear servers existing token when forced' do
+      subject.force = true
+      server.token = token
+      subject.set_server_token(server)
+      expect(server.access_token).to be_nil
+    end
+
+    it 'should add a blank token if server has none' do
+      server.token = nil
+      subject.set_server_token(server)
+      expect(server.access_token).to be_nil
+      expect(server.token.parent_name).to eq 'some_server'
+    end
+
+    it 'should keep the existing token unless a new one is supplied' do
+      server.token = token
+      subject.token = nil
+      subject.force = false
+      subject.set_server_token(server)
+      expect(server.token).to eq token
+    end
+  end
+
+  describe '#use_authorization_code' do
+    let(:client) { double }
+
+    before(:each) do
+      allow(subject.config).to receive(:current_server=)
+    end
+
+    it 'should set the local name to name provided from server if no name was set' do
+      expect(Kontena::Client).to receive(:new).and_return(client)
+      expect(client).to receive(:exchange_code).with('abcd1234').and_return(
+        { 
+          'access_token' => 'token',
+          'refresh_token' => 'refresh_token',
+          'expires_in' => 1000,
+          'server' => {
+            'name' => 'foofoo1'
+          }
+        }
+      )
+
+      server = Kontena::Cli::Config::Server.new(name: nil, url: 'http://foo')
+      subject.use_authorization_code(server, 'abcd1234')
+      expect(server.token.access_token).to eq 'token'
+      expect(server.name).to eq 'foofoo1'
+    end
+
+    it 'should not touch the local name if the server already has a name' do
+      expect(Kontena::Client).to receive(:new).and_return(client)
+      expect(client).to receive(:exchange_code).with('abcd1234').and_return(
+        { 
+          'access_token' => 'token',
+          'refresh_token' => 'refresh_token',
+          'expires_in' => 1000,
+          'server' => {
+            'name' => 'foofoo1'
+          }
+        }
+      )
+
+      server = Kontena::Cli::Config::Server.new(name: 'foofoo2', url: 'http://foo')
+      subject.use_authorization_code(server, 'abcd1234')
+      expect((Time.now.utc.to_i+800..Time.now.utc.to_i+1100).cover?(server.token.expires_at.to_i)).to be_truthy
+      expect(server.name).to eq 'foofoo2'
+    end
+  end
+
+  describe '#in_to_at' do
+    it 'should return nil when expires_in is <0 or nil' do
+      expect(subject.in_to_at(0)).to be_nil
+      expect(subject.in_to_at(-1)).to be_nil
+      expect(subject.in_to_at(nil)).to be_nil
+    end
+
+    it 'should return a timestamp when expires_in is >0' do
+      time = Time.now.utc.to_i
+      expect((time + 80..time + 120).cover?(subject.in_to_at(100))).to be_truthy
+    end
+  end
+
+  describe '#update_server_name' do
+    let(:server) { Kontena::Cli::Config::Server.new }
+    let(:response) { { 'access_token' => 'token', 'server' => { 'name' => 'foo2' } } }
+
+    it 'should do nothing if server already has a name' do
+      server.name = 'foofoofoo'
+      subject.update_server_name(server, response)
+      expect(server.name).to eq 'foofoofoo'
+    end
+
+    it 'should set the name from name parameter if set' do
+      subject.name = 'abcd'
+      subject.update_server_name(server, response)
+      expect(server.name).to eq 'abcd'
+    end
+
+    it 'should set the name from server response if returned' do
+      subject.update_server_name(server, response)
+      expect(server.name).to eq 'foo2'
+    end
+
+    it 'should use a default name if no other can be figured out' do
+      expect(subject.config).to receive(:find_server).with('kontena-master').and_return(nil)
+      subject.update_server_name(server, response.reject{|k,v| k=='server'})
+      expect(server.name).to eq 'kontena-master'
+    end
+
+    it 'should use a default name with suffix if one already exists' do
+      expect(subject.config).to receive(:find_server).with('kontena-master').and_return(true)
+      expect(subject.config).to receive(:find_server).with('kontena-master-2').and_return(true)
+      expect(subject.config).to receive(:find_server).with('kontena-master-3').and_return(nil)
+      subject.update_server_name(server, response.reject{|k,v| k=='server'})
+      expect(server.name).to eq 'kontena-master-3'
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.16.1.rc1
+  version: 0.16.1.rc2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -416,6 +416,7 @@ files:
 - spec/kontena/cli/app/yaml/validator_spec.rb
 - spec/kontena/cli/app/yaml/validator_v2_spec.rb
 - spec/kontena/cli/cloud/logout_command_spec.rb
+- spec/kontena/cli/cloud/master/add_command_spec.rb
 - spec/kontena/cli/common_spec.rb
 - spec/kontena/cli/containers/containers_helper_spec.rb
 - spec/kontena/cli/containers/logs_command_spec.rb
@@ -426,6 +427,7 @@ files:
 - spec/kontena/cli/helpers/log_helper_spec.rb
 - spec/kontena/cli/main_command_spec.rb
 - spec/kontena/cli/master/current_command_spec.rb
+- spec/kontena/cli/master/login_command_spec.rb
 - spec/kontena/cli/master/logout_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
 - spec/kontena/cli/master/users/invite_command_spec.rb
@@ -509,6 +511,7 @@ test_files:
 - spec/kontena/cli/app/yaml/validator_spec.rb
 - spec/kontena/cli/app/yaml/validator_v2_spec.rb
 - spec/kontena/cli/cloud/logout_command_spec.rb
+- spec/kontena/cli/cloud/master/add_command_spec.rb
 - spec/kontena/cli/common_spec.rb
 - spec/kontena/cli/containers/containers_helper_spec.rb
 - spec/kontena/cli/containers/logs_command_spec.rb
@@ -519,6 +522,7 @@ test_files:
 - spec/kontena/cli/helpers/log_helper_spec.rb
 - spec/kontena/cli/main_command_spec.rb
 - spec/kontena/cli/master/current_command_spec.rb
+- spec/kontena/cli/master/login_command_spec.rb
 - spec/kontena/cli/master/logout_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
 - spec/kontena/cli/master/users/invite_command_spec.rb