kontena-cli 0.13.4 → 0.14.0

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

@@ -0,0 +1,309 @@
+require_relative '../../../../spec_helper'
+require 'kontena/cli/apps/yaml/validator_v2'
+
+describe Kontena::Cli::Apps::YAML::ValidatorV2 do
+  describe '#validate_keys' do
+    it 'returns error on invalid key' do
+      result = subject.validate_keys('name' => 'wordpress')
+      expect(result['name'].size).to eq(1)
+    end
+  end
+
+  describe '#validate_options' do
+    context 'build' do
+      it 'can be string' do
+        result = subject.validate_options('build' => '.')
+        expect(result.success?).to be_truthy
+        expect(result.messages.key?('build')).to be_falsey
+      end
+
+      it 'can be hash' do
+        result = subject.validate_options('build' => { 'context' => '.' })
+        expect(result.success?).to be_truthy
+        expect(result.messages.key?('build')).to be_falsey
+      end
+
+      it 'returns error if build is hash and context is missing' do
+        result = subject.validate_options('build' => {})
+        expect(result.success?).to be_falsey
+        expect(result.messages.key?('build')).to be_truthy
+      end
+
+      it 'returns error if optional dockerfile is not string' do
+        result = subject.validate_options('build' => {
+          'context' => '.',
+          'dockerfile' => 123
+        })
+        expect(result.success?).to be_falsey
+        expect(result.messages.key?('build')).to be_truthy
+      end
+    end
+    it 'validates image is string' do
+      result = subject.validate_options('image' => true)
+      expect(result.success?).to be_falsey
+      expect(result.messages.key?('image')).to be_truthy
+    end
+
+    it 'validates stateful is boolean' do
+      result = subject.validate_options('stateful' => 'bool')
+      expect(result.messages.key?('stateful')).to be_truthy
+    end
+
+    it 'validates network_mode is host or bridge' do
+      result = subject.validate_options('network_mode' => 'invalid')
+      expect(result.messages.key?('network_mode')).to be_truthy
+
+      result = subject.validate_options('network_mode' => 'bridge')
+      expect(result.messages.key?('network_mode')).to be_falsey
+
+      result = subject.validate_options('network_mode' => 'host')
+      expect(result.messages.key?('network_mode')).to be_falsey
+    end
+
+    context 'affinity' do
+      it 'is optional' do
+        result = subject.validate_options({})
+        expect(result.messages.key?('affinity')).to be_falsey
+      end
+
+      it 'must be array' do
+        result = subject.validate_options('affinity' => 'node==node1')
+        expect(result.messages.key?('affinity')).to be_truthy
+        result = subject.validate_options('affinity' => ['node==node1'])
+        expect(result.messages.key?('affinity')).to be_falsey
+      end
+
+      it 'validates format' do
+        result = subject.validate_options('affinity' => ['node=node1'])
+        expect(result.messages.key?('affinity')).to be_truthy
+
+        result = subject.validate_options('affinity' => ['node==node1', 'service!=mariadb'])
+        expect(result.messages.key?('affinity')).to be_falsey
+      end
+    end
+
+    context 'command' do
+      it 'is optional' do
+        result = subject.validate_options({})
+        expect(result.messages.key?('command')).to be_falsey
+      end
+
+      it 'must be string or empty' do
+        result = subject.validate_options('command' => 1234)
+        expect(result.messages.key?('command')).to be_truthy
+
+        result = subject.validate_options('command' => nil)
+        expect(result.messages.key?('command')).to be_falsey
+
+        result = subject.validate_options('command' => 'bundle exec rails s')
+        expect(result.messages.key?('command')).to be_falsey
+      end
+    end
+
+    it 'validates cpu_shares is integer' do
+      result = subject.validate_options('cpu_shares' => '1m')
+      expect(result.messages.key?('cpu_shares')).to be_truthy
+      result = subject.validate_options('cpu_shares' => 1024)
+      expect(result.messages.key?('cpu_shares')).to be_falsey
+      result = subject.validate_options({})
+      expect(result.messages.key?('cpu_shares')).to be_falsey
+    end
+
+    it 'validates environment is array or hash' do
+      result = subject.validate_options('environment' => 'KEY=VALUE')
+      expect(result.messages.key?('environment')).to be_truthy
+      result = subject.validate_options('environment' => ['KEY=VALUE'])
+      expect(result.messages.key?('environment')).to be_falsey
+      result = subject.validate_options('environment' => { 'KEY' => 'VALUE' })
+      expect(result.messages.key?('environment')).to be_falsey
+    end
+
+    context 'validates secrets' do
+      it 'must be array' do
+        result = subject.validate_options('secrets' => {})
+        expect(result.messages.key?('secrets')).to be_truthy
+      end
+
+      context 'item' do
+        it 'must contain secret' do
+          result = subject.validate_options('secrets' => [{ 'name' => 'test', 'type' => 'env' }])
+          expect(result.messages.key?('secrets')).to be_truthy
+        end
+
+        it 'must contain name' do
+          result = subject.validate_options('secrets' => [{ 'secret' => 'test', 'type' => 'env' }])
+          expect(result.messages.key?('secrets')).to be_truthy
+        end
+
+        it 'must contain type' do
+          result = subject.validate_options('secrets' => [{ 'secret' => 'test', 'name' => 'test' }])
+          expect(result.messages.key?('secrets')).to be_truthy
+        end
+
+        it 'accepts valid input' do
+          result = subject.validate_options('secrets' =>
+            [
+              {
+                'secret' => 'test',
+                'name' => 'test',
+                'type' => 'env'
+              }
+            ])
+          expect(result.messages.key?('secrets')).to be_falsey
+        end
+      end
+    end
+
+    context 'logging' do
+      context 'options' do
+        it 'must be hash' do
+          result = subject.validate_options('logging' => { 'options' => [] })
+          expect(result.messages.key?('logging')).to be_truthy
+          data = {
+            'logging' => {
+              'options' => {
+                  'syslog-address' => "tcp://192.168.0.42:123"
+              }
+            }
+          }
+          result = subject.validate_options(data)
+          expect(result.messages.key?('logging')).to be_falsey
+        end
+      end
+    end
+
+    context 'hooks' do
+      context 'validates pre_build' do
+        it 'must be array' do
+          result = subject.validate_options('hooks' => { 'pre_build' => {} })
+          expect(result.messages.key?('hooks')).to be_truthy
+          data = {
+            'hooks' => {
+              'pre_build' => [
+                {
+                  'cmd' => 'rake db:migrate'
+                }
+              ]
+            }
+          }
+          result = subject.validate_options(data)
+          expect(result.messages.key?('hooks')).to be_falsey
+        end
+      end
+      context 'post_start' do
+        it 'must be array' do
+          result = subject.validate_options('hooks' => { 'post_start' => {} })
+          expect(result.messages.key?('hooks')).to be_truthy
+          data = {
+            'hooks' => {
+              'post_start' => [
+                {
+                  'name' => 'migrate',
+                  'cmd' => 'rake db:migrate',
+                  'instances' => '*'
+                }
+              ]
+            }
+          }
+          result = subject.validate_options(data)
+          expect(result.messages.key?('hooks')).to be_falsey
+        end
+
+        context 'item' do
+          it 'must contain name' do
+            result = subject.validate_options('hooks' =>
+            {
+              'post_start' => [
+                {
+                  'cmd' => 'rake db:migrate',
+                  'instances' => '1'
+                }
+              ]
+            })
+            expect(result.messages.key?('hooks')).to be_truthy
+          end
+
+          it 'must contain cmd' do
+            result = subject.validate_options('hooks' =>
+            {
+              'post_start' => [
+                {
+                  'name' => 'migrate',
+                  'instances' => '1'
+                }
+              ]
+            })
+            expect(result.messages.key?('hooks')).to be_truthy
+          end
+
+          it 'must contain instance number or *' do
+            result = subject.validate_options('hooks' =>
+            {
+              'post_start' => [
+                { 'name' => 'migrate',
+                  'cmd' => 'rake db:migrate'
+                }
+              ]
+            })
+            expect(result.messages.key?('hooks')).to be_truthy
+            data = {
+              'hooks' => {
+                'post_start' => [
+                  {
+                    'name' => 'migrate',
+                    'cmd' => 'rake db:migrate',
+                    'instances' => 'all',
+                    'oneshot' => true
+                  }
+                ]
+              }
+            }
+            result = subject.validate_options(data)
+            expect(result.messages.key?('hooks')).to be_truthy
+          end
+
+          it 'may contain boolean oneshot' do
+            data = {
+              'hooks' => {
+                'post_start' => [
+                  {
+                    'name' => 'migrate',
+                    'cmd' => 'rake db:migrate',
+                    'instances' => '*',
+                    'oneshot' => 'true'
+                  }
+                ]
+              }
+            }
+            result = subject.validate_options(data)
+            expect(result.messages.key?('hooks')).to be_truthy
+          end
+        end
+
+        it 'validates depends_on is array' do
+          result = subject.validate_options('depends_on' => 'web')
+          expect(result.messages.key?('depends_on')).to be_truthy
+
+          result = subject.validate_options('depends_on' => ['web'])
+          expect(result.messages.key?('depends_on')).to be_falsey
+        end
+
+        it 'validates volumes is array' do
+          result = subject.validate_options('volumes' => '/app')
+          expect(result.messages.key?('volumes')).to be_truthy
+
+          result = subject.validate_options('volumes' => ['/app'])
+          expect(result.messages.key?('volumes')).to be_falsey
+        end
+
+        it 'validates volumes_from is array' do
+          result = subject.validate_options('volumes_from' => 'mysql_data')
+          expect(result.messages.key?('volumes_from')).to be_truthy
+
+          result = subject.validate_options('volumes_from' => ['mysql_data'])
+          expect(result.messages.key?('volumes_from')).to be_falsey
+        end
+      end
+    end
+  end
+end

data/spec/kontena/cli/common_spec.rb

@@ -89,7 +89,6 @@ describe Kontena::Cli::Common do
 
       expect(subject.current_master['url']).to eq('someurl')
       expect(subject.current_master['name']).to eq('alias')
-
     end
   end
 
@@ -122,4 +121,43 @@ describe Kontena::Cli::Common do
     end
 
   end
+
+  describe '#error' do
+    it 'prints error message to stderr if given and raise error' do
+      expect($stderr).to receive(:puts).with('error message!')
+      expect{subject.error('error message!')}.to raise_error(SystemExit)
+    end
+  end
+
+  describe '#confirm_command' do
+    it 'returns true if input matches' do
+      allow(subject).to receive(:prompt).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
+    end
+
+    it 'raises error unless input matches' do
+      expect(subject).to receive(:prompt).and_return('wrong-name')
+      expect(subject).to receive(:error).with(/did not match/)
+
+      subject.confirm_command('name-to-confirm')
+    end
+  end
+
+  describe '#confirm' do
+    it 'returns true if confirmed' do
+      allow(subject).to receive(:prompt).and_return('y')
+
+      expect(subject.confirm).to be_truthy
+      expect{subject.confirm}.to_not raise_error
+    end
+
+    it 'raises error unless confirmed' do
+      expect(subject).to receive(:prompt).and_return('ei')
+      expect(subject).to receive(:error).with(/Aborted/)
+
+      subject.confirm
+    end
+  end
 end

data/spec/kontena/cli/master/users/remove_command_spec.rb

@@ -8,11 +8,20 @@ describe Kontena::Cli::Master::Users::RemoveCommand do
 
   describe '#execute' do
 
+    before(:each) do
+      allow(subject).to receive(:confirm).and_return(true)
+    end
+
     it 'requires api url' do
       expect(subject).to receive(:require_api_url).once
       subject.run(['john@domain.com'])
     end
 
+    it 'it requires confirmation' do
+      expect(subject).to receive(:confirm).once
+      subject.run(['john@domain.com'])
+    end
+
     it 'requires token' do
       expect(subject).to receive(:require_token).and_return(token)
       subject.run(['john@domain.com'])

data/spec/kontena/cli/master/users/roles/remove_command_spec.rb

@@ -23,11 +23,13 @@ describe Kontena::Cli::Master::Users::Roles::RemoveCommand do
     before(:each) do
       allow(subject).to receive(:client).and_return(client)
       allow(subject).to receive(:settings).and_return(valid_settings)
+      allow(subject).to receive(:confirm).and_return(true)
     end
 
     it 'makes remove role request for all given users' do
       expect(client).to receive(:delete).with("users/john@example.org/roles/role").once
       expect(client).to receive(:delete).with("users/jane@example.org/roles/role").once
+      expect(subject).to receive(:confirm).once
 
       subject.run(['role', 'john@example.org', 'jane@example.org'])
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.14.0
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-validation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.4
+- !ruby/object:Gem::Dependency
+  name: dry-logic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 description: Kontena command line tool
 email:
 - info@kontena.io
@@ -143,6 +171,7 @@ files:
 - lib/kontena/cli/app_command.rb
 - lib/kontena/cli/apps/build_command.rb
 - lib/kontena/cli/apps/common.rb
+- lib/kontena/cli/apps/config_command.rb
 - lib/kontena/cli/apps/deploy_command.rb
 - lib/kontena/cli/apps/docker_compose_generator.rb
 - lib/kontena/cli/apps/docker_helper.rb
@@ -155,9 +184,16 @@ files:
 - lib/kontena/cli/apps/remove_command.rb
 - lib/kontena/cli/apps/restart_command.rb
 - lib/kontena/cli/apps/scale_command.rb
+- lib/kontena/cli/apps/service_generator.rb
+- lib/kontena/cli/apps/service_generator_v2.rb
 - lib/kontena/cli/apps/show_command.rb
 - lib/kontena/cli/apps/start_command.rb
 - lib/kontena/cli/apps/stop_command.rb
+- lib/kontena/cli/apps/yaml/reader.rb
+- lib/kontena/cli/apps/yaml/service_extender.rb
+- lib/kontena/cli/apps/yaml/validations.rb
+- lib/kontena/cli/apps/yaml/validator.rb
+- lib/kontena/cli/apps/yaml/validator_v2.rb
 - lib/kontena/cli/bytes_helper.rb
 - lib/kontena/cli/common.rb
 - lib/kontena/cli/container_command.rb
@@ -207,6 +243,10 @@ files:
 - lib/kontena/cli/master/digital_ocean/create_command.rb
 - lib/kontena/cli/master/digital_ocean_command.rb
 - lib/kontena/cli/master/list_command.rb
+- lib/kontena/cli/master/packet/create_command.rb
+- lib/kontena/cli/master/packet_command.rb
+- lib/kontena/cli/master/upcloud/create_command.rb
+- lib/kontena/cli/master/upcloud_command.rb
 - lib/kontena/cli/master/use_command.rb
 - lib/kontena/cli/master/users/invite_command.rb
 - lib/kontena/cli/master/users/list_command.rb
@@ -240,9 +280,17 @@ files:
 - lib/kontena/cli/nodes/labels/add_command.rb
 - lib/kontena/cli/nodes/labels/remove_command.rb
 - lib/kontena/cli/nodes/list_command.rb
+- lib/kontena/cli/nodes/packet/create_command.rb
+- lib/kontena/cli/nodes/packet/restart_command.rb
+- lib/kontena/cli/nodes/packet/terminate_command.rb
+- lib/kontena/cli/nodes/packet_command.rb
 - lib/kontena/cli/nodes/remove_command.rb
 - lib/kontena/cli/nodes/show_command.rb
 - lib/kontena/cli/nodes/ssh_command.rb
+- lib/kontena/cli/nodes/upcloud/create_command.rb
+- lib/kontena/cli/nodes/upcloud/restart_command.rb
+- lib/kontena/cli/nodes/upcloud/terminate_command.rb
+- lib/kontena/cli/nodes/upcloud_command.rb
 - lib/kontena/cli/nodes/update_command.rb
 - lib/kontena/cli/nodes/vagrant/create_command.rb
 - lib/kontena/cli/nodes/vagrant/restart_command.rb
@@ -327,7 +375,23 @@ files:
 - lib/kontena/machine/digital_ocean/master_provisioner.rb
 - lib/kontena/machine/digital_ocean/node_destroyer.rb
 - lib/kontena/machine/digital_ocean/node_provisioner.rb
+- lib/kontena/machine/packet.rb
+- lib/kontena/machine/packet/cloudinit.yml
+- lib/kontena/machine/packet/cloudinit_master.yml
+- lib/kontena/machine/packet/master_provisioner.rb
+- lib/kontena/machine/packet/node_destroyer.rb
+- lib/kontena/machine/packet/node_provisioner.rb
+- lib/kontena/machine/packet/node_restarter.rb
+- lib/kontena/machine/packet/packet_common.rb
 - lib/kontena/machine/random_name.rb
+- lib/kontena/machine/upcloud.rb
+- lib/kontena/machine/upcloud/cloudinit.yml
+- lib/kontena/machine/upcloud/cloudinit_master.yml
+- lib/kontena/machine/upcloud/master_provisioner.rb
+- lib/kontena/machine/upcloud/node_destroyer.rb
+- lib/kontena/machine/upcloud/node_provisioner.rb
+- lib/kontena/machine/upcloud/node_restarter.rb
+- lib/kontena/machine/upcloud/upcloud_common.rb
 - lib/kontena/machine/vagrant.rb
 - lib/kontena/machine/vagrant/Vagrantfile.master.rb.erb
 - lib/kontena/machine/vagrant/Vagrantfile.node.rb.erb
@@ -339,7 +403,11 @@ files:
 - lib/kontena/scripts/completer
 - lib/kontena/scripts/init
 - spec/fixtures/docker-compose.yml
+- spec/fixtures/docker-compose_v2.yml
+- spec/fixtures/kontena-invalid.yml
+- spec/fixtures/kontena-with-variables.yml
 - spec/fixtures/kontena.yml
+- spec/fixtures/kontena_v2.yml
 - spec/fixtures/mysql.yml
 - spec/fixtures/wordpress-scaled.yml
 - spec/fixtures/wordpress.yml
@@ -347,6 +415,12 @@ files:
 - spec/kontena/cli/app/deploy_command_spec.rb
 - spec/kontena/cli/app/docker_helper_spec.rb
 - spec/kontena/cli/app/scale_spec.rb
+- spec/kontena/cli/app/service_generator_spec.rb
+- spec/kontena/cli/app/service_generator_v2_spec.rb
+- spec/kontena/cli/app/yaml/reader_spec.rb
+- spec/kontena/cli/app/yaml/service_extender_spec.rb
+- spec/kontena/cli/app/yaml/validator_spec.rb
+- spec/kontena/cli/app/yaml/validator_v2_spec.rb
 - spec/kontena/cli/common_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb
@@ -397,7 +471,11 @@ specification_version: 4
 summary: Kontena command line tool
 test_files:
 - spec/fixtures/docker-compose.yml
+- spec/fixtures/docker-compose_v2.yml
+- spec/fixtures/kontena-invalid.yml
+- spec/fixtures/kontena-with-variables.yml
 - spec/fixtures/kontena.yml
+- spec/fixtures/kontena_v2.yml
 - spec/fixtures/mysql.yml
 - spec/fixtures/wordpress-scaled.yml
 - spec/fixtures/wordpress.yml
@@ -405,6 +483,12 @@ test_files:
 - spec/kontena/cli/app/deploy_command_spec.rb
 - spec/kontena/cli/app/docker_helper_spec.rb
 - spec/kontena/cli/app/scale_spec.rb
+- spec/kontena/cli/app/service_generator_spec.rb
+- spec/kontena/cli/app/service_generator_v2_spec.rb
+- spec/kontena/cli/app/yaml/reader_spec.rb
+- spec/kontena/cli/app/yaml/service_extender_spec.rb
+- spec/kontena/cli/app/yaml/validator_spec.rb
+- spec/kontena/cli/app/yaml/validator_v2_spec.rb
 - spec/kontena/cli/common_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb