kontena-cli 1.0.2 → 1.0.3.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e12d72f9f29547dfcfa19d475d01f78b2e9398f
-  data.tar.gz: c705ed180718c7bf37ceb1f6b42d71a422ebea0d
+  metadata.gz: 1fea7cc00f263ca36c6b676cb044a5a3648dc0b8
+  data.tar.gz: d7aae3f41c4f9dab103e01114bfff4401088292f
 SHA512:
-  metadata.gz: 26378859f0abaa499a9e958743c1d26cd08adb0ab8e9d2cf145d254b9e7283d4f99861dbab39204fcdfc2fc405f0a611ec5d40013af62019c8a84ff1450064fb
-  data.tar.gz: c63b8f577000b8b29234e1c402d590ffba2d985afc2931d52e4dd5c5f89488ae3254efee3a84e379deae209e447d151b8df035f8ee25d658ffaddcd7127a1678
+  metadata.gz: 92c78f93962b972872fc150b600cccc704711e97956e63d4f2dc9a74784c1b0ee007b26902f0df27dd26bfebcd5a93ede3ae0a5535f3fad9d156dfcc8898a060
+  data.tar.gz: 5a562d665b421e8c78af8c73e8ad7a9c4cad963ef3804f815f170e31f5dcb6b0be9dd648cdea90769fd86932c27e72d0548815d7d2aab887d64c2a455aba0784

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3.rc1

data/kontena-cli.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "retriable", "~> 2.1.0"
   spec.add_runtime_dependency "opto", "~> 1.5.3"
   spec.add_runtime_dependency "semantic", "~> 1.5"
+  spec.add_runtime_dependency "safe_yaml", "~> 1.0"
 end

data/lib/kontena/cli/apps/init_command.rb

@@ -25,12 +25,12 @@ module Kontena::Cli::Apps
       end
 
       if File.exist?('Procfile')
-        procfile = ::YAML.load(File.read('Procfile'))
+        procfile = ::YAML.safe_load(File.read('Procfile'))
       else
         procfile = {}
       end
 
-      app_env = create_env_file(app_json['env']) if app_json['env'] 
+      app_env = create_env_file(app_json['env']) if app_json['env']
       addons = app_json['addons'] || []
 
       if File.exist?(docker_compose_file)

data/lib/kontena/cli/apps/kontena_yml_generator.rb

@@ -45,7 +45,7 @@ module Kontena::Cli::Apps
     end
 
     def yml_services(file)
-      yml = ::YAML.load(file)
+      yml = ::YAML.safe_load(file)
       if yml['version'] == '2'
         yml['services']
       else

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

@@ -29,7 +29,7 @@ module Kontena::Cli::Apps
           result[:name] = yaml['name']
           result[:errors] = errors
           result[:notifications] = notifications
-          result[:services] = parse_services(service_name) unless errors.count > 0
+          result[:services] = errors.count == 0 ? parse_services(service_name) : {}
         end
         result
       end
@@ -52,7 +52,7 @@ module Kontena::Cli::Apps
         interpolate(content)
         replace_dollar_dollars(content)
         begin
-          @yaml = ::YAML.load(content)
+          @yaml = ::YAML.safe_load(content)
         rescue Psych::SyntaxError => e
           raise "Error while parsing #{file}".colorize(:red)+ " "+e.message
         end

data/lib/kontena/cli/master/config/import_command.rb

@@ -41,7 +41,7 @@ module Kontena::Cli::Master::Config
         JSON.parse(data)
       when 'yaml', 'yml'
         require 'yaml'
-        YAML.load(data)
+        YAML.safe_load(data)
       else
         exit_with_error "Unknown input format '#{self.format}'"
       end

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

@@ -15,7 +15,7 @@ module Kontena::Cli::Services
       require_api_url
 
       query_params = {}
-      query_params[:container] = "#{name}-#{instance}" if instance
+      query_params[:container] = parse_container_name(name, instance) if instance
 
       show_logs("services/#{parse_service_id(name)}/container_logs", query_params) do |log|
         show_log(log)

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

@@ -283,6 +283,17 @@ module Kontena
           end
         end
 
+        # Parses container name based on service name and instance number
+        # @param [String] service_name
+        # @param [Integer] instance_number
+        def parse_container_name(service_name, instance_number)
+          base = service_name.gsub('/', '-')
+          unless service_name.include?('/')
+            base = "null-#{base}"
+          end
+          "#{base}-#{instance_number}"
+        end
+
         # @param [Array<String>] port_options
         # @return [Array<Hash>]
         def parse_ports(port_options)

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

@@ -15,12 +15,14 @@ module Kontena::Cli::Stacks
 
     def execute
       require_config_file(filename)
-      services = Kontena::Cli::Stacks::YAML::Reader.new(filename).execute[:services]
+      stack = stack_from_yaml(filename)
+      services = stack['services']
+
       unless service_list.empty?
-        services.select! { |name, _| service_list.include?(name) }
+        services.select! { |service| service_list.include?(service['name']) }
       end
 
-      if services.none?{ |name, service| service['build'] }
+      if services.none?{ |service| service['build'] }
         abort 'Not found any service with a build option'.colorize(:red)
       end
       build_docker_images(services, no_cache?, no_pull?)
@@ -31,7 +33,7 @@ module Kontena::Cli::Stacks
     # @param [Boolean] no_cache
     # @param [Boolean] no_pull
     def build_docker_images(services, no_cache = false, no_pull = false)
-      services.each do |name, service|
+      services.each do |service|
         if service['build']
           dockerfile = service['build']['dockerfile'] || 'Dockerfile'
           abort("'#{service['image']}' is not valid Docker image name") unless validate_image_name(service['image'])
@@ -48,7 +50,7 @@ module Kontena::Cli::Stacks
 
     # @param [Hash] services
     def push_docker_images(services)
-      services.each do |name, service|
+      services.each do |service|
         if service['build']
           puts "Pushing image #{service['image'].colorize(:cyan)}"
           push_docker_image(service['image'])

data/lib/kontena/cli/stacks/registry/show_command.rb

@@ -15,7 +15,7 @@ module Kontena::Cli::Stacks::Registry
     def execute
       require 'semantic'
       unless versions?
-        stack = ::YAML.load(stacks_client.show(stack_name, stack_version))
+        stack = ::YAML.safe_load(stacks_client.show(stack_name, stack_version))
         puts "#{stack['stack']}:"
         puts "  #{"latest_" unless stack_version}version: #{stack['version']}"
         puts "  expose: #{stack['expose'] || '-'}"

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

@@ -44,7 +44,7 @@ module Kontena::Cli::Stacks
         return @variables if @variables
         if yaml && yaml.has_key?('variables')
           variables_yaml = yaml['variables'].to_yaml
-          variables_hash = ::YAML.load(replace_dollar_dollars(interpolate(variables_yaml, use_opto: false)))
+          variables_hash = ::YAML.safe_load(replace_dollar_dollars(interpolate(variables_yaml, use_opto: false)))
           @variables = Opto::Group.new(variables_hash, defaults: { from: :env, to: :env })
         else
           @variables = Opto::Group.new(defaults: { from: :env, to: :env })
@@ -75,14 +75,14 @@ module Kontena::Cli::Stacks
           result[:expose]        = yaml['expose']
           result[:errors]        = errors unless skip_validation?
           result[:notifications] = notifications
-          result[:services]      = parse_services(service_name) unless errors.count > 0
+          result[:services]      = errors.count == 0 ? parse_services(service_name) : {}
           result[:variables]     = variables.to_h(values_only: true).reject { |k,_| variables.option(k).to.has_key?(:vault) } unless skip_variables?
         end
         result
       end
 
       def stack_name
-        yaml = ::YAML.load(raw_content)
+        yaml = ::YAML.safe_load(raw_content)
         yaml['stack'].split('/').last.split(':').first if yaml['stack']
       end
 
@@ -101,9 +101,9 @@ module Kontena::Cli::Stacks
 
       def load_yaml(interpolate = true)
         if interpolate
-          @yaml = ::YAML.load(replace_dollar_dollars(interpolate(raw_content)))
+          @yaml = ::YAML.safe_load(replace_dollar_dollars(interpolate(raw_content)))
         else
-          @yaml = ::YAML.load(raw_content)
+          @yaml = ::YAML.safe_load(raw_content)
         end
       rescue Psych::SyntaxError => e
         raise "Error while parsing #{file}".colorize(:red)+ " "+e.message

data/lib/kontena/scripts/completer

@@ -72,7 +72,7 @@ class Helper
 
   def yml_services
     if File.exist?('kontena.yml')
-      yaml = YAML.load(File.read('kontena.yml'))
+      yaml = YAML.safe_load(File.read('kontena.yml'))
       services = yaml['services']
       services.keys
     end

data/lib/kontena/stacks_cache.rb

@@ -23,7 +23,7 @@ module Kontena
       end
 
       def load
-        YAML.load(read)
+        YAML.safe_load(read)
       end
 
       def write(content)
@@ -78,7 +78,7 @@ module Kontena
         else
           dputs "Retrieving #{stack.stack}:#{stack.version} from registry"
           content = client.pull(stack.stack, stack.version)
-          yaml    = ::YAML.load(content)
+          yaml    = ::YAML.safe_load(content)
           new_stack = CachedStack.new(yaml['stack'], yaml['version'])
           if new_stack.cached?
             dputs "Already cached"

data/lib/kontena_cli.rb

@@ -1,10 +1,10 @@
 module Kontena
   # Run a kontena command like it was launched from the command line.
-  # 
+  #
   # @example
   #   Kontena.run("grid list --help")
   #
-  # @param [String] command_line 
+  # @param [String] command_line
   # @return [Fixnum] exit_code
   def self.run(cmdline = "", returning: :status)
     ENV["DEBUG"] && puts("Running Kontena.run(#{cmdline.inspect}, returning: #{returning}")
@@ -19,7 +19,7 @@ module Kontena
     ENV["DEBUG"] && puts("Command raised #{$!} with message: #{$!.message}\n  #{$!.backtrace.join("  \n")}")
     returning == :status ? 1 : nil
   end
-    
+
 
   def self.version
     "kontena-cli/#{Kontena::Cli::VERSION}"
@@ -61,6 +61,8 @@ end
 
 require 'ruby_dig'
 require 'shellwords'
+require "safe_yaml"
+SafeYAML::OPTIONS[:default_mode] = :safe
 require_relative 'kontena/cli/version'
 require_relative 'kontena/cli/common'
 require_relative 'kontena/command'

data/spec/fixtures/docker-compose-invalid.yml

@@ -0,0 +1,12 @@
+version: '2'
+services:
+  wordpress:
+    image: wordpress:4.1
+    ports:
+      - 80:80
+    depends_on:
+      - mysql
+    networks:
+      - front
+  mysql:
+    image: mysql:5.6

data/spec/fixtures/stack-with-variables.yml

@@ -6,7 +6,7 @@ variables:
     required: true
     min_length: 10
     empty_is_nil: true
-    from: 
+    from:
       env: WORDPRESS_DB_PASSWORD # first try from local env
       random_string: # if prompt returned nil, generate a random string
         length: 10
@@ -19,10 +19,10 @@ variables:
       random_string:
         length: 16
         charset: hex
-    to: 
+    to:
       env: test_var
   TEST_ENV_VAR:      # the default from/to is to set/read env of the option name
-    type: :string
+    type: string
 
 services:
   wordpress:
@@ -33,7 +33,7 @@ services:
     stateful: true
     environment:
       - WORDPRESS_DB_PASSWORD=${STACK}_secret
-    secrets: 
+    secrets:
       - secret: WP_ADMIN_PASSWORD
         name: WORDPRESS_PASSWORD
         type: env
@@ -49,7 +49,7 @@ services:
       service: mysql
     image: ${MYSQL_IMAGE}
     stateful: true
-    secrets: 
+    secrets:
       - secret: WP_MYSQL_ROOT_PW
         name: MYSQL_PASSWORD
         type: env

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

@@ -106,7 +106,7 @@ describe Kontena::Cli::Apps::DeployCommand do
           allow(subject).to receive(:current_dir).and_return("kontena-test")
           services['wordpress']['environment'] = ['MYSQL_ADMIN_PASSWORD=password']
           services['wordpress']['env_file'] = %w(/path/to/env_file .env)
-          allow(YAML).to receive(:load).and_return(services)
+          allow(YAML).to receive(:safe_load).and_return(services)
 
           expect(File).to receive(:readlines).with('/path/to/env_file').and_return(env_vars)
           expect(File).to receive(:readlines).with('.env').and_return(dot_env)
@@ -127,7 +127,7 @@ describe Kontena::Cli::Apps::DeployCommand do
           allow(subject).to receive(:current_dir).and_return("kontena-test")
           services['wordpress']['environment'] = ['MYSQL_ADMIN_PASSWORD=password']
           services['wordpress']['env_file'] = '/path/to/env_file'
-          allow(YAML).to receive(:load).and_return(services)
+          allow(YAML).to receive(:safe_load).and_return(services)
 
           expect(File).to receive(:readlines).with('/path/to/env_file').and_return(env_vars)
 
@@ -145,7 +145,7 @@ describe Kontena::Cli::Apps::DeployCommand do
       it 'merges external links to links' do
         allow(subject).to receive(:current_dir).and_return("kontena-test")
         services['wordpress']['external_links'] = ['loadbalancer:loadbalancer']
-        allow(YAML).to receive(:load).and_return(services)
+        allow(YAML).to receive(:safe_load).and_return(services)
         data = {
           'name' => 'kontena-test-wordpress',
           'image' => 'wordpress:latest',

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

@@ -159,6 +159,16 @@ module Kontena::Cli::Services
       end
     end
 
+    describe '#parse_container_name' do
+      it 'parses stack services id properly' do
+        expect(subject.parse_container_name('foo/mysql', 1)).to eq('foo-mysql-1')
+      end
+
+      it 'parses stackless services id properly' do
+        expect(subject.parse_container_name('mysql', 1)).to eq('null-mysql-1')
+      end
+    end
+
     describe '#parse_image' do
       it 'adds :default tag if no tag exist' do
         expect(subject.parse_image('nginx')).to eq('nginx:latest')

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

@@ -0,0 +1,60 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/stacks/build_command"
+
+describe Kontena::Cli::Stacks::BuildCommand do
+
+  let(:subject) do
+    described_class.new(File.basename($0))
+  end
+
+  describe '#execute' do
+    let(:stack) do
+      {
+        'name' => 'stack-a',
+        'stack' => 'user/stack-a',
+        'version' => '1.0.0',
+        'services' => [
+          service
+        ]
+      }
+    end
+
+    let(:service) do
+      {
+        'name' => 'test',
+        'image' => 'registry.kontena.local/test:latest',
+        'build' => {
+          'context' => File.expand_path('.')
+        }
+      }
+    end
+
+    describe '#execute' do
+      before(:each) do
+        allow(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
+        allow(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
+        allow(subject).to receive(:system).and_return(true)
+      end
+
+      it 'requires config file' do
+        expect(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
+        subject.run([])
+      end
+
+      it 'reads stack file' do
+        expect(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
+        subject.run([])
+      end
+
+      it 'builds docker image' do
+        expect(subject).to receive(:system).with('docker', 'build', '-t', 'registry.kontena.local/test:latest', '--pull', File.expand_path('.'))
+        subject.run([])
+      end
+
+      it 'pushes docker image' do
+        expect(subject).to receive(:system).with('docker', 'push', 'registry.kontena.local/test:latest')
+        subject.run([])
+      end
+    end
+  end
+end

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

@@ -141,6 +141,23 @@ describe Kontena::Cli::Stacks::YAML::Reader do
         expect(service_extender).to receive(:extend_from).with(kontena_yml['services']['base'])
         subject.execute
       end
+
+      it 'merges validation errors' do
+        allow(File).to receive(:read)
+          .with(absolute_yaml_path('docker-compose_v2.yml'))
+          .and_return(fixture('docker-compose-invalid.yml'))
+        outcome = subject.execute
+        expect(outcome[:errors]).to eq([{
+          'docker-compose_v2.yml' =>[
+            {
+              'wordpress' => {
+                'networks' => 'key not expected'
+              }
+            }
+          ]
+        }])
+      end
+
     end
 
     context 'variable interpolation' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Kontena command line tool
 email:
 - info@kontena.io
@@ -440,6 +454,7 @@ files:
 - lib/kontena/util.rb
 - lib/kontena_cli.rb
 - spec/fixtures/app.json
+- spec/fixtures/docker-compose-invalid.yml
 - spec/fixtures/docker-compose.yml
 - spec/fixtures/docker-compose_v2.yml
 - spec/fixtures/health.yml
@@ -507,6 +522,7 @@ files:
 - spec/kontena/cli/services/services_helper_spec.rb
 - spec/kontena/cli/services/unlink_command_spec.rb
 - spec/kontena/cli/services/update_command_spec.rb
+- spec/kontena/cli/stacks/build_command_spec.rb
 - spec/kontena/cli/stacks/deploy_command_spec.rb
 - spec/kontena/cli/stacks/install_command_spec.rb
 - spec/kontena/cli/stacks/list_command_spec.rb
@@ -544,9 +560,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.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.5.1
@@ -555,6 +571,7 @@ specification_version: 4
 summary: Kontena command line tool
 test_files:
 - spec/fixtures/app.json
+- spec/fixtures/docker-compose-invalid.yml
 - spec/fixtures/docker-compose.yml
 - spec/fixtures/docker-compose_v2.yml
 - spec/fixtures/health.yml
@@ -622,6 +639,7 @@ test_files:
 - spec/kontena/cli/services/services_helper_spec.rb
 - spec/kontena/cli/services/unlink_command_spec.rb
 - spec/kontena/cli/services/update_command_spec.rb
+- spec/kontena/cli/stacks/build_command_spec.rb
 - spec/kontena/cli/stacks/deploy_command_spec.rb
 - spec/kontena/cli/stacks/install_command_spec.rb
 - spec/kontena/cli/stacks/list_command_spec.rb