kontena-cli 0.16.3 → 0.17.0.pre1

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

@@ -35,7 +35,7 @@ describe Kontena::Cli::Services::LinkCommand do
 
     it 'sends link to master' do
       expect(client).to receive(:put).with(
-        'services/test-grid/service-a', {links: [{name: 'service-b', alias: 'service-b'}]}
+        'services/test-grid/default/service-a', {links: [{name: 'service-b', alias: 'service-b'}]}
       )
       subject.run(['service-a', 'service-b'])
     end

data/spec/kontena/cli/services/secrets/link_command_spec.rb

@@ -35,10 +35,10 @@ describe Kontena::Cli::Services::Secrets::LinkCommand do
           {secret: 'MY_PASSWORD', name: 'PASSWORD', type: 'env'}
         ]
       }
-      allow(client).to receive(:get).with("services/test-grid/foo").and_return({
+      allow(client).to receive(:get).with("services/test-grid/default/foo").and_return({
         'secrets' => []
       })
-      expect(client).to receive(:put).with("services/test-grid/foo", data)
+      expect(client).to receive(:put).with("services/test-grid/default/foo", data)
       subject.run(['foo', 'MY_PASSWORD:PASSWORD:env'])
     end
 
@@ -54,8 +54,8 @@ describe Kontena::Cli::Services::Secrets::LinkCommand do
           {secret: 'MY_PASSWORD', name: 'PASSWORD', type: 'env'}
         ]
       }
-      allow(client).to receive(:get).with("services/test-grid/foo").and_return(original)
-      expect(client).to receive(:put).with("services/test-grid/foo", data)
+      allow(client).to receive(:get).with("services/test-grid/default/foo").and_return(original)
+      expect(client).to receive(:put).with("services/test-grid/default/foo", data)
       subject.run(['foo', 'MY_PASSWORD:PASSWORD:env'])
     end
   end

data/spec/kontena/cli/services/secrets/unlink_command_spec.rb

@@ -41,8 +41,8 @@ describe Kontena::Cli::Services::Secrets::UnlinkCommand do
           {'secret' => 'BAR', 'name' => 'BAZ', 'type' => 'env'}
         ]
       }
-      allow(client).to receive(:get).with("services/test-grid/mymy").and_return(original)
-      expect(client).to receive(:put).with("services/test-grid/mymy", data)
+      allow(client).to receive(:get).with("services/test-grid/default/mymy").and_return(original)
+      expect(client).to receive(:put).with("services/test-grid/default/mymy", data)
       subject.run(['mymy', 'FOO:BAR:env'])
     end
   end

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

@@ -29,43 +29,43 @@ module Kontena::Cli::Services
 
     describe '#update_service' do
       it 'creates PUT services/:id request to Kontena Server' do
-        expect(client).to receive(:put).with('services/test-grid/1', {'name' => 'test-service'})
+        expect(client).to receive(:put).with('services/test-grid/default/1', {'name' => 'test-service'})
         subject.update_service(token, '1', {'name' => 'test-service'})
       end
     end
 
     describe '#get_service' do
       it 'creates GET services/:id request to Kontena Server' do
-        expect(client).to receive(:get).with('services/test-grid/test-service')
+        expect(client).to receive(:get).with('services/test-grid/default/test-service')
         subject.get_service(token, 'test-service')
       end
     end
 
     describe '#stop_service' do
       it 'creates POST services/:id/stop request to Kontena Server' do
-        expect(client).to receive(:post).with('services/test-grid/test-service/stop', {})
+        expect(client).to receive(:post).with('services/test-grid/default/test-service/stop', {})
         subject.stop_service(token, 'test-service')
       end
     end
 
     describe '#start_service' do
       it 'creates POST services/:id/start request to Kontena Server' do
-        expect(client).to receive(:post).with('services/test-grid/test-service/start', {})
+        expect(client).to receive(:post).with('services/test-grid/default/test-service/start', {})
         subject.start_service(token, 'test-service')
       end
     end
 
     describe '#restart_service' do
       it 'creates POST services/:id/restart request to Kontena Server' do
-        expect(client).to receive(:post).with('services/test-grid/test-service/restart', {})
+        expect(client).to receive(:post).with('services/test-grid/default/test-service/restart', {})
         subject.restart_service(token, 'test-service')
       end
     end
 
     describe '#deploy_service' do
       it 'creates POST services/:id/deploy request to Kontena Server' do
-        allow(client).to receive(:get).with('services/test-grid/1').and_return({'state' => 'running'})
-        expect(client).to receive(:post).with('services/test-grid/1/deploy', {'strategy' => 'ha'})
+        allow(client).to receive(:get).with('services/test-grid/default/1').and_return({'state' => 'running'})
+        expect(client).to receive(:post).with('services/test-grid/default/1/deploy', {'strategy' => 'ha'})
         subject.deploy_service(token, '1', {'strategy' => 'ha'})
       end
     end
@@ -146,12 +146,16 @@ module Kontena::Cli::Services
     end
 
     describe '#parse_service_id' do
-      it 'adds current_grid if service_id is missing prefix' do
-        expect(subject.parse_service_id('mysql')).to eq('test-grid/mysql')
+      it 'adds current_grid & stack if service_id is missing prefix' do
+        expect(subject.parse_service_id('mysql')).to eq('test-grid/default/mysql')
       end
 
-      it 'does not add current_grid if service id includes prefix' do
-        expect(subject.parse_service_id('second-grid/mysql')).to eq('second-grid/mysql')
+      it 'adds current grid if service_id has stack & service' do
+        expect(subject.parse_service_id('second-grid/mysql')).to eq('test-grid/second-grid/mysql')
+      end
+
+      it 'does not add anything if id container grid, stack and service' do
+        expect(subject.parse_service_id('test-grid/second-grid/mysql')).to eq('test-grid/second-grid/mysql')
       end
     end
 

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

@@ -35,7 +35,7 @@ describe Kontena::Cli::Services::UnlinkCommand do
 
     it 'sends link to master' do
       expect(client).to receive(:put).with(
-        'services/test-grid/service-a', {links: []}
+        'services/test-grid/default/service-a', {links: []}
       )
       subject.run(['service-a', 'service-b'])
     end

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

@@ -0,0 +1,26 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/stacks/deploy_command"
+
+describe Kontena::Cli::Stacks::DeployCommand do
+
+  include ClientHelpers
+
+  describe '#execute' do
+    it 'requires api url' do
+      expect(subject).to receive(:require_api_url).once
+      subject.run(['test-stack'])
+    end
+
+    it 'requires token' do
+      expect(subject).to receive(:require_token).and_return(token)
+      subject.run(['test-stack'])
+    end
+
+    it 'sends deploy command to master' do
+      expect(client).to receive(:post).with(
+        'stacks/test-grid/test-stack/deploy', {}
+      )
+      subject.run(['test-stack'])
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/stacks/install_command"
+
+describe Kontena::Cli::Stacks::InstallCommand do
+
+  include ClientHelpers
+
+  describe '#execute' do
+    let(:stack) do
+      {
+        name: 'stack-a',
+        registry: 'file://kontena.yml',
+        source: "YAML content",
+        services: []
+      }
+    end
+
+    before(:each) do
+      allow(subject).to receive(:yaml_content).and_return("YAML content")
+    end
+
+    it 'requires api url' do
+      allow(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
+      expect(subject).to receive(:require_api_url).once
+      subject.run([])
+    end
+
+    it 'requires token' do
+      allow(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
+      expect(subject).to receive(:require_token).and_return(token)
+      subject.run([])
+    end
+
+    it 'sends stack to master' do
+      allow(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
+      allow(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
+      expect(client).to receive(:post).with(
+        'grids/test-grid/stacks', stack
+      )
+      subject.run([])
+    end
+
+    it 'allows to override stack name' do
+      allow(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
+      allow(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
+      stack_b = stack
+      stack_b[:name] = 'stack-b'
+      expect(client).to receive(:post).with(
+        'grids/test-grid/stacks', stack
+      )
+      subject.run(['--name', 'stack-b'])
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/stacks/list_command"
+
+describe Kontena::Cli::Stacks::ListCommand do
+
+  include ClientHelpers
+
+  describe '#execute' do
+    it 'requires api url' do
+      expect(subject).to receive(:require_api_url).once
+      subject.run([])
+    end
+
+    it 'requires token' do
+      expect(subject).to receive(:require_token).and_return(token)
+      subject.run([])
+    end
+
+    it 'fetches stacks from master' do
+      stacks = {
+        'stacks' => []
+      }
+      expect(client).to receive(:get).with('grids/test-grid/stacks').and_return(stacks)
+      subject.run([])
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/stacks/remove_command"
+
+describe Kontena::Cli::Stacks::RemoveCommand do
+
+  include ClientHelpers
+
+  describe '#execute' do
+    it 'requires api url' do
+      allow(subject).to receive(:forced?).and_return(true)
+      allow(subject).to receive(:wait_stack_removal)
+      expect(subject).to receive(:require_api_url).once
+      subject.run(['test-stack'])
+    end
+
+    it 'requires token' do
+      allow(subject).to receive(:forced?).and_return(true)
+      allow(subject).to receive(:wait_stack_removal)
+      expect(subject).to receive(:require_token).and_return(token)
+      subject.run(['test-stack'])
+    end
+
+    it 'sends remove command to master' do
+      allow(subject).to receive(:wait_stack_removal)
+      expect(client).to receive(:delete).with('stacks/test-grid/test-stack')
+      subject.run(['--force', 'test-stack'])
+    end
+
+    it 'waits until service is removed' do
+      allow(client).to receive(:delete).with('stacks/test-grid/test-stack')
+      expect(client).to receive(:get).with('stacks/test-grid/test-stack')
+        .and_raise(Kontena::Errors::StandardError.new(404, 'Not Found'))
+      subject.run(['--force', 'test-stack'])
+    end
+
+    it 'raises exception on server error' do
+      expect(client).to receive(:delete).with('stacks/test-grid/test-stack')
+      expect(client).to receive(:get).with('stacks/test-grid/test-stack')
+        .and_raise(Kontena::Errors::StandardError.new(500, 'internal error'))
+      expect{
+        subject.run(['--force', 'test-stack'])
+      }.to raise_error(Kontena::Errors::StandardError)
+    end
+  end
+end

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

@@ -0,0 +1,385 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/stacks/service_generator"
+
+describe Kontena::Cli::Stacks::ServiceGenerator do
+  let(:subject) do
+    described_class.new({})
+  end
+
+  describe '#parse_data' do
+    context 'volumes' do
+      it 'returns volumes if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'volumes' => [
+            'mongodb-1'
+          ]
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['volumes']).to eq(data['volumes'])
+      end
+
+      it 'returns empty volumes if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['volumes']).to eq([])
+      end
+    end
+
+    context 'volumes_from' do
+      it 'returns volumes_from if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'volumes_from' => [
+            'mongodb-1'
+          ]
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['volumes_from']).to eq(data['volumes_from'])
+      end
+
+      it 'returns empty volumes_from if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['volumes_from']).to eq([])
+      end
+    end
+
+    context 'command' do
+      it 'returns cmd array if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'command' => 'ls -la'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['cmd']).to eq(data['command'].split(' '))
+      end
+
+      it 'does not return cmd if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result.has_key?('cmd')).to be_falsey
+      end
+    end
+
+    context 'affinity' do
+      it 'returns affinity if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'affinity' => [
+            'label==az=b'
+          ]
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['affinity']).to eq(data['affinity'])
+      end
+
+      it 'returns affinity as empty array if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result.has_key?('affinity')).to be_truthy
+        expect(result['affinity']).to eq([])
+      end
+    end
+
+    context 'user' do
+      it 'returns user if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'user' => 'user'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['user']).to eq('user')
+      end
+
+      it 'does not return user if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result.has_key?('user')).to be_falsey
+      end
+    end
+
+    context 'stateful' do
+      it 'returns stateful if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'stateful' => true
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['stateful']).to eq(true)
+      end
+
+      it 'returns stateful as false if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['stateful']).to eq(false)
+      end
+    end
+
+    context 'links' do
+      it 'returns empty array if links not set' do
+        data = {
+          'image' => 'wordpress:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['links']).to eq([])
+      end
+
+      it 'returns parsed links array' do
+        data = {
+          'image' => 'wordpress:latest',
+          'links' => ['mysql:db']
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['links']).to eq([{
+          'name' => 'mysql',
+          'alias' => 'db'
+        }])
+      end
+    end
+    context 'privileged' do
+      it 'returns privileged if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'privileged' => false
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['privileged']).to eq(false)
+      end
+
+      it 'does not return privileged if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['privileged']).to be_nil
+      end
+    end
+
+    context 'cap_add' do
+      it 'returns cap_drop if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'cap_add' => [
+            'NET_ADMIN'
+          ]
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['cap_add']).to eq(data['cap_add'])
+      end
+
+      it 'does not return cap_add if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['cap_add']).to be_nil
+      end
+    end
+
+    context 'cap_drop' do
+      it 'returns cap_drop if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'cap_drop' => [
+            'NET_ADMIN'
+          ]
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['cap_drop']).to eq(data['cap_drop'])
+      end
+
+      it 'does not return cap_drop if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['cap_drop']).to be_nil
+      end
+    end
+
+    context 'net' do
+      it 'returns net if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'net' => 'host'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['net']).to eq('host')
+      end
+
+      it 'does not return pid if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['net']).to be_nil
+      end
+    end
+
+    context 'pid' do
+      it 'returns pid if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'pid' => 'host'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['pid']).to eq('host')
+      end
+
+      it 'does not return pid if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['pid']).to be_nil
+      end
+    end
+
+    context 'log_driver' do
+      it 'returns log_driver if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'log_driver' => 'syslog'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['log_driver']).to eq('syslog')
+      end
+
+      it 'does not return log_driver if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['log_driver']).to be_nil
+      end
+    end
+
+    context 'log_opt' do
+      it 'returns log_opts hash if log_opt is set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'log_driver' => 'fluentd',
+          'log_opt' => {
+            'fluentd-address' => '192.168.99.1:24224',
+            'fluentd-tag' => 'docker.{{.Name}}'
+          }
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['log_opts']).to eq(data['log_opt'])
+      end
+
+      it 'does not return log_opts if log_opt is not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['log_opts']).to be_nil
+      end
+    end
+
+    context 'deploy_opts' do
+      it 'returns deploy_opts if deploy.wait_for_port is defined' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'deploy' => {
+            'wait_for_port' => '8080'
+          }
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['deploy_opts']['wait_for_port']).to eq('8080')
+      end
+
+      it 'returns deploy_opts if deploy.min_health is defined' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'deploy' => {
+            'min_health' => '0.5'
+          }
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['deploy_opts']['min_health']).to eq('0.5')
+      end
+
+      it 'sets strategy if deploy.strategy is defined' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'deploy' => {
+            'strategy' => 'daemon'
+          }
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['strategy']).to eq('daemon')
+      end
+
+      it 'sets interval if deploy.interval is defined' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'deploy' => {
+            'interval' => '1min'
+          }
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['deploy_opts']['interval']).to eq(60)
+      end
+
+      it 'does not return deploy_opts if no deploy options are defined' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['deploy_opts']).to be_nil
+      end
+    end
+
+    context 'hooks' do
+      it 'returns hooks hash if defined' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'hooks' => {
+            'post_start' => []
+          }
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['hooks']).to eq(data['hooks'])
+      end
+
+      it 'does returns empty hook hash if not defined' do
+        data = {'image' => 'foo/bar:latest'}
+        result = subject.send(:parse_data, data)
+        expect(result['hooks']).to eq({})
+      end
+    end
+
+    context 'secrets' do
+      it 'returns secrets array if defined' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'secrets' => [
+            {'secret' => 'MYSQL_ADMIN_PASSWORD', 'name' =>  'WORDPRESS_DB_PASSWORD', 'type' => 'env'}
+          ]
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['secrets']).to eq(data['secrets'])
+      end
+
+      it 'does not return secrets if not defined' do
+        data = {'image' => 'foo/bar:latest'}
+        result = subject.send(:parse_data, data)
+        expect(result['secrets']).to be_nil
+      end
+    end
+  end  
+end