kontena-cli 0.14.7 → 0.15.0.rc1

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

@@ -100,5 +100,29 @@ describe Kontena::Cli::Apps::YAML::ServiceExtender do
         expect(result['secrets']).to eq([to_secret, from_secret])
       end
     end
+
+    context 'build args' do
+      it 'inherits build args from upper level' do
+        from = { 'build' => { 'args' => {'foo' => 'bar'}} }
+        to = {}
+        result = described_class.new(to).extend(from)
+        expect(result['build']['args']).to eq({'foo' => 'bar'})
+      end
+
+      it 'overrides values' do
+        from = { 'build' => { 'args' => {'foo' => 'bar'}} }
+        to = { 'build' => { 'args' => {'foo' => 'baz'}} }
+        result = described_class.new(to).extend(from)
+        expect(result['build']['args']).to eq({'foo' => 'baz'})
+      end
+
+      it 'combines variables' do
+        from = { 'build' => { 'args' => {'foo' => 'bar'}} }
+        to = { 'build' => { 'args' => {'baz' => 'baf'}} }
+        result = described_class.new(to).extend(from)
+        expect(result['build']['args']).to eq({'foo' => 'bar', 'baz' => 'baf'})
+      end
+    end
+
   end
 end

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

@@ -10,8 +10,24 @@ describe Kontena::Cli::Apps::YAML::Validator do
   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
+      end
+
+      it 'must be string' do
+        result = subject.validate_options('build' => 12345)
+        expect(result.messages.key?('build')).to be_truthy
+
+        result = subject.validate_options('build' => '.')
+        expect(result.messages.key?('build')).to be_falsey
+      end
+    end
+
     context 'image' do
-      it 'image is optional' do
+      it 'is optional' do
         result = subject.validate_options('build' => '.')
         expect(result.success?).to be_truthy
         expect(result.messages.key?('image')).to be_falsey
@@ -21,7 +37,7 @@ describe Kontena::Cli::Apps::YAML::Validator do
         result = subject.validate_options('image' => 10)
         expect(result.success?).to be_falsey
         expect(result.messages.key?('image')).to be_truthy
-      end    
+      end
     end
 
     it 'validates stateful is boolean' do
@@ -63,22 +79,58 @@ describe Kontena::Cli::Apps::YAML::Validator do
     end
 
     context 'deploy' do
-      it 'validates interval' do
-        
-        result = subject.validate_options('deploy' => {'interval' => '1xyz'})
-        expect(result.messages.key?('deploy')).to be_truthy
-
-        result = subject.validate_options('deploy' => {'interval' => '1min'})
+      it 'is optional' do
+        result = subject.validate_options({})
         expect(result.messages.key?('deploy')).to be_falsey
+      end
 
-        result = subject.validate_options('deploy' => {'interval' => '1h'})
-        expect(result.messages.key?('deploy')).to be_falsey
+      context 'strategy' do
+        it 'accepts daemon' do
+          result = subject.validate_options('deploy' => {'strategy' => 'daemon'})
+          expect(result.messages.key?('deploy')).to be_falsey
+        end
 
-        result = subject.validate_options('deploy' => {'interval' => '1d'})
-        expect(result.messages.key?('deploy')).to be_falsey
+        it 'accepts random' do
+          result = subject.validate_options('deploy' => {'strategy' => 'random'})
+          expect(result.messages.key?('deploy')).to be_falsey
+        end
 
-        result = subject.validate_options('deploy' => {'interval' => '100'})
-        expect(result.messages.key?('deploy')).to be_falsey
+        it 'accepts ha' do
+          result = subject.validate_options('deploy' => {'strategy' => 'ha'})
+          expect(result.messages.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
+        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
+        end
+
+        it 'accepts 1min as value' do
+          result = subject.validate_options('deploy' => {'interval' => '1min'})
+          expect(result.messages.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
+        end
+
+        it 'accepts 1d as value' do
+          result = subject.validate_options('deploy' => {'interval' => '1d'})
+          expect(result.messages.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
+        end
       end
     end
 
@@ -279,5 +331,36 @@ describe Kontena::Cli::Apps::YAML::Validator do
         end
       end
     end
+
+    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
+      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
+
+        result = subject.validate_options('health_check' => { 'protocol' => 'http', 'port' => 8080})
+        expect(result.messages.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
+
+        result = subject.validate_options('health_check' => { 'protocol' => 'http', 'port' => 8080, 'uri' => '/health/foo/bar'})
+        expect(result.messages.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
+
+        result = subject.validate_options('health_check' => { 'protocol' => 'tcp', 'port' => 3306 })
+        expect(result.messages.key?('health_check')).to be_falsey
+      end
+    end
   end
 end

data/spec/kontena/cli/common_spec.rb

@@ -2,11 +2,6 @@ require_relative "../../spec_helper"
 require "kontena/cli/common"
 
 describe Kontena::Cli::Common do
-
-  let(:masters) do
-
-  end
-
   let(:subject) do
     Class.new do
       include Kontena::Cli::Common

data/spec/kontena/cli/containers/containers_helper_spec.rb

@@ -0,0 +1,16 @@
+require "kontena/cli/containers/containers_helper"
+
+describe Kontena::Cli::Containers::ContainersHelper do
+  let(:subject) do
+    Class.new { include Kontena::Cli::Containers::ContainersHelper }.new
+  end
+
+  describe '#build_command' do
+    it 'parses commands correctly' do
+      expect(subject.build_command(['echo $ID'])).to eq('echo $ID')
+      expect(subject.build_command(['echo', 'ID', '$ID'])).to eq('echo ID $ID')
+      expect(subject.build_command(['echo', 'ID: $ID'])).to eq('echo "ID: $ID"')
+      expect(subject.build_command(['echo', '{"ID": "123"}'])).to eq('echo "{\\"ID\\": \\"123\\"}"')
+    end
+  end
+end

data/spec/kontena/cli/services/services_helper_spec.rb

@@ -85,11 +85,45 @@ module Kontena::Cli::Services
 
       it 'returns hash of port options' do
         valid_result = [{
+          ip: '0.0.0.0',
+          container_port: '80',
+          node_port: '80',
+          protocol: 'tcp'
+        }]
+        port_options = subject.parse_ports(['80:80'])
+        expect(port_options).to eq(valid_result)
+      end
+
+      it 'returns hash of port options with protocol' do
+        valid_result = [{
+          ip: '0.0.0.0',
+          container_port: '80',
+          node_port: '80',
+          protocol: 'udp'
+        }]
+        port_options = subject.parse_ports(['80:80/udp'])
+        expect(port_options).to eq(valid_result)
+      end
+
+      it 'returns hash of port options with ip' do
+        valid_result = [{
+            ip: '1.2.3.4',
             container_port: '80',
             node_port: '80',
             protocol: 'tcp'
         }]
-        port_options = subject.parse_ports(['80:80'])
+        port_options = subject.parse_ports(['1.2.3.4:80:80'])
+        expect(port_options).to eq(valid_result)
+      end
+
+      it 'returns hash of port options with ip and protocol' do
+        valid_result = [{
+            ip: '1.2.3.4',
+            container_port: '80',
+            node_port: '80',
+            protocol: 'udp'
+        }]
+        port_options = subject.parse_ports(['1.2.3.4:80:80/udp'])
         expect(port_options).to eq(valid_result)
       end
     end
@@ -174,5 +208,20 @@ module Kontena::Cli::Services
         expect(subject.parse_relative_time("600")).to eq(600)
       end
     end
+
+    describe '#parse_build_args' do
+      it'parses array args' do
+        expect(subject.parse_build_args(['foo=bar', 'baz=baf'])).to eq({'foo' => 'bar', 'baz' => 'baf'})
+      end
+
+      it'parses hash args' do
+        expect(subject.parse_build_args({'foo' => 'bar', 'baz' => 'baf'})).to eq({'foo' => 'bar', 'baz' => 'baf'})
+      end
+
+      it'parses hash args and replaces empty value from env' do
+        expect(ENV).to receive(:[]).with('baz').and_return('baf')
+        expect(subject.parse_build_args({'foo' => 'bar', 'baz' => nil})).to eq({'foo' => 'bar', 'baz' => 'baf'})
+      end
+    end
   end
 end

data/spec/kontena/cli/version_command_spec.rb

@@ -11,7 +11,7 @@ describe Kontena::Cli::VersionCommand do
     end
 
     it 'runs without errors' do
-      subject.run([])
+      expect { subject.run([]) }.not_to raise_error
     end
   end
 end

data/spec/kontena/client_spec.rb

@@ -0,0 +1,156 @@
+require_relative '../spec_helper'
+require 'kontena_cli'
+
+describe Kontena::Client do
+
+  let(:subject) { described_class.new('https://localhost/v1/') }
+  let(:http_client) { double(:http_client) }
+
+  before(:each) do
+    allow(subject).to receive(:http_client)
+  end
+
+  describe '#get' do
+    it 'passes path to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:get).with(
+        hash_including(path: '/v1/foo')
+      ).and_return(spy(:response, status: 200))
+      subject.get('foo')
+    end
+
+    it 'passes params to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:get).with(
+        hash_including(query: {bar: 'baz'})
+      ).and_return(spy(:response, status: 200))
+      subject.get('foo', {bar: 'baz'})
+    end
+
+    it 'passes params to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:get).with(
+        hash_including(headers: hash_including(:'Some-Header' => 'value'))
+      ).and_return(spy(:response, status: 200))
+      subject.get('foo', nil, {:'Some-Header' => 'value'})
+    end
+  end
+
+  describe '#get_stream' do
+    let(:response_block) { Proc.new{ } }
+
+    it 'passes path & response_block to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:get).with(
+        hash_including(path: '/v1/foo', response_block: response_block)
+      ).and_return(spy(:response, status: 200))
+      subject.get_stream('foo', response_block)
+    end
+
+    it 'passes params to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:get).with(
+        hash_including(query: {bar: 'baz'})
+      ).and_return(spy(:response, status: 200))
+      subject.get_stream('foo', response_block, {bar: 'baz'})
+    end
+
+    it 'passes params to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:get).with(
+        hash_including(headers: hash_including(:'Some-Header' => 'value'))
+      ).and_return(spy(:response, status: 200))
+      subject.get_stream('foo', response_block, nil, {:'Some-Header' => 'value'})
+    end
+  end
+
+  describe '#post' do
+    let(:data) do
+      { foo: 'bar' }
+    end
+
+    it 'passes path and object to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:post).with(
+        hash_including(path: '/v1/foo', body: kind_of(String))
+      ).and_return(spy(:response, status: 200))
+      subject.post('foo', data)
+    end
+
+    it 'passes params to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:post).with(
+        hash_including(query: {bar: 'baz'})
+      ).and_return(spy(:response, status: 200))
+      subject.post('foo', data, {bar: 'baz'})
+    end
+
+    it 'passes params to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:post).with(
+        hash_including(headers: hash_including(:'Some-Header' => 'value'))
+      ).and_return(spy(:response, status: 200))
+      subject.post('foo', data, nil, {:'Some-Header' => 'value'})
+    end
+  end
+
+  describe '#put' do
+    let(:data) do
+      { foo: 'bar' }
+    end
+
+    it 'passes path and object to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:put).with(
+        hash_including(path: '/v1/foo', body: kind_of(String))
+      ).and_return(spy(:response, status: 200))
+      subject.put('foo', data)
+    end
+
+    it 'passes params to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:put).with(
+        hash_including(query: {bar: 'baz'})
+      ).and_return(spy(:response, status: 200))
+      subject.put('foo', data, {bar: 'baz'})
+    end
+
+    it 'passes params to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:put).with(
+        hash_including(headers: hash_including(:'Some-Header' => 'value'))
+      ).and_return(spy(:response, status: 200))
+      subject.put('foo', data, nil, {:'Some-Header' => 'value'})
+    end
+  end
+
+  describe '#delete' do
+    let(:data) do
+      { foo: 'bar' }
+    end
+
+    it 'passes path to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:delete).with(
+        hash_including(path: '/v1/foo')
+      ).and_return(spy(:response, status: 200))
+      subject.delete('foo')
+    end
+
+    it 'passes params to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:delete).with(
+        hash_including(query: {bar: 'baz'})
+      ).and_return(spy(:response, status: 200))
+      subject.delete('foo', nil, {bar: 'baz'})
+    end
+
+    it 'passes params to client' do
+      allow(subject).to receive(:http_client).and_return(http_client)
+      expect(http_client).to receive(:delete).with(
+        hash_including(headers: hash_including(:'Some-Header' => 'value'))
+      ).and_return(spy(:response, status: 200))
+      subject.delete('foo', nil, nil, {:'Some-Header' => 'value'})
+    end
+  end
+end

data/spec/kontena/plugin_manager_spec.rb

@@ -0,0 +1,22 @@
+require_relative '../spec_helper'
+require 'kontena_cli'
+
+describe Kontena::PluginManager do
+
+  let(:subject) { described_class.instance }
+
+  describe '#load_plugins' do
+    it 'includes hello plugin' do
+      plugins = subject.load_plugins
+      expect(plugins.any?{ |p| p.name == 'kontena-plugin-hello' }).to be_truthy
+    end
+
+    it 'allows plugin to register as a sub-command' do
+      plugins = subject.load_plugins
+      main = Kontena::MainCommand.new(File.basename($0))
+      expect {
+        main.run(['hello'])
+      }.to raise_error(Clamp::HelpWanted)
+    end
+  end
+end