kontena-cli 0.8.4 → 0.9.0

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

@@ -8,7 +8,7 @@ write_files:
       KONTENA_TOKEN="<%= grid_token %>"
       KONTENA_PEER_INTERFACE=eth1
       KONTENA_VERSION=<%= version %>
-  - path: /etc/systemd/system/docker.service.d/50-insecure-registry.conf
+  - path: /etc/systemd/system/docker.service.d/50-kontena.conf
     content: |
         [Service]
         Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="172.17.42.1/16"'
@@ -61,5 +61,6 @@ coreos:
             -e KONTENA_TOKEN=${KONTENA_TOKEN} \
             -e KONTENA_PEER_INTERFACE=${KONTENA_PEER_INTERFACE} \
             -v=/var/run/docker.sock:/var/run/docker.sock \
+            -v=/etc/kontena-agent.env:/etc/kontena.env \
             --net=host \
             kontena/agent:${KONTENA_VERSION}

data/lib/kontena/machine/vagrant/master_destroyer.rb

@@ -0,0 +1,37 @@
+require 'fileutils'
+
+module Kontena
+  module Machine
+    module Vagrant
+      class MasterDestroyer
+
+        attr_reader :client, :api_client
+
+        # @param [Kontena::Client] api_client Kontena api client
+        def initialize(api_client)
+          @api_client = api_client
+        end
+
+        def run!
+          if api_client.get("grids")['grids'].size > 0
+            abort("Cannot remove kontena-master because it has grids".colorize(:red))
+          end
+
+          vagrant_path = "#{Dir.home}/.kontena/vagrant_master"
+          Dir.chdir(vagrant_path) do
+            ShellSpinner "Terminating Vagrant kontena-master " do
+              Open3.popen2('vagrant destroy -f') do |stdin, output, wait|
+                while o = output.gets
+                  puts o if ENV['DEBUG']
+                end
+                if wait.value == 0
+                  FileUtils.remove_entry_secure(vagrant_path)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,75 @@
+require 'fileutils'
+require 'erb'
+require 'open3'
+require 'shell-spinner'
+
+module Kontena
+  module Machine
+    module Vagrant
+      class MasterProvisioner
+        include RandomName
+
+        API_URL = 'http://192.168.66.100:8080'
+        attr_reader :client
+
+        def initialize
+          @client = Excon.new(API_URL)
+        end
+
+        def run!(opts)
+          name = generate_name
+          version = opts[:version]
+          memory = opts[:memory] || 1024
+          auth_server = opts[:auth_server]
+          vagrant_path = "#{Dir.home}/.kontena/vagrant_master/"
+          if Dir.exist?(vagrant_path)
+            abort("Oops... cannot create Kontena Master! You can run only one Kontena Master with Vagrant".colorize(:red))
+          end
+          FileUtils.mkdir_p(vagrant_path)
+
+          template = File.join(__dir__ , '/Vagrantfile.master.rb.erb')
+          cloudinit_template = File.join(__dir__ , '/cloudinit.yml')
+          vars = {
+            name: name,
+            version: version,
+            memory: memory,
+            auth_server: auth_server,
+            cloudinit: "#{vagrant_path}/cloudinit.yml"
+          }
+          vagrant_data = erb(File.read(template), vars)
+          cloudinit = erb(File.read(cloudinit_template), vars)
+          File.write("#{vagrant_path}/Vagrantfile", vagrant_data)
+          File.write("#{vagrant_path}/cloudinit.yml", cloudinit)
+          Dir.chdir(vagrant_path) do
+            ShellSpinner "Creating Vagrant machine #{name.colorize(:cyan)} " do
+              Open3.popen2('vagrant box update && vagrant up') do |stdin, output, wait|
+                while o = output.gets
+                  print o if ENV['DEBUG']
+                end
+              end
+            end
+            ShellSpinner "Waiting for #{name.colorize(:cyan)} to start " do
+              sleep 1 until master_running?
+            end
+            puts "Kontena Master is now running at #{API_URL}"
+            puts "Use #{"kontena login #{API_URL}".colorize(:light_black)} to complete Kontena Master setup"
+          end
+        end
+
+        def erb(template, vars)
+          ERB.new(template).result(OpenStruct.new(vars).instance_eval { binding })
+        end
+
+        def master_running?
+          client.get(path: '/').status == 200
+        rescue
+          false
+        end
+
+        def generate_name
+          "kontena-master-#{super}-#{rand(1..99)}"
+        end
+      end
+    end
+  end
+end

data/lib/kontena/machine/vagrant/node_destroyer.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 
 module Kontena
   module Machine
@@ -20,6 +21,9 @@ module Kontena
                 while o = output.gets
                   puts o if ENV['DEBUG']
                 end
+                if wait.value == 0
+                  FileUtils.remove_entry_secure(vagrant_path)
+                end
               end
             end
           end

data/lib/kontena/machine/vagrant/node_provisioner.rb

@@ -23,7 +23,7 @@ module Kontena
           vagrant_path = "#{Dir.home}/.kontena/#{grid}/#{name}"
           FileUtils.mkdir_p(vagrant_path)
 
-          template = File.join(__dir__ , '/Vagrantfile.coreos.rb.erb')
+          template = File.join(__dir__ , '/Vagrantfile.node.rb.erb')
           cloudinit_template = File.join(__dir__ , '/cloudinit.yml')
           vars = {
             name: name,

data/lib/kontena/scripts/completer

@@ -3,6 +3,7 @@
 
 # resolve bin path, ignoring symlinks
 require 'pathname'
+require 'yaml'
 bin_file = Pathname.new(__FILE__).realpath
 
 # add self to libpath
@@ -52,6 +53,16 @@ class Helper
   rescue
     []
   end
+
+  def yml_services
+    if File.exist?('kontena.yml')
+      services = YAML.load(File.read('kontena.yml'))
+      services.keys
+    end
+  rescue
+    []
+  end
+
 end
 
 helper = Helper.new
@@ -60,7 +71,7 @@ words = ARGV
 words.delete_at(0)
 
 completion = []
-completion.push %w(app deploy forgot-password node grid invite service container vpn external-registry registry login logout whoami) if words.size < 2
+completion.push %w(app deploy forgot-password master node grid invite service container vpn external-registry registry login logout whoami) if words.size < 2
 if words.size > 0
   case words[0]
     when 'grid'
@@ -74,13 +85,22 @@ if words.size > 0
       end
     when 'node'
       completion.clear
-      sub_commands = %w(list show remove vagrant digitalocean)
+      sub_commands = %w(list show remove vagrant digitalocean azure aws)
       if words[1]
         completion.push(sub_commands) unless sub_commands.include?(words[1])
         completion.push helper.nodes
       else
         completion.push sub_commands
       end
+    when 'master'
+      completion.clear
+      sub_commands = %w(vagrant digitalocean azure aws)
+      if words[1]
+        completion.push(sub_commands) unless sub_commands.include?(words[1])
+        completion.push %w(create)
+      else
+        completion.push sub_commands
+      end
     when 'service'
       completion.clear
       sub_commands = %w(containers create delete deploy list logs restart scale show start stats stop update)
@@ -107,7 +127,13 @@ if words.size > 0
       completion.push %w(add list delete)
     when 'app'
       completion.clear
-      completion.push %w(init deploy start stop remove rm ps list)
+      sub_commands = %w(init build deploy start stop remove rm ps list logs)
+      if words[1]
+        completion.push(sub_commands) unless sub_commands.include?(words[1])
+        completion.push helper.yml_services
+      else
+        completion.push sub_commands
+      end
   end
 end
 

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

@@ -0,0 +1,61 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/apps/common"
+
+describe Kontena::Cli::Apps::Common do
+
+  let(:subject) do
+    Class.new { include Kontena::Cli::Apps::Common}.new
+  end
+
+  describe '#normalize_env_vars' do
+    it 'converts env hash to array' do
+      opts = {
+          'environment' => {
+              'FOO' => 'bar',
+              'BAR' => 'baz'
+          }
+      }
+      subject.normalize_env_vars(opts)
+      env = opts['environment']
+      expect(env).to include('FOO=bar')
+      expect(env).to include('BAR=baz')
+    end
+
+    it 'does nothing to env array' do
+      opts = {
+          'environment' => [
+              'FOO=bar', 'BAR=baz'
+          ]
+      }
+      subject.normalize_env_vars(opts)
+      env = opts['environment']
+      expect(env).to include('FOO=bar')
+      expect(env).to include('BAR=baz')
+    end
+  end
+
+  describe '#extend_env_vars' do
+    it 'inherites env vars from upper level' do
+      from = {'environment' => ['FOO=bar']}
+      to = {}
+      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']}
+      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']}
+      env_vars = subject.extend_env_vars(from, to)
+      expect(env_vars).to eq(['BAR=baz', 'FOO=bar'])
+    end
+
+
+  end
+end

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

@@ -37,7 +37,7 @@ wordpress:
     service: wordpress
   stateful: true
   environment:
-    - WORDPRESS_DB_PASSWORD=%{prefix}_secret
+    - WORDPRESS_DB_PASSWORD=%{project}_secret
   instances: 2
   deploy:
     strategy: ha
@@ -47,7 +47,7 @@ mysql:
     service: mysql
   stateful: true
   environment:
-    - MYSQL_ROOT_PASSWORD=%{prefix}_secret
+    - MYSQL_ROOT_PASSWORD=%{project}_secret
 yml
     yml_content
   end
@@ -105,8 +105,8 @@ yml
       before(:each) do
         allow(subject).to receive(:settings).and_return(settings)
         allow(File).to receive(:exists?).and_return(true)
-        allow(File).to receive(:read).with('kontena.yml').and_return(kontena_yml)
-        allow(File).to receive(:read).with('docker-compose.yml').and_return(docker_compose_yml)
+        allow(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(kontena_yml)
+        allow(File).to receive(:read).with("#{Dir.getwd}/docker-compose.yml").and_return(docker_compose_yml)
         allow(subject).to receive(:get_service).and_raise(Kontena::Errors::StandardError.new(404, 'Not Found'))
         allow(subject).to receive(:create_service).and_return({'id' => 'cli/kontena-test-mysql', 'name' => 'kontena-test-mysql'},{'id' => 'cli/kontena-test-wordpress', 'name' => 'kontena-test-wordpress'})
         allow(subject).to receive(:current_grid).and_return('1')
@@ -115,17 +115,18 @@ yml
 
       it 'reads ./kontena.yml file by default' do
         allow(subject).to receive(:settings).and_return(settings)
-        expect(File).to receive(:read).with('kontena.yml').and_return(kontena_yml)
+        expect(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(kontena_yml)
         subject.run([])
       end
 
       it 'reads given yml file' do
-        expect(File).to receive(:read).with('custom.yml').and_return(kontena_yml)
+        expect(File).to receive(:read).with("#{Dir.getwd}/custom.yml").and_return(kontena_yml)
         subject.run(["--file", "custom.yml"])
       end
 
       it 'uses current directory as service name prefix by default' do
         current_dir = '/kontena/tests/stacks'
+        allow(Dir).to receive(:chdir).and_return(true)
         allow(Dir).to receive(:getwd).and_return(current_dir)
         expect(File).to receive(:basename).with(current_dir).and_return('stacks')
         subject.run([])
@@ -180,6 +181,24 @@ yml
         end
       end
 
+      it 'merges external links to links' do
+        allow(subject).to receive(:current_dir).and_return("kontena-test")
+        allow(YAML).to receive(:load).and_return(services)
+        services['wordpress']['external_links'] = ['loadbalancer:loadbalancer']
+        data = {
+            :name =>"kontena-test-wordpress",
+            :image=>"wordpress:latest",
+            :env=> nil,
+            :container_count=>2,
+            :stateful=>false,
+            :links=>[{:name => "kontena-test-mysql", :alias => "db"}, {:name => "loadbalancer", :alias => "loadbalancer"}],
+            :ports=>[{:container_port => "80", :node_port => "80", :protocol => "tcp"}]
+        }
+
+        expect(subject).to receive(:create_service).with('1234567', '1', data)
+        subject.run([])
+      end
+
       it 'creates mysql service before wordpress' do
         allow(subject).to receive(:current_dir).and_return("kontena-test")
         data = {:name =>"kontena-test-mysql", :image=>'mysql:5.6', :env=>["MYSQL_ROOT_PASSWORD=kontena-test_secret"], :container_count=>nil, :stateful=>true}

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

@@ -0,0 +1,32 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/apps/docker_helper"
+
+describe Kontena::Cli::Apps::DockerHelper do
+
+  let(:subject) do
+    Class.new { include Kontena::Cli::Apps::DockerHelper}.new
+  end
+
+  describe '#validate_image_name' do
+    context 'when image name is valid' do
+      it 'returns true' do
+        expect(subject.validate_image_name('registry.kontena.local/image-name:latest')).to be_truthy
+        expect(subject.validate_image_name('my-registry.com/organization/image_name:latest')).to be_truthy
+        expect(subject.validate_image_name('mysql:5.1')).to be_truthy
+        expect(subject.validate_image_name('wordpress')).to be_truthy
+      end
+
+    end
+  end
+
+  describe '#validate_image_name' do
+    context 'when image name is invalid' do
+      it 'returns false' do
+        expect(subject.validate_image_name('registry.kontena.local/image-name:')).to be_falsey
+        expect(subject.validate_image_name('mysql 5.1')).to be_falsey
+        expect(subject.validate_image_name('*.mydomain.com/mysql')).to be_falsey
+      end
+
+    end
+  end
+end

data/spec/kontena/cli/common_spec.rb

@@ -0,0 +1,53 @@
+require_relative "../../spec_helper"
+require "kontena/cli/common"
+
+describe Kontena::Cli::Common do
+
+  let(:subject) do
+    Class.new do
+      include Kontena::Cli::Common
+    end.new
+  end
+
+  before(:each) do
+    allow(subject).to receive(:settings).and_return({'server' => {}})
+    allow(subject).to receive(:save_settings)
+  end
+
+  describe '#current_grid' do
+    it 'returns nil by default' do
+      expect(subject.current_grid).to eq(nil)
+    end
+
+    it 'returns grid from env' do
+      expect(ENV).to receive(:[]).with('KONTENA_GRID').and_return('foo')
+      expect(subject.current_grid).to eq('foo')
+    end
+  end
+
+  describe '#api_url' do
+    it 'raises error by default' do
+      expect {
+        subject.api_url
+      }.to raise_error(ArgumentError)
+    end
+
+    it 'return url from env' do
+      expect(ENV).to receive(:[]).with('KONTENA_URL').and_return('https://domain.com')
+      expect(subject.api_url).to eq('https://domain.com')
+    end
+  end
+
+  describe '#require_token' do
+    it 'raises error by default' do
+      expect {
+        subject.require_token
+      }.to raise_error(ArgumentError)
+    end
+
+    it 'return token from env' do
+      expect(ENV).to receive(:[]).with('KONTENA_TOKEN').and_return('secret_token')
+      expect(subject.require_token).to eq('secret_token')
+    end
+  end
+end