kontena-cli 1.4.0 → 1.4.1.pre1

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

@@ -82,7 +82,8 @@ module Kontena::Cli::Stacks::YAML
         }),
         'stop_signal' => optional('string'),
         'stop_grace_period' => optional(/(\d+(?:\.\d+)?)([hms])/),
-        'read_only' => optional('boolean')
+        'read_only' => optional('boolean'),
+        'entrypoint' => optional('string')
       }
     end
 

data/lib/kontena/cli/vault/import_command.rb

@@ -16,7 +16,7 @@ module Kontena::Cli::Vault
 
     def parsed_input
       require "json"
-      json? ? JSON.load(input) : YAML.safe_load(input)
+      json? ? JSON.load(input) : YAML.safe_load(input, [], [], true, path)
     end
 
     def input

data/lib/kontena/client.rb

@@ -55,7 +55,7 @@ module Kontena
         write_timeout:   ENV["EXCON_WRITE_TIMEOUT"]   ? ENV["EXCON_WRITE_TIMEOUT"].to_i   : 10,
         ssl_verify_peer: ignore_ssl_errors? ? false : true
       }
-      if ENV["DEBUG"]
+      if Kontena.debug?
         require 'kontena/debug_instrumentor'
         excon_opts[:instrumentor] = Kontena::DebugInstrumentor
       end

data/lib/kontena/command.rb

@@ -7,9 +7,11 @@ require 'excon/errors'
 
 class Kontena::Command < Clamp::Command
 
-  option ['-D', '--debug'], :flag, "Enable debug", environment_variable: 'DEBUG' do
-    ENV['DEBUG'] ||= 'true'
-    Kontena.reset_logger
+  option ['-D', '--[no-]debug'], :flag, "Enable debug", environment_variable: 'DEBUG', attribute_name: :debug_option do |debug|
+    unless debug.kind_of?(String)
+      ENV['DEBUG'] = debug.to_s
+      Kontena.reset_logger
+    end
   end
 
   attr_accessor :arguments
@@ -230,7 +232,7 @@ class Kontena::Command < Clamp::Command
       abort(ex.message)
     end
   rescue Kontena::Errors::StandardError => ex
-    raise ex if ENV['DEBUG']
+    raise ex if Kontena.debug?
     Kontena.logger.error(ex)
     abort(" [#{Kontena.pastel.red('error')}] #{ex.status} : #{ex.message}")
   rescue Errno::EPIPE
@@ -239,7 +241,7 @@ class Kontena::Command < Clamp::Command
   rescue Clamp::HelpWanted, Clamp::UsageError
     raise
   rescue => ex
-    raise ex if ENV['DEBUG']
+    raise ex if Kontena.debug?
     Kontena.logger.error(ex)
     abort(" [#{Kontena.pastel.red('error')}] #{ex.class.name} : #{ex.message}\n         See #{Kontena.log_target} or run the command again with environment DEBUG=true set to see the full exception")
   end

data/lib/kontena/plugin_manager.rb

@@ -11,7 +11,7 @@ module Kontena
     def init
       ENV["GEM_HOME"] = Common.install_dir
       Gem.paths = ENV
-      Common.use_dummy_ui unless ENV["DEBUG"]
+      Common.use_dummy_ui unless Kontena.debug?
       plugins
       true
     end

data/lib/kontena/plugin_manager/cleaner.rb

@@ -20,7 +20,7 @@ module Kontena
       # @param plugin_name [String]
       def cleanup
         options = []
-        options += ['-q', '--no-verbose'] unless ENV["DEBUG"]
+        options += ['-q', '--no-verbose'] unless Kontena.debug?
         command.handle_options options
         command.execute
         true

data/lib/kontena/scripts/completer.rb

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

data/lib/kontena/stacks_cache.rb

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

data/lib/kontena_cli.rb

@@ -1,4 +1,5 @@
 require 'kontena/autoload_core'
+require 'set'
 
 $KONTENA_START_TIME = Time.now.to_f
 at_exit do
@@ -67,7 +68,7 @@ module Kontena
 
     @log_target = ENV['LOG_TARGET']
 
-    if ENV["DEBUG"]
+    if debug?
       @log_target ||= $stderr
     elsif @log_target.nil?
       @log_target = File.join(home, 'kontena.log')
@@ -158,11 +159,14 @@ module Kontena
       require 'kontena/cli/log_formatters/strip_color'
       logger.formatter = Kontena::Cli::LogFormatter::StripColor.new
     end
-    logger.level = ENV["DEBUG"] ? Logger::DEBUG : Logger::INFO
+    logger.level = debug? ? Logger::DEBUG : Logger::INFO
     logger.progname = 'CLI'
     @logger = logger
   end
 
+  def self.debug?
+    !['', 'false'].include?(ENV['DEBUG'].to_s)
+  end
 end
 
 # Monkeypatching string to mimick 'colorize' gem

data/spec/fixtures/certificates/test/ca-key.pem

@@ -0,0 +1,10 @@
+-----BEGIN PRIVATE KEY-----
+MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAz/Ee36KUY7l0tRFR
+EO/XOSoOXqyv48Jcvz0TnV7d+n3yapzCZfvDtX0qMpdZqd4Gr7v2Zgr64PJJNELf
+SE/vMQIDAQABAkAyvAviWJKH+lnFS+JRlZMXeXFkHBIWKffjGQ3OGbVjRiKubgj9
+rzRe2qhNAIZtvlbpS2Yr3eq/nDsw9jX7uKd5AiEA9aXdMVpQpIfHg5WIpRuwBELN
+KpkbuqP/9/5n/czHCLsCIQDYtHh9zljUWMrD+zcPQ4dd6Z0fINuMfDwDs+1nvlmv
+AwIgbC9rVjP/diaycLonnwetooLFFvCtbKqTreWmaPmJ4scCIQCK0IhCpnTWiY5R
+nlG10F8dNHG2p/ibdFWJVa+k/hU6+wIgYoZtco7QmR+0fdWDWgPym28sY3a+IXyM
+VNIXoJoS8tU=
+-----END PRIVATE KEY-----

data/spec/fixtures/certificates/test/ca.pem

@@ -0,0 +1,10 @@
+-----BEGIN CERTIFICATE-----
+MIIBYzCCAQ2gAwIBAgIJAIpNg6jylBQkMA0GCSqGSIb3DQEBCwUAMA0xCzAJBgNV
+BAMMAkNBMB4XDTE3MTAzMTE3MDEyN1oXDTE4MTAzMTE3MDEyN1owDTELMAkGA1UE
+AwwCQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAz/Ee36KUY7l0tRFREO/XOSoO
+Xqyv48Jcvz0TnV7d+n3yapzCZfvDtX0qMpdZqd4Gr7v2Zgr64PJJNELfSE/vMQID
+AQABo1AwTjAdBgNVHQ4EFgQUcLvPScr8TZMmeiGGtFQecMBrt+IwHwYDVR0jBBgw
+FoAUcLvPScr8TZMmeiGGtFQecMBrt+IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
+AQsFAANBAGjroEv8WBLeIbGbSDM6RMVHQjt8V5Pwd/RPI7pusWGsaJbOVXCwQSsd
+wpUzwKt2lbtAZFmLIIJ53Pv0PZsgC6Q=
+-----END CERTIFICATE-----

data/spec/fixtures/certificates/test/ca.srl

@@ -0,0 +1 @@
+02

data/spec/fixtures/certificates/test/cert.pem

@@ -0,0 +1,8 @@
+-----BEGIN CERTIFICATE-----
+MIIBBTCBsAIBAjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDDAJDQTAeFw0xNzEw
+MzExNzA2MzJaFw0xNzExMzAxNzA2MzJaMA8xDTALBgNVBAMMBHRlc3QwXDANBgkq
+hkiG9w0BAQEFAANLADBIAkEA+jOxPABMu7Kp4lfrlGXWm+kQWIj4FSi5pczK/ReE
+w1Gxhq49CEt3bIC3Li8slJU4H1WZbhbz8VWyEUsmaYEfiQIDAQABMA0GCSqGSIb3
+DQEBCwUAA0EAIHbczx/kmb/ji/5kDtAUldbicApY9vl75JbPxnAfU5yqyZjhsFiF
+uH6nBTUEAXS4Ic89vJ+J9e14hXh7YLzq1w==
+-----END CERTIFICATE-----

data/spec/fixtures/certificates/test/csr.pem

@@ -0,0 +1,7 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIHIMHQCAQAwDzENMAsGA1UEAwwEdGVzdDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgC
+QQD6M7E8AEy7sqniV+uUZdab6RBYiPgVKLmlzMr9F4TDUbGGrj0IS3dsgLcuLyyU
+lTgfVZluFvPxVbIRSyZpgR+JAgMBAAGgADANBgkqhkiG9w0BAQsFAANBAKBAbxJj
+x3DNK2gL88PDH935+pD1TV5R/D2CllptYIn9at3NUb5/eN2iziqLUOPECpk+poj5
+FL5XWsl7ktIHmEA=
+-----END CERTIFICATE REQUEST-----

data/spec/fixtures/certificates/test/key.pem

@@ -0,0 +1,10 @@
+-----BEGIN PRIVATE KEY-----
+MIIBVgIBADANBgkqhkiG9w0BAQEFAASCAUAwggE8AgEAAkEA+jOxPABMu7Kp4lfr
+lGXWm+kQWIj4FSi5pczK/ReEw1Gxhq49CEt3bIC3Li8slJU4H1WZbhbz8VWyEUsm
+aYEfiQIDAQABAkBb0uTU1HdU23klrIa067sbdSmelIYXnd6kTsigoiUDWRo9mccV
+kPx4bL+L9bL2BX64+Sqjch2+EUYYqQSQLMzRAiEA/fpz9nR5feWi75URhS1oHi/0
+vpYxvQlTyt6LNBG6LxsCIQD8MYs+tUhwCfuKHPSfqE9oizOwAcfTUp/PVgLGhWcC
+KwIhAN3AQGGuHqmqx5GRwSNbmu3Ih1Okhbb8ntmhZz9GPx6DAiEAjPfApt+8Suw5
+j30Z+/if0ock8Dg+k1A3BjVEveUprBsCIQCjel8oZuN/3zatvWMCgCQboYoQjw9M
+U3GffGoMbo0kTw==
+-----END PRIVATE KEY-----

data/spec/fixtures/certificates/test/real-cert.pem

@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFFTCCA/2gAwIBAgITAPpXZfJpighg3wDd/LIHVlOS9zANBgkqhkiG9w0BAQsF
+ADAiMSAwHgYDVQQDDBdGYWtlIExFIEludGVybWVkaWF0ZSBYMTAeFw0xNzA5MTUx
+MzM0MDBaFw0xNzEyMTQxMzM0MDBaMCUxIzAhBgNVBAMTGnRlc3QuMTg4LjIyNi4x
+MzEuMjMueGlwLmlvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvCi9
+j76XlJ+v7hOHxPiY8eNN9zW3Y35i+AmL0V15kNkaMd7Kb5XoOgRJB4OwgrzCMXTR
+ZpyJxvXrOgqxRfNTjKQuf2UK/fmtdbwMLQFyH3LYLTQDNJo7m/kpgRPb0ftfFw6b
+ZtwPO7Ss0/c1EtdcD710vren+E4Fn697mFwwYu7iVGLwiIaZOC+NiGmfDVo2bVv8
+TMChFznkODZJSWP5ke2YHAxK6S8p/64EyW+KHHem7xl8G4LVRU9bC/dzlFm5cUmo
+LQ1Xy+4ShWpvx4pvLdh5aWsRZPiIRsIZrw0oy7MfrkYAmAqcVU5ZjZJ5wXk4GUvc
+Nv9A8QU3/wT6XGeLRwIDAQABo4ICPzCCAjswDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQW
+BBTSjrEQ/94c4lQf7uJFdAd/igat7DAfBgNVHSMEGDAWgBTAzANGuVggzFxycPPh
+LssgpvVoOjB3BggrBgEFBQcBAQRrMGkwMgYIKwYBBQUHMAGGJmh0dHA6Ly9vY3Nw
+LnN0Zy1pbnQteDEubGV0c2VuY3J5cHQub3JnMDMGCCsGAQUFBzAChidodHRwOi8v
+Y2VydC5zdGctaW50LXgxLmxldHNlbmNyeXB0Lm9yZy8wQgYDVR0RBDswOYIadGVz
+dC4xODguMjI2LjEzMS4yMy54aXAuaW+CG3Rlc3QzLjE4OC4yMjYuMTMxLjIzLnhp
+cC5pbzCB/gYDVR0gBIH2MIHzMAgGBmeBDAECATCB5gYLKwYBBAGC3xMBAQEwgdYw
+JgYIKwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIGrBggrBgEF
+BQcCAjCBngyBm1RoaXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUgcmVsaWVkIHVw
+b24gYnkgUmVseWluZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29yZGFuY2Ugd2l0
+aCB0aGUgQ2VydGlmaWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBzOi8vbGV0c2Vu
+Y3J5cHQub3JnL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQCeIwx50XNh
+qfvTxWsw4c2Ke44BPDcok2b7IL+tpcFlNRtlZHhEzFOZXvzZG3Nl8TyMaMd4ou7p
+tWlp4k1l9OBbl9CCV5k6NTMfnABHvddD6c0QmNBIWrSEK05BGtdLBoDcC3/3xNgr
+4EvoawdDeWe3qwVsBWlBpb24vF7zRUR70ZIV7aqDL0y9lpkZEMUbtBNUNu9mlfOw
+1GkBBmDq8iA4tsxM9VXz7l22jia5UYfYtkaN6cteqjJ25XE6+HRjsG0N9xmzHEFz
+AI20JrncQZVLx/gYxkNdEa1cyKvEF7huHr/8XBLbAnA6cjUsPGxQWbujV6VsnmL+
+E57k3WbO+RPO
+-----END CERTIFICATE-----

data/spec/fixtures/docker-compose_v2.yml

@@ -8,3 +8,4 @@ services:
       - mysql
   mysql:
     image: mysql:5.6
+    entrypoint: test

data/spec/fixtures/docker-compose_v2_with_variables.yml

@@ -0,0 +1,12 @@
+version: '2'
+services:
+  wordpress:
+    image: wordpress:4.1
+    ports:
+      - 80:80
+    depends_on:
+      - mysql
+  mysql:
+    image: mysql:5.6
+    environment:
+      - ENV_VAR=$ENV_VAR

data/spec/fixtures/kontena_v3_with_compose_variables.yml

@@ -0,0 +1,11 @@
+stack: user/stackname
+version: 0.1.1
+variables:
+  ENV_VAR:
+    type: string
+    value: abcd
+services:
+  mysql:
+    extends:
+      file: docker-compose_v2_with_variables.yml
+      service: mysql

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

@@ -0,0 +1,13 @@
+stack: user/stackname
+version: 0.1.1
+data:
+  with_affinity: &with_affinity
+    affinity:
+      - abc==dfg
+services:
+  wordpress:
+    <<: *with_affinity
+    image: wordpress
+  mysql:
+    <<: *with_affinity
+    image: mysql

data/spec/kontena/cli/certificates/export_command_spec.rb

@@ -0,0 +1,49 @@
+require 'kontena/cli/certificate/export_command'
+
+describe Kontena::Cli::Certificate::ExportCommand do
+  include ClientHelpers
+  include OutputHelpers
+  include FixturesHelpers
+
+  let(:subject) { described_class.new("kontena") }
+
+  let(:ca_pem) { fixture('certificates/test/ca.pem') }
+  let(:cert_pem) { fixture('certificates/test/cert.pem') }
+  let(:key_pem) { fixture('certificates/test/key.pem') }
+
+  let(:certificate) {
+    {
+      'id' => 'test/test.example.com',
+      'subject' => 'test.example.com',
+      'certificate' => cert_pem,
+      'chain' => ca_pem,
+      'private_key' => key_pem,
+    }
+  }
+
+  before do
+    allow(client).to receive(:get).with('certificates/test-grid/test.example.com/export').and_return(certificate)
+  end
+
+  it "outputs the cert bundle" do
+    expect{subject.run(['test.example.com'])}.to output(cert_pem + ca_pem + key_pem).to_stdout
+  end
+
+  describe '--cert' do
+    it "outputs the cert bundle" do
+      expect{subject.run(['--cert', 'test.example.com'])}.to output(cert_pem).to_stdout
+    end
+  end
+
+  describe '--chain' do
+    it "outputs the cert bundle" do
+      expect{subject.run(['--chain', 'test.example.com'])}.to output(ca_pem).to_stdout
+    end
+  end
+
+  describe '--key' do
+    it "outputs the cert bundle" do
+      expect{subject.run(['--key', 'test.example.com'])}.to output(key_pem).to_stdout
+    end
+  end
+end

data/spec/kontena/cli/certificates/import_command_spec.rb

@@ -0,0 +1,70 @@
+require 'kontena/cli/certificate/import_command'
+
+describe Kontena::Cli::Certificate::ImportCommand do
+  include ClientHelpers
+  include OutputHelpers
+  include FixturesHelpers
+
+  let(:subject) { described_class.new("kontena") }
+
+  let(:csr_path) { fixture_path('certificates/test/csr.pem') }
+  let(:ca_path) { fixture_path('certificates/test/ca.pem') }
+  let(:cert_path) { fixture_path('certificates/test/cert.pem') }
+  let(:key_path) { fixture_path('certificates/test/key.pem') }
+
+  let(:ca_pem) { fixture('certificates/test/ca.pem') }
+  let(:cert_pem) { fixture('certificates/test/cert.pem') }
+  let(:key_pem) { fixture('certificates/test/key.pem') }
+
+  let(:certificate) {
+    {
+      'id' => 'test/test',
+      'subject' => 'test',
+      'valid_until' => (Time.now.utc + 3600).xmlschema,
+      'alt_names' => [],
+      'certificate_pem' => cert_pem,
+      'chain_pem' => ca_pem,
+      'private_key_pem' => key_pem,
+    }
+  }
+
+  before do
+    allow(client).to receive(:put).with('certificates/test-grid/test',
+      certificate: cert_pem,
+      private_key: key_pem,
+      chain: [ca_pem],
+    ).and_return(certificate)
+  end
+
+  it "errors for an invalid cert file" do
+    expect{subject.run(["--private-key=#{key_path}", "--chain=#{ca_path}", csr_path])}.to exit_with_error.and output(/Invalid certificate at .*: OpenSSL::X509::CertificateError: .*/).to_stderr
+  end
+
+  it "imports the cert files" do
+    expect{subject.run(["--private-key=#{key_path}", "--chain=#{ca_path}", cert_path])}.to output(/subject: test/).to_stdout
+  end
+
+  describe '--subject' do
+    it 'overrides the subject' do
+      allow(client).to receive(:put).with('certificates/test-grid/example.com', Hash).and_return(certificate)
+
+      subject.run(["--subject=example.com", "--private-key=#{key_path}", "--chain=#{ca_path}", cert_path])
+    end
+  end
+
+  describe "with non-existant --private-key= path" do
+    it "fails with a usage error" do
+      expect{
+        described_class.run('kontena', ["--private-key=/missing/path", "--chain=#{ca_path}", cert_path])
+      }.to exit_with_error.and output(/ERROR: option '--private-key': File not found: /).to_stderr
+    end
+  end
+
+  describe "with non-existant CERT path" do
+    it "fails with a usage error" do
+      expect{
+        described_class.run('kontena', ["--private-key=#{key_path}", "--chain=#{ca_path}", '/nonexist'])
+      }.to exit_with_error.and output(/ERROR: parameter 'CERT_FILE': File not found: /).to_stderr
+    end
+  end
+end

data/spec/kontena/cli/certificates/show_command_spec.rb

@@ -0,0 +1,57 @@
+require 'kontena/cli/certificate/show_command'
+
+describe Kontena::Cli::Certificate::ShowCommand do
+  include ClientHelpers
+  include OutputHelpers
+  include FixturesHelpers
+
+  let(:subject) { described_class.new("") }
+
+  let(:certificate) {
+    {
+      'id' => 'test-grid/test.example.com',
+      'subject' => 'test.example.com',
+      'valid_until' => '2017-12-14T13:34:00.000+00:00',
+      'alt_names' => [],
+      'auto_renewable' => true,
+    }
+  }
+
+  before do
+    allow(client).to receive(:get).with('certificates/test-grid/test.example.com').and_return(certificate)
+  end
+
+  it "outputs the certificate info" do
+    expect{subject.run(['test.example.com'])}.to output_lines([
+      'test-grid/test.example.com:',
+      '  subject: test.example.com',
+      "  valid until: 2017-12-14T13:34:00Z",
+      '  auto renewable: true',
+    ])
+  end
+
+  context 'with certificate alt_names' do
+    let(:certificate) {
+      {
+        'id' => 'test-grid/test.example.com',
+        'subject' => 'test.example.com',
+        'valid_until' => '2017-12-14T13:34:00.000+00:00',
+        'alt_names' => [
+            'test2.example.com',
+        ],
+        'auto_renewable' => true,
+      }
+    }
+
+    it "outputs the certificate info" do
+      expect{subject.run(['test.example.com'])}.to output_lines([
+        'test-grid/test.example.com:',
+        '  subject: test.example.com',
+        "  valid until: 2017-12-14T13:34:00Z",
+        '  alt names:',
+        '    - test2.example.com',
+        '  auto renewable: true',
+      ])
+    end
+  end
+end