kontena-cli 0.13.4 → 0.14.0

data/spec/kontena/cli/app/docker_helper_spec.rb

@@ -10,7 +10,7 @@ describe Kontena::Cli::Apps::DockerHelper do
   let(:services_with_valid_hooks) do
     {
         'test_service' => {
-            'build' => '.',
+            'build' => { 'context' => '.' },
             'image' => 'test_service',
             'hooks' => {
               'pre_build' => [
@@ -25,7 +25,7 @@ describe Kontena::Cli::Apps::DockerHelper do
   let(:services_with_invalid_hook) do
     {
         'test_service' => {
-            'build' => '.',
+            'build' => { 'context' => '.' },
             'image' => 'test_service',
             'hooks' => {
               'pre_build' => [
@@ -40,7 +40,7 @@ describe Kontena::Cli::Apps::DockerHelper do
   let(:services_with_no_hook) do
     {
         'test_service' => {
-            'build' => '.',
+            'build' => { 'context' => '.' },
             'image' => 'test_service',
         }
     }
@@ -70,7 +70,7 @@ describe Kontena::Cli::Apps::DockerHelper do
   end
 
   describe '#run_pre_build_hook' do
-    
+
     context 'when hook defined' do
       it 'runs the hook' do
         allow(subject).to receive(:build_docker_image)

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

@@ -0,0 +1,374 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/apps/service_generator"
+
+describe Kontena::Cli::Apps::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 '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

data/spec/kontena/cli/app/service_generator_v2_spec.rb

@@ -0,0 +1,74 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/apps/service_generator_v2"
+require 'ruby_dig'
+
+describe Kontena::Cli::Apps::ServiceGeneratorV2 do
+  let(:subject) do
+    described_class.new({})
+  end
+
+  describe '#parse_data' do
+    it 'parses network_mode' do
+      data = {
+        'image' => 'wordpress:latest',
+        'network_mode' => 'bridge'
+      }
+      result = subject.send(:parse_data, data)
+      expect(result['net']).to eq('bridge')
+    end
+
+    it 'parses logging' do
+      data = {
+        'image' => 'wordpress:latest',
+        'logging' => {
+          'driver' => 'influxdb',
+          'options' => {
+            'syslog-address' => 'tcp://192.168.0.42:123'
+          }
+        }
+      }
+      result = subject.send(:parse_data, data)
+      expect(result['log_driver']).to eq('influxdb')
+      expect(result['log_opts']).to eq({
+        'syslog-address' => 'tcp://192.168.0.42:123'
+      })
+    end
+
+    it 'adds depends_on to links' do
+      data = {
+        'image' => 'wordpress:latest',
+        'depends_on' => ['mysql']
+      }
+      result = subject.send(:parse_data, data)
+      expect(result['links']).to eq([{
+        'name' => 'mysql',
+        'alias' => 'mysql'
+      }])
+    end
+  end
+
+  describe '#parse_build_options' do
+    context 'when build option is a string' do
+      it 'converts build option to hash' do
+        data = {
+          'build' => '.',
+          'image' => 'myapp'
+        }
+        result = subject.send(:parse_build_options, data)
+        expect(result).to eq({ 'context' => '.' })
+      end
+    end
+    context 'when build options is a hash' do
+      it 'uses it as build options' do
+        data = {
+          'build' => {
+            'context' => '.',
+            'dockerfile' => 'alternate-dockerfile'
+           }
+        }
+        result = subject.send(:parse_build_options, data)
+        expect(result).to eq(data['build'])
+      end
+    end
+  end
+end