kontena-cli 1.1.1 → 1.1.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6375c4de944897ae1d7c56fdb0de7bac7cbbe79a
-  data.tar.gz: d25ef27c6e5cddc843c90cdb9bec53fbfa9354bf
+  metadata.gz: c08178a70fa7abd31742032c4a32bfcd3c448c6e
+  data.tar.gz: d425757f104f91eef926f0cc73a212ad60fb7df1
 SHA512:
-  metadata.gz: 0cacb7083c66545a80ba743d289f47e326f488d382d0243339bcd72a4e12af4abfe0be9d7f3f7870e1bd5748df3e8e6edd0d6d971a70d3af507c3e0a31712f2a
-  data.tar.gz: fbfc01b96161a08c8e98fb2c60b4d4a418cebd2c829b60f20bbd099dd77bdbc0ad11862b6d6ef69ee7aa4eb4219982b2d9fc9bbf451cb189a3178d0d1a850e05
+  metadata.gz: b2d8888c0b79d53b134dd3b9399afbcfac958fc6e2d8ed31ea2846eaeee2f8da905ed9e70afdba11ced3bb961e50c55e586980acfca81d0796e96e0f190d1fe2
+  data.tar.gz: 13356fee387db7005b1588a7c0a277e9f98172fbcc252d38610638a7f493cc291ad8ab3e34bcbea3c834edbf3747da5b0e27439ca4205be49230dcaed3024b41

data/LOGO

@@ -4,5 +4,5 @@
 |   < (_) | | | | ||  __/ | | | (_| |
 |_|\_\___/|_| |_|\__\___|_| |_|\__,_|
 -------------------------------------
-Copyright (c)2016 Kontena, Inc.
+Copyright (c)2017 Kontena, Inc.
 

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2.rc1

data/lib/kontena/cli/services/create_command.rb

@@ -82,26 +82,10 @@ module Kontena::Cli::Services
       data[:log_driver] = log_driver if log_driver
       data[:log_opts] = parse_log_opts(log_opt_list)
       data[:strategy] = deploy_strategy if deploy_strategy
-      data[:deploy_opts] = {}
-      if deploy_min_health
-        data[:deploy_opts][:min_health] = deploy_min_health.to_f
-      end
-      if deploy_wait_for_port
-        data[:deploy_opts][:wait_for_port] = deploy_wait_for_port.to_i
-      end
-      if deploy_interval
-        data[:deploy_opts][:interval] = parse_relative_time(deploy_interval)
-      end
-      if health_check_port
-        data[:health_check] = {
-          protocol: health_check_protocol,
-          uri: health_check_uri,
-          port: health_check_port,
-          timeout: health_check_timeout,
-          interval: health_check_interval,
-          initial_delay: health_check_initial_delay
-        }
-      end
+      deploy_opts = parse_deploy_opts
+      data[:deploy_opts] = deploy_opts unless deploy_opts.empty?
+      health_check = parse_health_check
+      data[:health_check] = health_check unless health_check.empty?
       data[:pid] = pid if pid
       data
     end

data/lib/kontena/cli/services/services_helper.rb

@@ -432,6 +432,35 @@ module Kontena
           build_args
         end
 
+        # @return [Hash]
+        def parse_deploy_opts
+          deploy_opts = {}
+          deploy_opts[:min_health] = deploy_min_health.to_f if deploy_min_health
+          deploy_opts[:wait_for_port] = deploy_wait_for_port.to_i if deploy_wait_for_port
+          if deploy_interval
+            deploy_opts[:interval] = parse_relative_time(deploy_interval)
+          end
+
+          deploy_opts
+        end
+
+        # @return [Hash]
+        def parse_health_check
+          health_check = {}
+          if health_check_port
+            health_check[:port] = health_check_port == 'none' ? nil : health_check_port
+          end
+          if health_check_protocol
+            health_check[:protocol] = health_check_protocol == 'none' ? nil : health_check_protocol
+          end
+          health_check[:uri] = health_check_uri if health_check_uri
+          health_check[:timeout] = health_check_timeout if health_check_timeout
+          health_check[:interval] = health_check_interval if health_check_interval
+          health_check[:initial_delay] = health_check_initial_delay if health_check_initial_delay
+
+          health_check
+        end
+
         # @param [Symbol] health
         # @return [String]
         def health_status_icon(health)

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

@@ -73,23 +73,10 @@ module Kontena::Cli::Services
       data[:net] = net if net
       data[:log_driver] = log_driver if log_driver
       data[:log_opts] = parse_log_opts(log_opt_list) if log_opt_list
-      data[:deploy_opts] = {}
-      data[:deploy_opts][:min_health] = deploy_min_health.to_f if deploy_min_health
-      data[:deploy_opts][:wait_for_port] = deploy_wait_for_port.to_i if deploy_wait_for_port
-      if deploy_interval
-        data[:deploy_opts][:interval] = parse_relative_time(deploy_interval)
-      end
-      if health_check_port
-        data[:health_check] = {
-          protocol: health_check_protocol,
-          uri: health_check_uri,
-          port: health_check_port,
-          timeout: health_check_timeout,
-          interval: health_check_interval,
-          initial_delay: health_check_initial_delay
-        }
-      end
-      data.delete(:deploy_opts) if data[:deploy_opts].empty?
+      deploy_opts = parse_deploy_opts
+      data[:deploy_opts] = deploy_opts unless deploy_opts.empty?
+      health_check = parse_health_check
+      data[:health_check] = health_check unless health_check.empty?
       data[:pid] = pid if pid
       data
     end

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

@@ -71,7 +71,7 @@ module Kontena::Cli::Stacks
         'expose' => outcome[:expose],
         'version' => outcome[:version],
         'source' => reader.raw_content,
-        'registry' => 'file://',
+        'registry' => outcome[:registry],
         'services' => kontena_services,
         'variables' => outcome[:variables]
       }

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

@@ -57,22 +57,12 @@ module Kontena::Cli::Stacks
         deploy['interval'] = parse_relative_time(deploy_opts['interval'])
       else
         deploy['interval'] = nil
-      end      
+      end
       data['deploy_opts'] = deploy
       data['hooks'] = options['hooks'] || {}
       data['secrets'] = options['secrets'] if options['secrets']
       data['build'] = parse_build_options(options) if options['build']
-      health_check = {}
-      health_opts = options['health_check'] || {}
-      health_check['protocol'] = health_opts['protocol'] if health_opts.has_key?('protocol')
-      health_check['uri'] = health_opts['uri'] if health_opts.has_key?('uri')
-      health_check['port'] = health_opts['port'] if health_opts.has_key?('port')
-      health_check['timeout'] = health_opts['timeout'] if health_opts.has_key?('timeout')
-      health_check['interval'] = health_opts['interval'] if health_opts.has_key?('interval')
-      health_check['initial_delay'] = health_opts['initial_delay'] if health_opts.has_key?('initial_delay')
-      unless health_check.empty?
-        data['health_check'] = health_check
-      end
+      data['health_check'] = parse_health_check(options)
       data
     end
 
@@ -113,5 +103,15 @@ module Kontena::Cli::Stacks
       build['dockerfile'] = options['dockerfile'] if options['dockerfile']
       build
     end
+
+    # @param [Hash] options
+    # @return [Hash]
+    def parse_health_check(options)
+      health_check = {}
+      %w(port protocol uri timeout interval initial_delay).each do |k|
+        health_check[k] = options.dig('health_check', k)
+      end
+      health_check
+    end
   end
 end

data/lib/kontena/cli/stacks/yaml/reader.rb

@@ -11,7 +11,7 @@ module Kontena::Cli::Stacks
       include Kontena::Util
       include Kontena::Cli::Common
 
-      attr_reader :file, :raw_content, :errors, :notifications, :defaults, :values
+      attr_reader :file, :raw_content, :errors, :notifications, :defaults, :values, :registry
 
       def initialize(file, skip_validation: false, skip_variables: false, variables: nil, values: nil, defaults: nil)
         require 'yaml'
@@ -25,13 +25,13 @@ module Kontena::Cli::Stacks
         if from_registry?
           require 'shellwords'
           @raw_content = Kontena::StacksCache.pull(file)
-          @registry    = Kontena::StacksCache.registry_url
+          @registry    = current_account.stacks_url
         elsif from_url?
-          require 'open-uri'
-          stream = open(file)
-          @raw_content = stream.read
+          @raw_content = load_from_url(file)
+          @registry = nil
         else
           @raw_content = File.read(File.expand_path(file))
+          @registry = nil
         end
 
         @errors           = []
@@ -43,6 +43,12 @@ module Kontena::Cli::Stacks
         @defaults         = defaults
       end
 
+      def load_from_url(url)
+        require 'open-uri'
+        stream = open(url)
+        stream.read
+      end
+
       def internals_interpolated_yaml
         @internals_interpolated_yaml ||= ::YAML.safe_load(
           replace_dollar_dollars(
@@ -121,7 +127,7 @@ module Kontena::Cli::Stacks
           result[:stack]         = raw_yaml['stack']
           result[:version]       = self.stack_version
           result[:name]          = self.stack_name
-          result[:registry]      = @registry if from_registry?
+          result[:registry]      = registry
           result[:expose]        = fully_interpolated_yaml['expose']
           result[:errors]        = errors unless skip_validation?
           result[:notifications] = notifications

data/lib/kontena/stacks_cache.rb

@@ -2,6 +2,7 @@ require_relative 'stacks_client'
 require_relative 'cli/common'
 require_relative 'cli/stacks/common'
 require 'yaml'
+require 'uri'
 
 module Kontena
   class StacksCache
@@ -94,8 +95,8 @@ module Kontena
         stack
       end
 
-      def registry_url
-        client.api_url
+      def registry_url(stack, version = nil)
+        client.full_uri(stack, version)
       end
 
       def client

data/lib/kontena/stacks_client.rb

@@ -7,6 +7,10 @@ module Kontena
     ACCEPT_YAML = { 'Accept' => 'application/yaml' }
     CT_YAML     = { 'Content-Type' => 'application/yaml' }
 
+    def full_uri(stack_name, version = nil)
+      URI.join(api_url, path_to(stack_name, version)).to_s
+    end
+
     def path_to(stack_name, version = nil)
       version ? "/stack/#{stack_name}/version/#{version}" : "/stack/#{stack_name}"
     end

data/spec/kontena/cli/services/update_command_spec.rb

@@ -52,5 +52,73 @@ describe Kontena::Cli::Services::UpdateCommand do
         '--log-opt', 'gelf-address=udp://log_forwarder-logstash_internal:12201', 'service'
       ])
     end
+
+    context 'health check' do
+      it 'sends --health-check-port' do
+        expect(subject).to receive(:update_service).with(
+          duck_type(:access_token), 'service', hash_including(health_check: {
+            port: '8080'
+          })
+        )
+        subject.run([
+          '--health-check-port', '8080', 'service'
+        ])
+      end
+
+      it 'sends --health-check-port as nil if none given' do
+        expect(subject).to receive(:update_service).with(
+          duck_type(:access_token), 'service', hash_including(health_check: {
+            port: nil
+          })
+        )
+        subject.run([
+          '--health-check-port', 'none', 'service'
+        ])
+      end
+
+      it 'sends --health-check-protocol' do
+        expect(subject).to receive(:update_service).with(
+          duck_type(:access_token), 'service', hash_including(health_check: {
+            protocol: 'tcp'
+          })
+        )
+        subject.run([
+          '--health-check-protocol', 'tcp', 'service'
+        ])
+      end
+
+      it 'sends --health-check-protocol as nil if none given' do
+        expect(subject).to receive(:update_service).with(
+          duck_type(:access_token), 'service', hash_including(health_check: {
+            protocol: nil
+          })
+        )
+        subject.run([
+          '--health-check-protocol', 'none', 'service'
+        ])
+      end
+
+      it 'sends --health-check-timeout' do
+        expect(subject).to receive(:update_service).with(
+          duck_type(:access_token), 'service', hash_including(health_check: {
+            timeout: '30'
+          })
+        )
+        subject.run([
+          '--health-check-timeout', '30', 'service'
+        ])
+      end
+
+      it 'sends --health-check-uri' do
+        expect(subject).to receive(:update_service).with(
+          duck_type(:access_token), 'service', hash_including(health_check: {
+            uri: '/health'
+          })
+        )
+        subject.run([
+          '--health-check-uri', '/health', 'service'
+        ])
+      end
+    end
   end
 end

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

@@ -385,5 +385,54 @@ describe Kontena::Cli::Stacks::ServiceGenerator do
         expect(result['secrets']).to be_nil
       end
     end
+
+    context 'health_check' do
+      it 'returns health_check with nils by default' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        health_check = result['health_check']
+        expect(health_check['port']).to be_nil
+        expect(health_check['protocol']).to be_nil
+      end
+
+      it 'returns health_check with port & protocol' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'health_check' => {
+            'port' => 8080,
+            'protocol' => 'tcp'
+          }
+        }
+        result = subject.send(:parse_data, data)
+        health_check = result['health_check']
+        expect(health_check['port']).to eq(8080)
+        expect(health_check['protocol']).to eq('tcp')
+        expect(health_check['uri']).to be_nil
+      end
+
+      it 'returns health_check with all values' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'health_check' => {
+            'port' => 8080,
+            'protocol' => 'http',
+            'uri' => '/health',
+            'interval' => 60,
+            'timeout' => 5,
+            'initial_delay' => 30
+          }
+        }
+        result = subject.send(:parse_data, data)
+        health_check = result['health_check']
+        expect(health_check['port']).to eq(8080)
+        expect(health_check['protocol']).to eq('http')
+        expect(health_check['uri']).to eq('/health')
+        expect(health_check['interval']).to eq(60)
+        expect(health_check['timeout']).to eq(5)
+        expect(health_check['initial_delay']).to eq(30)
+      end
+    end
   end
 end

data/spec/kontena/cli/stacks/yaml/reader_spec.rb

@@ -398,19 +398,25 @@ describe Kontena::Cli::Stacks::YAML::Reader do
         .with(absolute_yaml_path('kontena_v3.yml'))
         .and_return(fixture('stack-with-liquid.yml'))
       expect(subject.from_file?).to be_truthy
+      expect(subject.execute[:registry]).to be_nil
     end
 
     it 'can read from the registry' do
-      expect(Kontena::StacksCache).to receive(:pull)
-        .with('foo/foo')
-        .and_return(fixture('stack-with-liquid.yml'))
-      expect(Kontena::StacksCache).to receive(:registry_url).and_return('foo')
-      expect(described_class.new('foo/foo').from_registry?).to be_truthy
+      stack_double = double
+      allow_any_instance_of(Kontena::StacksCache::RegistryClientFactory).to receive(:cloud_auth?).and_return(true)
+      expect(Kontena::StacksCache).to receive(:cache).with('foo/foo', nil).and_return(stack_double)
+      expect(stack_double).to receive(:read).and_return(fixture('kontena_v3.yml'))
+      instance = described_class.new('foo/foo')
+      expect(instance.from_registry?).to be_truthy
+      expect(instance.execute[:registry]).to eq instance.current_account.stacks_url
     end
 
     it 'can read from an url' do
-     stub_request(:get, "http://foo.example.com/foo").to_return(:status => 200, :body => fixture('stack-with-liquid.yml'), :headers => {})
-      expect(described_class.new('http://foo.example.com/foo').from_url?).to be_truthy
+      stub_request(:get, "http://foo.example.com/foo").to_return(:status => 200, :body => fixture('stack-with-liquid.yml'), :headers => {})
+      allow_any_instance_of(described_class).to receive(:load_from_url).and_return(fixture('stack-with-liquid.yml'))
+      instance = described_class.new('http://foo.example.com/foo')
+      expect(instance.from_url?).to be_truthy
+      expect(instance.execute[:registry]).to be_nil
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -621,9 +621,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8