kontena-cli 0.14.7 → 0.15.0.rc1

data/lib/kontena/cli/stacks/update_command.rb

@@ -0,0 +1,27 @@
+require_relative 'common'
+
+module Kontena::Cli::Stacks
+  class UpdateCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Common
+
+    option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena stack file', attribute_name: :filename, default: 'kontena.yml'
+
+    def execute
+      require_api_url
+      require_token
+      require_config_file(filename)
+      @stack = stack_from_yaml(filename)
+
+      update_stack
+    end
+
+    private
+
+    def update_stack
+      client(token).put("stacks/#{current_grid}/#{@stack['name']}", @stack)
+    end
+
+  end
+end

data/lib/kontena/client.rb

@@ -1,12 +1,12 @@
 require 'json'
 require 'excon'
 require_relative 'errors'
-require 'kontena/cli/version'
+require_relative 'cli/version'
 
 module Kontena
   class Client
 
-    attr_accessor :default_headers
+    attr_accessor :default_headers, :path_prefix
     attr_reader :http_client
 
     # Initialize api client
@@ -16,8 +16,13 @@ module Kontena
     def initialize(api_url, default_headers = {})
       Excon.defaults[:ssl_verify_peer] = false if ignore_ssl_errors?
       @http_client = Excon.new(api_url)
-      @default_headers = {'Accept' => 'application/json', 'Content-Type' => 'application/json', 'User-Agent' => "kontena-cli/#{Kontena::Cli::VERSION}"}.merge(default_headers)
+      @default_headers = {
+        'Accept' => 'application/json',
+        'Content-Type' => 'application/json',
+        'User-Agent' => "kontena-cli/#{Kontena::Cli::VERSION}"
+      }.merge(default_headers)
       @api_url = api_url
+      @path_prefix = '/v1/'
     end
 
     # Get request
@@ -134,7 +139,7 @@ module Kontena
     # @param [String] path
     # @return [String]
     def request_uri(path)
-      "/v1/#{path}"
+      "#{path_prefix}#{path}"
     end
 
     ##
@@ -190,10 +195,12 @@ module Kontena
       JSON.dump(obj)
     end
 
+    # @return [Boolean]
     def ignore_ssl_errors?
       ENV['SSL_IGNORE_ERRORS'] == 'true'
     end
 
+    # @param [Excon::Response] response
     def handle_error_response(response)
       message = response.body
       if response.status == 404 && message == ''

data/lib/kontena/command.rb

@@ -0,0 +1,4 @@
+require 'clamp'
+
+class Kontena::Command < Clamp::Command
+end

data/lib/kontena/main_command.rb

@@ -0,0 +1,61 @@
+require 'clamp'
+require_relative 'command'
+require_relative 'util'
+require_relative 'cli/common'
+require_relative 'cli/bytes_helper'
+require_relative 'cli/grid_options'
+require_relative 'cli/app_command'
+require_relative 'cli/register_command'
+require_relative 'cli/login_command'
+require_relative 'cli/logout_command'
+require_relative 'cli/whoami_command'
+require_relative 'cli/container_command'
+require_relative 'cli/grid_command'
+require_relative 'cli/master_command'
+require_relative 'cli/node_command'
+require_relative 'cli/service_command'
+require_relative 'cli/vpn_command'
+require_relative 'cli/registry_command'
+require_relative 'cli/external_registry_command'
+require_relative 'cli/app_command'
+require_relative 'cli/etcd_command'
+require_relative 'cli/vault_command'
+require_relative 'cli/user_command'
+require_relative 'cli/plugin_command'
+require_relative 'cli/version_command'
+require_relative 'cli/stack_command'
+require_relative 'cli/certificate_command'
+
+class Kontena::MainCommand < Kontena::Command
+
+  subcommand "grid", "Grid specific commands", Kontena::Cli::GridCommand
+  subcommand "app", "App specific commands", Kontena::Cli::AppCommand
+  subcommand "stack", "Stack specific commands", Kontena::Cli::StackCommand
+  subcommand "service", "Service specific commands", Kontena::Cli::ServiceCommand
+  subcommand "vault", "Vault specific commands", Kontena::Cli::VaultCommand
+  subcommand "certificate", "LE Certificate specific commands", Kontena::Cli::CertificateCommand
+  subcommand "node", "Node specific commands", Kontena::Cli::NodeCommand
+  subcommand "master", "Master specific commands", Kontena::Cli::MasterCommand
+  subcommand "vpn", "VPN specific commands", Kontena::Cli::VpnCommand
+  subcommand "registry", "Registry specific commands", Kontena::Cli::RegistryCommand
+  subcommand "container", "Container specific commands", Kontena::Cli::ContainerCommand
+  subcommand "etcd", "Etcd specific commands", Kontena::Cli::EtcdCommand
+  subcommand "external-registry", "External registry specific commands", Kontena::Cli::ExternalRegistryCommand
+  subcommand "register", "Register Kontena Account", Kontena::Cli::RegisterCommand
+  subcommand "login", "Login to Kontena Master", Kontena::Cli::LoginCommand
+  subcommand "logout", "Logout from Kontena Master", Kontena::Cli::LogoutCommand
+  subcommand "whoami", "Shows current logged in user", Kontena::Cli::WhoamiCommand
+  subcommand "user", "User related commands", Kontena::Cli::UserCommand
+  subcommand "plugin", "Plugin related commands", Kontena::Cli::PluginCommand
+  subcommand "version", "Show version", Kontena::Cli::VersionCommand
+
+  def execute
+  end
+
+  # @param [String] command
+  # @param [String] description
+  # @param [Class] klass
+  def self.register(command, description, command_class)
+    subcommand(command, description, command_class)
+  end
+end

data/lib/kontena/plugin_manager.rb

@@ -0,0 +1,38 @@
+require 'singleton'
+
+module Kontena
+  class PluginManager
+    include Singleton
+
+    attr_reader :plugins
+
+    def initialize
+      @plugins = []
+    end
+
+    # @return [Array<Gem::Specification>]
+    def load_plugins
+      Gem::Specification.to_a.each do |spec|
+        spec.require_paths.to_a.each do |require_path|
+          plugin = File.join(spec.gem_dir, require_path, 'kontena_cli_plugin.rb')
+          if File.exist?(plugin)
+            begin
+              load(plugin)
+              @plugins << spec
+            rescue LoadError => exc
+              STDERR.puts "failed to load plugin: #{spec.name}"
+              if ENV['DEBUG']
+                STDERR.puts exc.message
+                STDERR.puts exc.backtrace.join("\n")
+              end
+              exit 1
+            end
+          end
+        end
+      end
+      @plugins
+    rescue => exc
+      STDERR.puts exc.message
+    end
+  end
+end

data/lib/kontena/util.rb

@@ -0,0 +1,17 @@
+module Kontena
+  module Util
+    
+    # @param [String] cmd
+    def which(cmd)
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each { |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return exe if File.executable?(exe) && !File.directory?(exe)
+        }
+      end
+      return nil
+    end
+    module_function(:which)
+  end
+end

data/lib/kontena_cli.rb

@@ -0,0 +1,6 @@
+module Kontena; end
+
+require 'ruby_dig'
+require_relative 'kontena/client'
+require_relative 'kontena/plugin_manager'
+require_relative 'kontena/main_command'

data/spec/fixtures/health.yml

@@ -0,0 +1,26 @@
+web:
+  image: nginx
+  stateful: false
+  health_check:
+    protocol: http
+    port: 80
+    interval: 20
+    uri: /
+    initial_delay: 10
+    timeout: 2
+
+
+mysql:
+  image: mysql
+  stateful: false
+  deploy:
+    strategy: ha
+    wait_for_port: 3306
+  environment:
+    - MYSQL_ALLOW_EMPTY_PASSWORD=true
+  health_check:
+    protocol: tcp
+    port: 3306
+    interval: 20
+    initial_delay: 10
+    timeout: 2

data/spec/fixtures/kontena-build.yml

@@ -0,0 +1,16 @@
+wordpress:
+  build: .
+  image: registry.kontena.local/wordpress:latest
+  stateful: true
+  environment:
+    WORDPRESS_DB_PASSWORD: %{project}_secret
+  instances: 2
+  deploy:
+    strategy: ha
+mysql:
+  extends:
+    file: docker-compose.yml
+    service: mysql
+  stateful: true
+  environment:
+    - MYSQL_ROOT_PASSWORD=%{project}_secret

data/spec/fixtures/kontena_build_v2.yaml

@@ -0,0 +1,26 @@
+version: '2'
+name: test-project
+services:
+  mysql:
+    extends:
+      file: docker-compose.yml
+      service: mysql
+    stateful: true
+    environment:
+      - MYSQL_ROOT_PASSWORD=%{project}_secret
+
+  webapp:
+    image: webapp
+    build:
+      context: .
+      args:
+        - foo=bar
+        - baz=baf
+
+  some_app:
+    image: some_app
+    build:
+      context: .
+      args:
+        foo: bar
+        baz:

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

@@ -9,6 +9,10 @@ describe Kontena::Cli::Apps::BuildCommand do
   end
 
   let(:kontena_yml) do
+    fixture('kontena-build.yml')
+  end
+
+  let(:mysql_yml) do
     fixture('kontena.yml')
   end
 
@@ -50,7 +54,15 @@ describe Kontena::Cli::Apps::BuildCommand do
 
     it 'requests process_docker_images with given no_cache option' do
       expect(subject).to receive(:process_docker_images).with(anything, anything, true)
-      subject.run(['--no-cache', true])
+      subject.run(['--no-cache'])
+    end
+
+    it 'raises error if no services found with build options' do
+      allow(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(mysql_yml)
+      expect(subject).not_to receive(:process_docker_images)
+      expect {
+        subject.run([])
+      }.to raise_error SystemExit
     end
   end
 end

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

@@ -25,6 +25,10 @@ describe Kontena::Cli::Apps::Common do
     fixture('mysql.yml')
   end
 
+  let(:health_yml) do
+    fixture('health.yml')
+  end
+
   let(:services) do
     {
       'wordpress' => {
@@ -60,6 +64,7 @@ describe Kontena::Cli::Apps::Common do
   describe '#load_from_yaml' do
     before(:each) do
       allow(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(kontena_yml)
+      allow(File).to receive(:read).with("#{Dir.getwd}/health.yml").and_return(health_yml)
       allow(File).to receive(:read).with("#{Dir.getwd}/docker-compose.yml").and_return(docker_compose_yml)
     end
 
@@ -85,5 +90,11 @@ describe Kontena::Cli::Apps::Common do
       expect(services['wordpress']).not_to be_nil
       expect(services.size).to eq(1)
     end
+
+    it 'populates health check' do
+      services = subject.services_from_yaml('health.yml',['web'],'')
+      expect(services['web']).not_to be_nil
+      expect(services['web']['health_check']).not_to be_nil
+    end
   end
 end

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

@@ -220,7 +220,7 @@ describe Kontena::Cli::Apps::DeployCommand do
           'stateful' => true,
           'strategy' => 'ha',
           'links' => [{ 'name' => 'kontena-test-mysql', 'alias' => 'mysql' }],
-          'ports' => [{ 'container_port' => '80', 'node_port' => '80', 'protocol' => 'tcp' }]
+          'ports' => [{ 'ip' => '0.0.0.0','container_port' => '80', 'node_port' => '80', 'protocol' => 'tcp' }]
         }
         expect(subject).to receive(:create_service).with('1234567', '1', hash_including(data))
 

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

@@ -103,4 +103,49 @@ describe Kontena::Cli::Apps::DockerHelper do
     end
   end
 
+  describe '#build_docker_image' do
+    it 'builds image' do
+      service = {
+        'build' => { 'context' => '.' },
+        'image' => 'test_service'
+      }
+      expect(subject).to receive(:system).with("docker build -t test_service ."). and_return(true)
+      subject.build_docker_image(service)
+    end
+
+    it 'builds image with no-cache' do
+      service = {
+        'build' => { 'context' => '.' },
+        'image' => 'test_service'
+      }
+      expect(subject).to receive(:system).with("docker build -t test_service --no-cache ."). and_return(true)
+      subject.build_docker_image(service, true)
+    end
+
+    it 'builds image with alternate dockerfile' do
+      service = {
+        'build' => { 'context' => '.', 'dockerfile' => 'other_dockerfile' },
+        'image' => 'test_service'
+      }
+      expected_path = File.join(File.expand_path('.'), 'other_dockerfile')
+      expect(subject).to receive(:system).with("docker build -t test_service -f #{expected_path} ."). and_return(true)
+      subject.build_docker_image(service)
+    end
+
+    it 'builds image' do
+      service = {
+        'build' => { 
+          'context' => '.',
+          'args' => {
+            'FOO' => 'bar',
+            'BAR' => 'foo'
+          }
+        },
+        'image' => 'test_service'
+      }
+      expect(subject).to receive(:system).with("docker build -t test_service --build-arg FOO=bar --build-arg BAR=foo ."). and_return(true)
+      subject.build_docker_image(service)
+    end
+  end
+
 end

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

@@ -6,6 +6,12 @@ describe Kontena::Cli::Apps::ServiceGenerator do
     described_class.new({})
   end
 
+  let(:env_file) do
+    'APIKEY=12345
+MYSQL_ROOT_PASSWORD=secret
+WP_ADMIN_PASSWORD=verysecret'.split(/\r?\n/)
+  end
+
   describe '#parse_data' do
     context 'volumes' do
       it 'returns volumes if set' do
@@ -136,7 +142,7 @@ describe Kontena::Cli::Apps::ServiceGenerator do
         result = subject.send(:parse_data, data)
         expect(result['links']).to eq([])
       end
-      
+
       it 'returns parsed links array' do
         data = {
           'image' => 'wordpress:latest',
@@ -382,4 +388,49 @@ describe Kontena::Cli::Apps::ServiceGenerator do
       end
     end
   end
+
+  describe '#read_env_file' do
+    before(:each) do
+      allow(File).to receive(:readlines).with('.env').and_return(env_file)
+    end
+    it 'reads given file' do
+      expect(File).to receive(:readlines).with('.env').and_return(env_file)
+      subject.send(:read_env_file, '.env')
+    end
+
+    it 'returns array' do
+      variables = subject.send(:read_env_file, '.env')
+      expect(variables).to eq([
+        'APIKEY=12345',
+        'MYSQL_ROOT_PASSWORD=secret',
+        'WP_ADMIN_PASSWORD=verysecret'
+        ])
+    end
+
+    it 'discards comment lines' do
+      result = env_file
+      result << "#COMMENTLINE"
+      allow(File).to receive(:readlines).with('.env').and_return(result)
+
+      variables = subject.send(:read_env_file, '.env')
+      expect(variables).to eq([
+        'APIKEY=12345',
+        'MYSQL_ROOT_PASSWORD=secret',
+        'WP_ADMIN_PASSWORD=verysecret'
+        ])
+    end
+
+    it 'discards empty lines' do
+      result = env_file
+      result << '
+'
+      allow(File).to receive(:readlines).with('.env').and_return(result)
+      variables = subject.send(:read_env_file, '.env')
+      expect(variables).to eq([
+        'APIKEY=12345',
+        'MYSQL_ROOT_PASSWORD=secret',
+        'WP_ADMIN_PASSWORD=verysecret'
+        ])
+    end
+  end
 end