kontena-cli 1.4.0.pre7 → 1.4.0.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd17b046ef3c5df923edb5330692544a30c68f31
-  data.tar.gz: 86ab9db88b8bffe961692ad0c7716aacc450e556
+  metadata.gz: e5fbe13d6c43974ce734828c192b42c582b56a04
+  data.tar.gz: a2de0cbe2555ea75327028a9f1f6417f839a876f
 SHA512:
-  metadata.gz: 9ce3ee493ee6919a392b71e4218bc301849caf3d8a0f25a4aa831c81aaeab1a6e57e3d88927cee4e0c9a50bac10ec195476eb5d6b88cb934234d6fc1c09119e2
-  data.tar.gz: 1a257b2cb1d8f72f4c9d69dd4ca1b5530fd1ecf51dac56a7e3b787b3d579e574ba85e625e7e0350d9512d34875778aa02961e0b45623efc2b4bbc8b57b7f5556
+  metadata.gz: 9ed72921adf1a691ed03ea9ec1223800191136b686d89c0e1ca2af21306755e83cb9844c69db3831da566a1592d700d12c2126a99ae9f620c1817d0bf3ce6441
+  data.tar.gz: f1fd2b0a344552704f2e3c1de967daed63e9cf66532791af1040aea5f19262b7b123b2ee1f19d1799525cb02556784192fa9329b2e68a00636cfebc01c31463d

data/VERSION

@@ -1 +1 @@
-1.4.0.pre7
+1.4.0.pre8

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

@@ -7,6 +7,7 @@ module Kontena::Cli::Services
     include ServicesHelper
 
     parameter "NAME", "Service name"
+    option '--[no-]wait', :flag, 'Do not wait for service deployment', default: true
     option '--force', :flag, 'Force deploy even if service does not have any changes'
 
     def execute
@@ -17,7 +18,7 @@ module Kontena::Cli::Services
       data[:force] = true if force?
       spinner "Deploying service #{name.colorize(:cyan)} " do
         deployment = deploy_service(token, name, data)
-        wait_for_deploy_to_finish(token, deployment)
+        wait_for_deploy_to_finish(token, deployment) if wait?
       end
     end
   end

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

@@ -433,7 +433,8 @@ module Kontena
 
         # @param [String] image
         # @return [String]
-        def parse_image(image)
+        def parse_image(image = nil)
+          return if image.nil?
           unless image.include?(":")
             image = "#{image}:latest"
           end

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

@@ -94,9 +94,17 @@ module Kontena::Cli::Stacks
       def self.included(where)
         where.prepend InstanceMethods
 
-        where.option '--values-from', '[FILE]', 'Read variable values from YAML' do |filename|
+        where.option '--values-from', '[FILE]', 'Read variable values from a YAML file', multivalued: true do |filename|
           values_from_file.merge!(::YAML.safe_load(File.read(filename)))
-          true
+          filename
+        end
+
+        where.option '--values-from-stack', '[STACK_NAME]', 'Read variable values from an installed stack', multivalued: true do |stackname|
+          variables = read_values_from_stacks(stackname)
+          Kontena.logger.debug { "Received variables from stack #{stackname} on Master: #{variables.inspect}" }
+          warn "Stack #{stackname} does not have any values for variables" if variables.empty?
+          values_from_installed_stacks.merge!(variables)
+          stackname
         end
 
         where.option '-v', "VARIABLE=VALUE", "Set stack variable values, example: -v domain=example.com. Can be used multiple times.", multivalued: true, attribute_name: :var_option do |var_pair|
@@ -106,6 +114,27 @@ module Kontena::Cli::Stacks
       end
 
       module InstanceMethods
+        def read_values_from_stacks(stackname)
+          result = {}
+          response = client.get("stacks/#{current_grid}/#{stackname}")
+          result.merge!(response['variables']) if response['variables']
+          if response['children']
+            response['children'].each do |child_info|
+              result.merge!(
+                read_values_from_stacks(child_info['name']).tap do |child_result|
+                  child_result.keys.each do |key|
+                    new_key = child_info['name'].dup # foofoo-redis-monitor
+                    new_key.sub!("#{stackname}-", '') # monitor
+                    new_key.concat ".#{key}" # monitor.foovariable
+                    child_result[new_key] = child_result.delete(key)
+                  end
+                end
+              )
+            end
+          end
+          result
+        end
+
         def values_from_file
           @values_from_file ||= {}
         end
@@ -114,8 +143,12 @@ module Kontena::Cli::Stacks
           @values_from_value_options ||= {}
         end
 
+        def values_from_installed_stacks
+          @values_from_installed_stacks ||= {}
+        end
+
         def values_from_options
-          @values_from_options ||= values_from_file.merge(values_from_value_options)
+          @values_from_options ||= values_from_installed_stacks.merge(values_from_file).merge(values_from_value_options)
         end
 
         # Transforms a hash

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

@@ -10,7 +10,7 @@ module Kontena::Cli::Stacks
 
     parameter "NAME", "Stack name"
 
-    option '--[no-]wait', :flag, 'Do not wait service deployment', default: true
+    option '--[no-]wait', :flag, 'Do not wait for service deployment', default: true
 
     requires_current_master
     requires_current_master_token

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

@@ -28,6 +28,8 @@ module Kontena::Cli::Stacks
 
       install_dependencies unless skip_dependencies?
 
+      stack # runs validations
+
       hint_on_validation_notifications(reader.notifications)
       abort_on_validation_errors(reader.errors)
 

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

@@ -139,9 +139,11 @@ module Kontena::Cli::Stacks
         else
           cmd = ['stack', 'install', '--name', stackname]
           cmd.concat ['--parent-name', stack['parent_name']] if stack['parent_name']
+
           stack['variables'].merge(dependency_values_from_options(stackname)).each do |k, v|
             cmd.concat ['-v', "#{k}=#{v}"]
           end
+
           cmd << '--no-deploy'
           cmd << data[:local][:loader].source
           caret "Installing new dependency #{cmd.last} as #{stackname}"

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

@@ -51,6 +51,8 @@ module Kontena::Cli::Stacks
 
       validate_dependencies if dependencies?
 
+      stack # runs validations
+
       hint_on_validation_notifications(reader.notifications, dependencies? ? loader.source : nil)
       abort_on_validation_errors(reader.errors, dependencies? ? loader.source : nil)
 

data/lib/kontena/cli/stacks/yaml/custom_validators/hooks_validator.rb

@@ -11,7 +11,7 @@ module Kontena::Cli::Stacks::YAML::Validations::CustomValidators
       end
 
       value.keys.each do |hook|
-        unless %w(pre_build post_start).include?(hook)
+        unless %w(pre_build pre_start post_start pre_stop).include?(hook)
           errors[key] = "invalid hook #{hook}"
         end
       end
@@ -20,9 +20,17 @@ module Kontena::Cli::Stacks::YAML::Validations::CustomValidators
         validate_pre_build_hooks(key, value['pre_build'], errors)
       end
 
+      if value['pre_start']
+        validate_pre_start_hooks(key, value['pre_start'], errors)
+      end
+
       if value['post_start']
         validate_post_start_hooks(key, value['post_start'], errors)
       end
+
+      if value['pre_stop']
+        validate_pre_stop_hooks(key, value['pre_stop'], errors)
+      end
     end
 
     def validate_pre_build_hooks(key, pre_build_hooks, errors)
@@ -40,6 +48,23 @@ module Kontena::Cli::Stacks::YAML::Validations::CustomValidators
       end
     end
 
+    def validate_pre_start_hooks(key, pre_start_hooks, errors)
+      unless pre_start_hooks.is_a?(Array)
+        errors[key] = { 'pre_start' => 'must be an array' }
+        return
+      end
+      pre_start_validation = {
+        'name' => 'string',
+        'instances' => (-> (value) { value.is_a?(Integer) || value == '*' }),
+        'cmd' => 'string',
+        'oneshot' => HashValidator.optional('boolean')
+      }
+      validator = HashValidator.validator_for(pre_start_validation)
+      pre_start_hooks.each do |pre_start|
+        validator.validate('hooks.pre_start', pre_start, pre_start_validation, errors)
+      end
+    end
+
     def validate_post_start_hooks(key, post_start_hooks, errors)
       unless post_start_hooks.is_a?(Array)
         errors[key] = { 'post_start' => 'must be an array' }
@@ -56,5 +81,22 @@ module Kontena::Cli::Stacks::YAML::Validations::CustomValidators
         validator.validate('hooks.post_start', post_start, post_start_validation, errors)
       end
     end
+
+    def validate_pre_stop_hooks(key, pre_stop_hooks, errors)
+      unless pre_stop_hooks.is_a?(Array)
+        errors[key] = { 'pre_stop' => 'must be an array' }
+        return
+      end
+      pre_stop_validation = {
+        'name' => 'string',
+        'instances' => (-> (value) { value.is_a?(Integer) || value == '*' }),
+        'cmd' => 'string',
+        'oneshot' => HashValidator.optional('boolean')
+      }
+      validator = HashValidator.validator_for(pre_stop_validation)
+      pre_stop_hooks.each do |pre_stop|
+        validator.validate('hooks.pre_stop', pre_stop, pre_stop_validation, errors)
+      end
+    end
   end
 end

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

@@ -201,21 +201,26 @@ module Kontena::Cli::Stacks
 
         validate unless skip_validation
 
-        {}.tap do |result|
-          Dir.chdir(from_file? ? File.dirname(File.expand_path(file)) : Dir.pwd) do
-            result['stack']         = raw_yaml['stack']
-            result['version']       = loader.stack_name.version || '0.0.1'
-            result['name']          = name
-            result['registry']      = loader.registry
-            result['expose']        = fully_interpolated_yaml['expose']
-            result['services']      = errors.empty? ? parse_services(service_name) : {}
-            result['volumes']       = errors.empty? ? parse_volumes : {}
-            result['dependencies']  = dependencies
-            result['source']        = raw_content
-            result['variables']     = variable_values(without_defaults: true, without_vault: true)
-            result['parent_name']   = parent_name
+        result = {}
+        Dir.chdir(from_file? ? File.dirname(File.expand_path(file)) : Dir.pwd) do
+          result['stack']         = raw_yaml['stack']
+          result['version']       = loader.stack_name.version || '0.0.1'
+          result['name']          = name
+          result['registry']      = loader.registry
+          result['expose']        = fully_interpolated_yaml['expose']
+          result['services']      = errors.empty? ? parse_services(service_name) : {}
+          result['volumes']       = errors.empty? ? parse_volumes : {}
+          result['dependencies']  = dependencies
+          result['source']        = raw_content
+          result['variables']     = variable_values(without_defaults: true, without_vault: true)
+          result['parent_name']   = parent_name
+        end
+        if service_name.nil?
+          result['services'].each do |service|
+            errors << { 'services' => { service['name'] => { 'image' => "image is missing" } } } if service['image'].to_s.empty?
           end
         end
+        result
       end
 
       # Returns an array of hashes containing the dependency tree starting from this file
@@ -317,7 +322,6 @@ module Kontena::Cli::Stacks
           service_config.delete('extends')
         end
         if name
-          exit_with_error("Image is missing for #{name}. Aborting.") unless service_config['image'] # why isn't this a validation?
           ServiceGeneratorV2.new(service_config).generate.merge('name' => name)
         else
           ServiceGeneratorV2.new(service_config).generate
@@ -345,10 +349,10 @@ module Kontena::Cli::Stacks
       end
 
       def from_external_file(filename, service_name)
-        external_reader = Reader.new(filename)
+        external_reader = FileLoader.new(filename, loader).reader
         outcome = external_reader.execute(service_name)
-        errors.concat external_reader.errors unless errors.any? { |item| item.key?(filename) }
-        notifications.concat external_reader.notifications unless notifications.any? { |item| item.key?(filename) }
+        errors.concat external_reader.errors unless external_reader.errors.empty? || errors.include?(external_reader.errors)
+        notifications.concat external_reader.notifications unless external_reader.notifications.empty? || notifications.include?(external_reader.notifications)
         outcome['services']
       end
 
@@ -445,13 +449,12 @@ module Kontena::Cli::Stacks
       end
 
       def store_failures(data)
-        data['errors'] = data[:errors] unless data['errors']
-        data['notifications'] = data[:notifications] unless data['notifications']
-        errors << { file => data['errors'] || data[:errors] } unless data['errors'].empty?
-        notifications << { file => data['notifications'] } unless data['notifications'].empty?
+        data['errors'] ||= data[:errors] || []
+        data['notifications'] ||= data[:notifications] || []
+        errors << { File.basename(file) => data['errors'] } unless data['errors'].empty?
+        notifications << { File.basename(file) => data['notifications'] } unless data['notifications'].empty?
       end
 
-
       # @param [Hash] options - service config
       def normalize_env_vars(options)
         if options['environment'].kind_of?(Hash)

data/lib/kontena/cli/stacks/yaml/stack_file_loader/file_loader.rb

@@ -21,7 +21,7 @@ module Kontena::Cli::Stacks
 
       def initialize(*args)
         super
-        @source = self.class.with_context(@source, parent)
+        @source = self.class.with_context(@source, @parent)
       end
 
       def read_content

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

@@ -3,6 +3,10 @@ require "kontena/cli/stacks/yaml/reader"
 
 describe Kontena::Cli::Stacks::Common do
   include FixturesHelpers
+  include RequirementsHelper
+  include ClientHelpers
+
+  mock_current_master
 
   let(:klass) do
     Class.new(Kontena::Command) do
@@ -12,10 +16,6 @@ describe Kontena::Cli::Stacks::Common do
       include Kontena::Cli::Stacks::Common::StackNameOption
       include Kontena::Cli::Stacks::Common::StackValuesToOption
       include Kontena::Cli::Stacks::Common::StackValuesFromOption
-
-      def what
-        [source]
-      end
     end
   end
 
@@ -57,7 +57,7 @@ describe Kontena::Cli::Stacks::Common do
       expect(subject.instance(['-v', 'foo=bar', '-v', 'bar=baz', fixture_path('kontena_v3.yml')]).values_from_options).to match hash_including('foo' => 'bar', 'bar' => 'baz')
     end
 
-    context '--values-from' do
+    describe '--values-from' do
       before do
         allow(File).to receive(:exist?).with('vars.yml').and_return(true)
         expect(File).to receive(:read).with('vars.yml').and_return(::YAML.dump('baz' => 'bag', 'bar' => 'boo'))
@@ -71,5 +71,29 @@ describe Kontena::Cli::Stacks::Common do
         expect(subject.instance(['-v', 'foo=bar', '-v', 'bar=baz', '--values-from', 'vars.yml', fixture_path('kontena_v3.yml')]).values_from_options).to match hash_including('foo' => 'bar', 'bar' => 'baz', 'baz' => 'bag')
       end
     end
+
+    describe '--values-from-stack' do
+      let(:instance) { subject.instance(['--values-from-stack', 'redisproxy', fixture_path('kontena_v3.yml')]) }
+
+      it 'reads all dependent stack variables' do
+        expect(client).to receive(:get).with('stacks/test-grid/redisproxy').and_return(
+          'variables' => { 'foo' => 'bar' },
+          'children' => [ { 'name' => 'redisproxy-redis1' } ]
+        )
+
+        expect(client).to receive(:get).with('stacks/test-grid/redisproxy-redis1').and_return(
+          'variables' => { 'redisvar' => 'test' },
+          'children' => [ { 'name' => 'redisproxy-redis1-monitor' } ]
+        )
+
+        expect(client).to receive(:get).with('stacks/test-grid/redisproxy-redis1-monitor').and_return(
+          'variables' => { 'monitorvar' => 'test2' },
+          'children' => []
+        )
+
+        expect(instance.values_from_options).to match hash_including('foo' => 'bar', 'redis1.redisvar' => 'test', 'redis1.monitor.monitorvar' => 'test2')
+      end
+
+    end
   end
 end

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

@@ -65,7 +65,7 @@ describe Kontena::Cli::Stacks::InstallCommand do
     context '--[no-]deploy' do
       it 'runs deploy for the stack after install by default' do
         expect(client).to receive(:post).with(
-           'grids/test-grid/stacks', hash_including(stack_expectation)
+          'grids/test-grid/stacks', hash_including(stack_expectation)
         )
         expect(Kontena).to receive(:run!).with(['stack', 'deploy', 'stackname']).and_return(true)
         subject.run([fixture_path('kontena_v3.yml')])
@@ -82,4 +82,102 @@ describe Kontena::Cli::Stacks::InstallCommand do
       end
     end
   end
+
+  context 'variable value input' do
+    let(:expectation) do
+      {
+        'services' => array_including(
+          hash_including(
+            'name' => 'mysql',
+            'image' => 'mysqlimage:latest',
+            'env' => array_including(
+              'TEST_VAR=abc'
+            )
+          ),
+          hash_including(
+            'name' => 'wordpress',
+            'image' => 'wordpress:def'
+          )
+        )
+      }
+    end
+
+    describe '--values-from' do
+      it 'sends stack to master, loading values from a file' do
+        allow(File).to receive(:exist?).with('values.yml').and_return(true)
+        expect(File).to receive(:read).with('values.yml').and_return(
+          YAML.dump('TEST_ENV_VAR' => 'abc', 'MYSQL_IMAGE' => 'mysqlimage', 'tag' => 'def')
+        )
+        expect(client).to receive(:post) do |path, data|
+          expect(path).to eq 'grids/test-grid/stacks'
+          expect(data).to match hash_including(expectation)
+        end.and_return({})
+        subject.run(['--no-deploy', '--values-from', 'values.yml', fixture_path('stack-with-variables.yml')])
+      end
+    end
+
+    describe '--values-from-stack' do
+      it 'sends stack to master, loading values from another stack on master' do
+        expect(client).to receive(:get).with('stacks/test-grid/otherdep').and_return(
+          'variables' => { 'foo' => 'bar' },
+          'children' => [
+            { 'name' => 'otherdep-dep_1' } ,
+            { 'name' => 'otherdep-dep_2' }
+          ]
+        )
+
+        expect(client).to receive(:get).with('stacks/test-grid/otherdep-dep_1').and_return(
+          'variables' => { 'dep1var' => 'test' },
+          'children' => [
+            { 'name' => 'otherdep-dep_1-dep_1' }
+          ]
+        )
+
+        expect(client).to receive(:get).with('stacks/test-grid/otherdep-dep_1-dep_1').and_return(
+          'variables' => { 'dep1dep1var' => 'test11' },
+          'children' => []
+        )
+
+        expect(client).to receive(:get).with('stacks/test-grid/otherdep-dep_2').and_return(
+          'variables' => { 'dep2var' => 'test2' },
+          'children' => [ ]
+        )
+
+        expect(Kontena).to receive(:run!).with(["stack", "install", "-n", "deptest-dep_1", "--parent-name", "deptest", '-v', 'dep1var=test', '-v', 'dep_1.dep1dep1var=test11', '--no-deploy', fixture_path('stack-with-dependencies-dep-1.yml')]).and_return(true)
+        expect(Kontena).to receive(:run!).with(["stack", "install", "-n", "deptest-dep_2", "--parent-name", "deptest", '-v', 'dep_var=1', '-v', 'dep2var=test2', '--no-deploy', fixture_path('stack-with-dependencies-dep-2.yml')]).and_return(true)
+
+        allow(client).to receive(:post).and_return({})
+
+        subject.run(['--values-from-stack', 'otherdep', '-n', 'deptest', '--no-deploy', fixture_path('stack-with-dependencies.yml')])
+      end
+    end
+
+    describe '-v' do
+      it 'sends stack to master, loading values from command line' do
+        expect(client).to receive(:post) do |path, data|
+          expect(path).to eq 'grids/test-grid/stacks'
+          expect(data).to match hash_including(expectation)
+        end.and_return({})
+        YAML.dump('TEST_ENV_VAR' => 'abc', 'MYSQL_IMAGE' => 'mysqlimage', 'tag' => 'def')
+        subject.run(['--no-deploy', '-v', 'TEST_ENV_VAR=abc', '-v', 'MYSQL_IMAGE=mysqlimage', '-v', 'tag=def', fixture_path('stack-with-variables.yml')])
+      end
+    end
+
+    describe 'combination of value inputs' do
+      it 'can combine multiple inputs' do
+        allow(File).to receive(:exist?).with('values.yml').and_return(true)
+        expect(File).to receive(:read).with('values.yml').and_return(
+          YAML.dump('TEST_ENV_VAR' => 'abc')
+        )
+        allow(client).to receive(:get).with('stacks/test-grid/foostack').and_return(
+          'variables' => { 'MYSQL_IMAGE' => 'mysqlimage' }
+        )
+        expect(client).to receive(:post) do |path, data|
+          expect(path).to eq 'grids/test-grid/stacks'
+          expect(data).to match hash_including(expectation)
+        end.and_return({})
+        subject.run(['--no-deploy', '--values-from-stack', 'foostack', '--values-from', 'values.yml', '-v', 'tag=def', fixture_path('stack-with-variables.yml')])
+      end
+    end
+  end
 end

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

@@ -120,17 +120,15 @@ describe Kontena::Cli::Stacks::YAML::Reader do
         it 'merges validation errors' do
           expect(File).to receive(:read).with(fixture_path('docker-compose_v2.yml')).and_return(fixture('docker-compose-invalid.yml'))
           outcome = subject.execute
-          expect(outcome['errors']).to eq([{
-            'docker-compose_v2.yml' =>[
-              {
-                'services' => {
-                  'wordpress' => {
-                    'networks' => 'key not expected'
-                  }
-                }
-              }
-            ]
-          }])
+          expect(subject.errors).to match array_including(
+            hash_including(
+              'docker-compose_v2.yml' => array_including(
+                hash_including(
+                  'services' => { 'wordpress' => { 'networks' => 'key not expected' } }
+                )
+              )
+            )
+          )
         end
       end
 
@@ -324,7 +322,12 @@ describe Kontena::Cli::Stacks::YAML::Reader do
 
     it 'expands build option to absolute path' do
       outcome = subject.execute
-      expect(outcome['services']['webapp']['build']['context']).to eq(fixture_path(''))
+      expect(outcome['services']).to match array_including(
+        hash_including(
+          'name' => 'webapp',
+          'build' => hash_including('context' => fixture_path(''))
+        )
+      )
     end
   end
 
@@ -335,7 +338,12 @@ describe Kontena::Cli::Stacks::YAML::Reader do
 
     it 'expands build context to absolute path' do
       outcome = subject.execute
-      expect(outcome['services']['webapp']['build']['context']).to eq(fixture_path(''))
+      expect(outcome['services']).to match array_including(
+        hash_including(
+          'name' => 'webapp',
+          'build' => hash_including('context' => fixture_path(''))
+        )
+      )
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre7
+  version: 1.4.0.pre8
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler