kontena-cli 1.2.1 → 1.2.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2348d6e1178017225647afe4f27ea5b8906cbdd0
-  data.tar.gz: bcc0cabfc17f05d12e46403ef1bf9fce295e14e0
+  metadata.gz: 7db7c48764f8cf25a6c8299cfea9a9114bf22e60
+  data.tar.gz: 6dd47f6ca45694944a84a785f4e44dd1e679813d
 SHA512:
-  metadata.gz: 3dcf0ee41489b454d2a406efb0e78761c8f257cf12d58102f956f3e319e74623b280447efb2c0b1c1be80bcf0ceb6b539bbce6854c2cd33458e1e43e29f40ace
-  data.tar.gz: 803334eee3e02d1f41de731142918c3c4f50ae2fb059134ef16884cbac0fccf929368f253cbefdb4aaae12c66d3d1a423aacd47dd3a51163216f17d0dcb90fd4
+  metadata.gz: 66602d4abf1853a69113535b6df1c680e957c9fb505ba7c616ea9d72e4eb9fa501b0f5627ae73565688c98035030cecf3b44aa2306c6268810cf22f5b4396ab6
+  data.tar.gz: 0403f16eff264d3841a9b56b508ddd6f789f353d8bc91b85a95853a6562951a0f2a8987878b66ab292faed249ea83e1c4fa7b792d0b454742826532c19d8c0e4

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2.rc1

data/lib/kontena/callbacks/master/deploy/50_authenticate_after_deploy.rb

@@ -1,3 +1,4 @@
+require 'securerandom'
 
 module Kontena
   module Callbacks

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

@@ -7,8 +7,10 @@ module Kontena::Cli::Grids
 
     parameter "NAME", "Grid name"
     option "--statsd-server", "STATSD_SERVER", "Statsd server address (host:port)"
+    option "--no-statsd-server", :flag, "Unset statsd server setting"
     option "--default-affinity", "[AFFINITY]", "Default affinity rule for the grid", multivalued: true
-    option "--log-forwarder", "LOG_FORWARDER", "Set grid wide log forwarder"
+    option "--no-default-affinity", :flag, "Unset grid default affinity"
+    option "--log-forwarder", "LOG_FORWARDER", "Set grid wide log forwarder (set to 'none' to disable)"
     option "--log-opt", "[LOG_OPT]", "Set log options (key=value)", multivalued: true
 
     def execute
@@ -26,6 +28,10 @@ module Kontena::Cli::Grids
         }
       end
 
+      if no_statsd_server?
+        payload[:stats] = { statsd:  nil }
+      end
+
       if log_forwarder
         payload[:logs] = {
           forwarder: log_forwarder,
@@ -33,9 +39,14 @@ module Kontena::Cli::Grids
         }
       end
 
-      if default_affinity_list
+      unless default_affinity_list.empty?
         payload[:default_affinity] = default_affinity_list
       end
+
+      if no_default_affinity?
+        payload[:default_affinity] = []
+      end
+
       client(token).put("grids/#{name}", payload)
     end
 

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

@@ -1,4 +1,5 @@
 require_relative '../stacks/stacks_helper'
+require 'securerandom'
 
 module Kontena::Cli::Registry
   class CreateCommand < Kontena::Command

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

@@ -31,7 +31,23 @@ module Kontena::Cli::Stacks::YAML
         'external_links' => optional('array'),
         'mem_limit' => optional('string'),
         'mem_swaplimit' => optional('string'),
-        'environment' => optional(-> (value) { value.is_a?(Array) || value.is_a?(Hash) }),
+        'environment' => optional(-> (value) {
+          if value.is_a?(Hash)
+            value.all? do |k,v|
+              k.kind_of?(String) && (
+                v.kind_of?(String) ||
+                v.kind_of?(Integer) ||
+                v.kind_of?(TrueClass) ||
+                v.kind_of?(FalseClass) ||
+                v.nil?
+              )
+            end
+          elsif value.is_a?(Array)
+            value.all? { |v| v.kind_of?(String) && v =~ /\A\S+(?<!\\)=.*/ }
+          else
+            false
+          end
+        }),
         'env_file' => optional(-> (value) { value.is_a?(String) || value.is_a?(Array) }),
         'instances' => optional('integer'),
         'links' => optional(-> (value) { value.is_a?(Array) || value.nil? }),

data/omnibus/config/projects/kontena.rb

@@ -29,5 +29,6 @@ exclude "**/.git"
 exclude "**/bundler/git"
 
 package :pkg do
-  identifier "io.kontena.pkg.cli"
+  identifier "io.kontena.cli.pkg.kontena"
+  signing_identity "Developer ID Installer: Kontena Oy (JJ22T2W355)"
 end

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

@@ -41,6 +41,24 @@ describe Kontena::Cli::Grids::UpdateCommand do
         )
         subject.run(['--log-forwarder', 'fluentd', '--log-opt', 'foo=bar', 'test'])
       end
+
+      it 'should send empty statsd when --no-statsd-server given' do
+        expect(client).to receive(:put).with(
+          'grids/test', hash_including({
+            stats: { statsd: nil }
+          })
+        )
+        subject.run(['--no-statsd-server', 'test'])
+      end
+
+      it 'should send empty default_affinity when --no-default-affinity given' do
+        expect(client).to receive(:put).with(
+          'grids/test', hash_including({
+            default_affinity: []
+          })
+        )
+        subject.run(['--no-default-affinity', 'test'])
+      end
     end
   end
 end

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

@@ -110,6 +110,18 @@ describe Kontena::Cli::Stacks::YAML::ValidatorV3 do
       expect(result.errors.key?('environment')).to be_falsey
     end
 
+    it 'fails validation if environment array includes items without equals sign' do
+      result = subject.validate_options('environment' => ['KEY=VALUE', 'KEY2=VALUE2'])
+      expect(result.errors.key?('environment')).to be_falsey
+      result = subject.validate_options('environment' => ['KEY=VALUE', 'KEY2 VALUE'])
+      expect(result.errors.key?('environment')).to be_truthy
+    end
+
+    it 'passes validation if environment array includes items with booleans or nils' do
+      result = subject.validate_options('environment' => { 'KEY' => true, 'KEY2' => false, 'KEY3' => nil })
+      expect(result.errors.key?('environment')).to be_falsey
+    end
+
     context 'validates secrets' do
       it 'must be array' do
         result = subject.validate_options('secrets' => {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -662,9 +662,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