kontena-cli 0.12.3 → 0.13.0

data/lib/kontena/machine/digital_ocean/cloudinit_master.yml

@@ -29,9 +29,8 @@ write_files:
         -e SSL_CERT="$SSL_CERT" \
         -p 80:80 -p 443:443 kontena/haproxy:latest
 coreos:
-  update:
-      reboot-strategy: off
   units:
+<% unless mongodb_uri -%>
     - name: kontena-server-mongo.service
       command: start
       enable: true
@@ -55,7 +54,7 @@ coreos:
         ExecStart=/usr/bin/docker run --name=kontena-server-mongo \
             --volumes-from=kontena-server-mongo-data \
             mongo:3.0 mongod --smallfiles
-
+<% end -%>
     - name: kontena-server-api.service
       command: start
       enable: true
@@ -67,9 +66,13 @@ coreos:
         After=kontena-server-mongo.service
         Description=Kontena Master
         Documentation=http://www.kontena.io/
+        Before=kontena-server-haproxy.service
+        Wants=kontena-server-haproxy.service
         Requires=network-online.target
         Requires=docker.service
+<% unless mongodb_uri -%>
         Requires=kontena-server-mongo.service
+<% end %>
 
         [Service]
         Restart=always
@@ -79,10 +82,16 @@ coreos:
         ExecStartPre=-/usr/bin/docker rm kontena-server-api
         ExecStartPre=/usr/bin/docker pull kontena/server:${KONTENA_VERSION}
         ExecStart=/usr/bin/docker run --name kontena-server-api \
+<% if mongodb_uri -%>
+            -e MONGODB_URI=<%= mongodb_uri %> \
+<% else -%>
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
+<% end -%>
+<% if auth_server %>
+            -e AUTH_API_URL=<%= auth_server %> \
+<% end -%>
             -e VAULT_KEY=${KONTENA_VAULT_KEY} -e VAULT_IV=${KONTENA_VAULT_IV} \
-            <% if auth_server %>-e AUTH_API_URL=<%= auth_server %><% end %> \
             kontena/server:${KONTENA_VERSION}
 
     - name: kontena-server-haproxy.service
@@ -97,6 +106,7 @@ coreos:
         Documentation=http://www.kontena.io/
         Requires=network-online.target
         Requires=docker.service
+        Requires=kontena-server-api.service
 
         [Service]
         Restart=always

data/lib/kontena/machine/digital_ocean/master_provisioner.rb

@@ -8,6 +8,7 @@ module Kontena
     module DigitalOcean
       class MasterProvisioner
         include RandomName
+        include Machine::CertHelper
 
         attr_reader :client, :http_client
 
@@ -25,6 +26,10 @@ module Kontena
           if opts[:ssl_cert]
             abort('Invalid ssl cert') unless File.exists?(File.expand_path(opts[:ssl_cert]))
             ssl_cert = File.read(File.expand_path(opts[:ssl_cert]))
+          else
+            ShellSpinner "Generating self-signed SSL certificate" do
+              ssl_cert = generate_self_signed_cert
+            end
           end
 
           userdata_vars = {
@@ -32,7 +37,8 @@ module Kontena
               auth_server: opts[:auth_server],
               version: opts[:version],
               vault_secret: opts[:vault_secret],
-              vault_iv: opts[:vault_iv]
+              vault_iv: opts[:vault_iv],
+              mongodb_uri: opts[:mongodb_uri]
           }
 
           droplet = DropletKit::Droplet.new(
@@ -52,11 +58,8 @@ module Kontena
               sleep 5
             end
           end
-          if opts[:ssl_cert]
-            master_url = "https://#{droplet.public_ip}"
-          else
-            master_url = "http://#{droplet.public_ip}"
-          end
+
+          master_url = "https://#{droplet.public_ip}"
           Excon.defaults[:ssl_verify_peer] = false
           @http_client = Excon.new("#{master_url}", :connect_timeout => 10)
 
@@ -65,7 +68,7 @@ module Kontena
           end
 
           puts "Kontena Master is now running at #{master_url}"
-          puts "Use #{"kontena login #{master_url}".colorize(:light_black)} to complete Kontena Master setup"
+          puts "Use #{"kontena login --name=#{droplet.name.sub('kontena-master-', '')} #{master_url}".colorize(:light_black)} to complete Kontena Master setup"
         end
 
         def user_data(vars)
@@ -74,7 +77,7 @@ module Kontena
         end
 
         def generate_name
-          "kontena-master-#{super}-#{rand(1..99)}"
+          "kontena-master-#{super}-#{rand(1..9)}"
         end
 
         def ssh_key(public_key)
@@ -88,7 +91,7 @@ module Kontena
         end
 
         def erb(template, vars)
-          ERB.new(template).result(OpenStruct.new(vars).instance_eval { binding })
+          ERB.new(template, nil, '%<>-').result(OpenStruct.new(vars).instance_eval { binding })
         end
       end
     end

data/lib/kontena/machine/vagrant/cloudinit.yml

@@ -18,6 +18,8 @@ write_files:
     content: |
       fs.inotify.max_user_instances = 8192
 coreos:
+  update:
+      reboot-strategy: off
   units:
     - name: 00-eth.network
       runtime: true

data/lib/kontena/scripts/completer

@@ -86,7 +86,7 @@ if words.size > 0
   case words[0]
     when 'grid'
       completion.clear
-      sub_commands = %w(add-user audit-log create current list list-users remove remove-user show use)
+      sub_commands = %w(add-user audit-log create current list user remove show use)
       if words[1]
         completion.push(sub_commands) unless sub_commands.include?(words[1])
         completion.push helper.grids
@@ -108,7 +108,7 @@ if words.size > 0
       if words[1] && words[1] == 'use'
         completion.push helper.master_names
       elsif words[1] && words[1] == 'users'
-        users_sub_commands = %(invite list add-role remove-role)
+        users_sub_commands = %(invite list role)
         completion.push users_sub_commands
       elsif words[1]
         completion.push(sub_commands) unless sub_commands.include?(words[1])
@@ -119,8 +119,8 @@ if words.size > 0
     when 'service'
       completion.clear
       sub_commands = %w(containers create delete deploy list logs restart
-                      scale show start stats stop update monitor envs
-                      add-env remove-env add-secret remove-secret)
+                      scale show start stats stop update monitor env
+                      secret link unlink)
       if words[1]
         completion.push(sub_commands) unless sub_commands.include?(words[1])
         completion.push helper.services

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

@@ -78,26 +78,74 @@ describe Kontena::Cli::Apps::Common do
 
   describe '#extend_env_vars' do
     it 'inherites env vars from upper level' do
-      from = {'environment' => ['FOO=bar']}
-      to = {}
+      from = ['FOO=bar']
+      to = nil
       env_vars = subject.extend_env_vars(from, to)
       expect(env_vars).to eq(['FOO=bar'])
     end
 
     it 'overrides values' do
-      from = {'environment' => ['FOO=bar']}
-      to = {'environment' => ['FOO=baz']}
+      from = ['FOO=bar']
+      to = ['FOO=baz']
       env_vars = subject.extend_env_vars(from, to)
       expect(env_vars).to eq(['FOO=baz'])
     end
 
     it 'combines variables' do
-      from = {'environment' => ['FOO=bar']}
-      to = {'environment' => ['BAR=baz']}
+      from = ['FOO=bar']
+      to = ['BAR=baz']
       env_vars = subject.extend_env_vars(from, to)
       expect(env_vars).to eq(['BAR=baz', 'FOO=bar'])
     end
+  end
+
+  describe '#extend_secrets' do
+    it 'inherites secrets from upper level' do
+      secret = {
+        'secret' => 'CUSTOMER_DB_PASSWORD',
+        'name' => 'MYSQL_PASSWORD',
+        'type' => 'env'
+      }
+      from = [secret]
+      to = nil
+      secrets = subject.extend_secrets(from, to)
+      expect(secrets).to eq([secret])
+    end
+
+    it 'overrides secrets' do
+      from_secret = {
+        'secret' => 'CUSTOMER_DB_PASSWORD',
+        'name' => 'MYSQL_PASSWORD',
+        'type' => 'env'
+      }
 
+      to_secret = {
+        'secret' => 'CUSTOMER_DB_PASSWORD',
+        'name' => 'MYSQL_ROOT_PASSWORD',
+        'type' => 'env'
+      }
+      from = [from_secret]
+      to = [to_secret]
+      secrets = subject.extend_secrets(from, to)
+      expect(secrets).to eq([to_secret])
+    end
+
+    it 'combines secrets' do
+      from_secret = {
+        'secret' => 'CUSTOMER_DB_PASSWORD',
+        'name' => 'MYSQL_PASSWORD',
+        'type' => 'env'
+      }
 
+      to_secret = {
+        'secret' => 'CUSTOMER_API_TOKEN',
+        'name' => 'API_TOKEN',
+        'type' => 'env'
+      }
+      from = [from_secret]
+      to = [to_secret]
+      secrets = subject.extend_secrets(from, to)
+      expect(secrets).to eq([to_secret, from_secret])
+    end
   end
-end
+end

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

@@ -7,6 +7,45 @@ describe Kontena::Cli::Apps::DockerHelper do
     Class.new { include Kontena::Cli::Apps::DockerHelper}.new
   end
 
+  let(:services_with_valid_hooks) do
+    {
+        'test_service' => {
+            'build' => '.',
+            'image' => 'test_service',
+            'hooks' => {
+              'pre_build' => [
+                { 'cmd' => "echo PREBUILD1", 'name' => 'hook1' },
+                { 'cmd' => "echo PREBUILD2", 'name' => 'hook2' }
+              ]
+            }
+        }
+    }
+  end
+
+  let(:services_with_invalid_hook) do
+    {
+        'test_service' => {
+            'build' => '.',
+            'image' => 'test_service',
+            'hooks' => {
+              'pre_build' => [
+                { 'cmd' => "echo PREBUILD1", 'name' => 'hook1' },
+                { 'cmd' => "some_non_existing_command", 'name' => 'failing hook' },
+              ]
+            }
+        }
+    }
+  end
+
+  let(:services_with_no_hook) do
+    {
+        'test_service' => {
+            'build' => '.',
+            'image' => 'test_service',
+        }
+    }
+  end
+
   describe '#validate_image_name' do
     context 'when image name is valid' do
       it 'returns true' do
@@ -29,4 +68,39 @@ describe Kontena::Cli::Apps::DockerHelper do
       end
     end
   end
+
+  describe '#run_pre_build_hook' do
+    
+    context 'when hook defined' do
+      it 'runs the hook' do
+        allow(subject).to receive(:build_docker_image)
+        allow(subject).to receive(:push_docker_image)
+        expect(subject).to receive(:system).with("echo PREBUILD1"). and_return(true)
+        expect(subject).to receive(:system).with("echo PREBUILD2"). and_return(true)
+
+        subject.process_docker_images(services_with_valid_hooks)
+      end
+
+      it 'fails to run the hook' do
+        allow(subject).to receive(:build_docker_image)
+        allow(subject).to receive(:push_docker_image)
+        expect(subject).to receive(:system).with("echo PREBUILD1"). and_return(true)
+        expect(subject).to receive(:system).with("some_non_existing_command"). and_return(false)
+
+        expect {
+          subject.process_docker_images(services_with_invalid_hook)
+        }.to raise_error(SystemExit)
+      end
+    end
+    context 'when no hook defined' do
+      it 'runs no hooks' do
+        allow(subject).to receive(:build_docker_image)
+        allow(subject).to receive(:push_docker_image)
+        expect(subject).not_to receive(:run_pre_build_hook)
+
+        subject.process_docker_images(services_with_no_hook)
+      end
+    end
+  end
+
 end

data/spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb

@@ -0,0 +1,38 @@
+require_relative "../../../../spec_helper"
+require "kontena/cli/grids/trusted_subnet_command"
+require "kontena/cli/grids/trusted_subnets/add_command"
+
+describe Kontena::Cli::Grids::TrustedSubnets::AddCommand do
+
+  include ClientHelpers
+
+  describe '#execute' do
+    it 'requires api url' do
+      expect(subject).to receive(:require_api_url).once
+      subject.run(['grid', 'subnet'])
+    end
+
+    it 'requires token' do
+      expect(subject).to receive(:require_token).and_return(token)
+      subject.run(['grid', 'subnet'])
+    end
+
+    it 'requires grid as param' do
+      expect {
+        subject.run([])
+      }.to raise_error(Clamp::UsageError)
+    end
+
+    it 'adds subnet to grid' do
+      allow(client).to receive(:get).with("grids/my-grid").and_return(
+        'trusted_subnets' => ['192.168.12.0/24']
+      )
+      expect(client).to receive(:put).with(
+        'grids/my-grid', hash_including({trusted_subnets: [
+          '192.168.12.0/24', '10.12.0.0/19'
+        ]})
+      )
+      subject.run(['my-grid', '10.12.0.0/19'])
+    end
+  end
+end

data/spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb

@@ -0,0 +1,31 @@
+require_relative "../../../../spec_helper"
+require "kontena/cli/grids/trusted_subnet_command"
+require "kontena/cli/grids/trusted_subnets/list_command"
+
+describe Kontena::Cli::Grids::TrustedSubnets::ListCommand do
+
+  include ClientHelpers
+
+  describe '#execute' do
+    it 'requires api url' do
+      expect(subject).to receive(:require_api_url).once
+      subject.run(['grid'])
+    end
+
+    it 'requires token' do
+      expect(subject).to receive(:require_token).and_return(token)
+      subject.run(['grid'])
+    end
+
+    it 'requires grid as param' do
+      expect {
+        subject.run([])
+      }.to raise_error(Clamp::UsageError)
+    end
+
+    it 'requests grid details from master' do
+      expect(client).to receive(:get).with("grids/test-grid")
+      subject.run(['test-grid'])
+    end
+  end
+end

data/spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb

@@ -0,0 +1,38 @@
+require_relative "../../../../spec_helper"
+require "kontena/cli/grids/trusted_subnet_command"
+require "kontena/cli/grids/trusted_subnets/remove_command"
+
+describe Kontena::Cli::Grids::TrustedSubnets::RemoveCommand do
+
+  include ClientHelpers
+
+  describe '#execute' do
+    it 'requires api url' do
+      expect(subject).to receive(:require_api_url).once
+      subject.run(['grid', 'subnet'])
+    end
+
+    it 'requires token' do
+      expect(subject).to receive(:require_token).and_return(token)
+      subject.run(['grid', 'subnet'])
+    end
+
+    it 'requires grid as param' do
+      expect {
+        subject.run([])
+      }.to raise_error(Clamp::UsageError)
+    end
+
+    it 'removes subnet from grid' do
+      allow(client).to receive(:get).with("grids/my-grid").and_return(
+        'trusted_subnets' => ['192.168.12.0/24', '192.168.50.0/24']
+      )
+      expect(client).to receive(:put).with(
+        'grids/my-grid', hash_including({trusted_subnets: [
+          '192.168.12.0/24'
+        ]})
+      )
+      subject.run(['my-grid', '192.168.50.0/24'])
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+require_relative "../../../spec_helper"
+require 'kontena/cli/master/current_command'
+
+describe Kontena::Cli::Master::CurrentCommand do
+  let(:settings) do
+    {'current_server' => 'alias',
+      'servers' => [
+        {'name' => 'some_master', 'url' => 'some_master'},
+        {'name' => 'alias', 'url' => 'someurl', 'token' => '123456'}
+      ]
+    }
+  end
+
+  let(:subject) { described_class.new(File.basename($0)) }
+
+  describe '#execute' do
+    it 'puts master name and URL' do
+      allow(subject).to receive(:settings).and_return(settings)
+
+      expect {
+        subject.run([])
+      }.to output(/alias.*someurl/).to_stdout
+    end
+
+    it 'only outputs name if name-flag is set' do
+      allow(subject).to receive(:settings).and_return(settings)
+
+      expect {
+        subject.run(['--name'])
+      }.to output("alias\n").to_stdout
+    end
+
+    it 'does not raise error when logged in' do
+      allow(subject).to receive(:settings).and_return(settings)
+
+      expect {
+        subject.run([])
+      }.to_not raise_error
+    end
+
+    it 'raises error when not logged in' do
+      allow(subject).to receive(:settings).and_return(
+        {
+            'current_server' => nil,
+            'servers' => [
+                {'name' => 'some_master', 'url' => 'some_master'},
+                {'name' => 'alias', 'url' => 'someurl', 'token' => '123456'}
+            ]
+        }
+      )
+
+      expect {
+        subject.run([])
+      }.to raise_error(ArgumentError)
+    end
+  end
+end