kontena-cli 1.4.3 → 1.5.0.pre1

data/lib/kontena/{cli/stacks → stacks}/change_resolver.rb

@@ -1,6 +1,6 @@
-require_relative 'yaml/stack_file_loader'
+require_relative 'stack_data_set'
 
-module Kontena::Cli::Stacks
+module Kontena::Stacks
   class ChangeResolver
 
     attr_reader :old_data, :new_data
@@ -8,11 +8,11 @@ module Kontena::Cli::Stacks
     # Creates a change analysis from two sets of stack data.
     # The format is a flat hash of all related stacks.
     #
-    # @param old_data [Hash]
-    # @param new_data [Hash]
+    # @param old_data [DataSet,Hash]
+    # @param new_data [DataSet,Hash]
     def initialize(old_data, new_data)
-      @old_data = old_data
-      @new_data = new_data
+      @old_data = old_data.is_a?(StackDataSet) ? old_data : StackDataSet.new(old_data)
+      @new_data = new_data.is_a?(StackDataSet) ? new_data : StackDataSet.new(new_data)
       analyze
     end
 
@@ -56,41 +56,63 @@ module Kontena::Cli::Stacks
       @remaining_stacks ||= added_stacks + upgraded_stacks
     end
 
+    # @return [Boolean]
+    def safe?
+      removed_stacks.empty? && replaced_stacks.empty? && removed_services.empty?
+    end
+
     def analyze
-      old_names = old_data.keys
-      new_names = new_data.keys
+      old_names = old_data.stack_names
+      new_names = new_data.stack_names
 
       removed_stacks.concat(old_names - new_names)
       added_stacks.concat(new_names - old_names)
-      upgraded_stacks.concat(new_names & old_names)
+      (new_names & old_names).each do |candidate|
+        upgraded_stacks << candidate if stack_upgraded?(candidate)
+      end
 
       removed_stacks.each do |removed_stack|
         removed_services.concat(
-          old_data[removed_stack][:stack_data]['services'].map { |svc| "#{removed_stack}/#{svc['name']}"}
+          old_data.stack(removed_stack).service_names.map { |name| "#{removed_stack}/#{name}"}
         )
       end
 
       added_stacks.each do |added_stack|
         added_services.concat(
-          new_data[added_stack][:stack_data]['services'].map { |svc| "#{added_stack}/#{svc['name']}"}
+          new_data.stack(added_stack).service_names.map { |name| "#{added_stack}/#{name}"}
         )
       end
 
       upgraded_stacks.each do |upgraded_stack|
-        old_stack = old_data[upgraded_stack][:stack_data]['stack']
-        new_stack = new_data[upgraded_stack][:stack_data]['stack']
+        old_stack = old_data.stack(upgraded_stack).stack_name
+        new_stack = new_data.stack(upgraded_stack).stack_name
 
         unless old_stack == new_stack
           replaced_stacks[upgraded_stack] = { from: old_stack, to: new_stack }
         end
 
-        old_services = old_data[upgraded_stack][:stack_data]['services'].map { |svc| "#{upgraded_stack}/#{svc['name']}" }
-        new_services = new_data[upgraded_stack][:stack_data]['services'].map { |svc| "#{upgraded_stack}/#{svc['name']}" }
+        old_services = old_data.stack(upgraded_stack).service_names.map { |name| "#{upgraded_stack}/#{name}" }
+        new_services = new_data.stack(upgraded_stack).service_names.map { |name| "#{upgraded_stack}/#{name}" }
 
         removed_services.concat(old_services - new_services)
         added_services.concat(new_services - old_services)
         upgraded_services.concat(new_services & old_services)
       end
     end
+
+    # Stack is upgraded if version, stack name, variables change or stack is root
+    #
+    # @param name [String]
+    # @return [Boolean]
+    def stack_upgraded?(name)
+      old_stack = old_data.stack(name)
+      new_stack = new_data.stack(name)
+      return true if new_stack.root?
+      return true if old_stack.version != new_stack.version
+      return true if old_stack.stack_name != new_stack.stack_name
+      return true if old_stack.variables != new_stack.variables
+
+      false
+    end
   end
-end
+end

data/lib/kontena/stacks/stack_data.rb

@@ -0,0 +1,58 @@
+module Kontena::Stacks
+  class StackData
+
+    attr_reader :loader
+
+    # @param data [Hash]
+    # @param loader [StackFileLoader,NilClass]
+    def initialize(data, loader = nil)
+      @data = data
+      @loader = loader
+    end
+
+    # @return [String]
+    def name
+      @data['name']
+    end
+
+    # @return [String]
+    def stack_name
+      @data['stack']
+    end
+
+    # @return [String]
+    def version
+      @data['version']
+    end
+
+    # @return [Boolean]
+    def root?
+      parent.nil?
+    end
+
+    # @return [String]
+    def parent
+      @data.dig('parent', 'name')
+    end
+
+    # @return [Hash]
+    def variables
+      @data['variables']
+    end
+
+    # @return [Array<Hash>]
+    def services
+      @data['services']
+    end
+
+    # @return [Array<String>]
+    def service_names
+      @data['services'].map { |s| s['name']}
+    end
+
+    # @return [Hash]
+    def data
+      @data.dup
+    end
+  end
+end

data/lib/kontena/stacks/stack_data_set.rb

@@ -0,0 +1,51 @@
+require_relative 'stack_data'
+
+module Kontena::Stacks
+  class StackDataSet
+
+    # @param data [Hash]
+    def initialize(data)
+      @data = data
+    end
+
+    # @param name [String]
+    # @return [StackData,NilClass]
+    def stack(name)
+      data = @data[name]
+      StackData.new(data[:stack_data], data[:loader]) if data
+    end
+
+    alias_method :[], :stack
+
+    # @return [Array<StackData>]
+    def stacks
+      stack_names.map do |name|
+        stack(name)
+      end.compact
+    end
+
+    # @return [Array<String>]
+    def stack_names
+      @data.keys
+    end
+
+    # @return [Integer]
+    def size
+      @data.size
+    end
+
+    # @param name [String]
+    # @return [StackData,NilClass]
+    def delete(name)
+      data = @data.delete(name)
+      StackData.new(data[:stack_data], data[:loader]) if data
+    end
+
+    # @return [Array<StackData>]
+    def remove_dependencies
+      stacks.map do |stack|
+        delete(stack.name) unless stack.root?
+      end.compact
+    end
+  end
+end

data/lib/kontena_cli.rb

@@ -176,6 +176,7 @@ class String
   end
 end
 
+
 require 'retriable'
 Retriable.configure do |c|
   c.on_retry = Proc.new do |exception, try, elapsed_time, next_interval|

data/omnibus/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/opscode/omnibus-software.git
-  revision: f315da39ad2ead2541fdaf21af1a555870109e7a
+  revision: 4ef2d1a5b9162f4f5f52617d2a0122796b4f3c43
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -9,22 +9,27 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
-    aws-sdk (2.10.17)
-      aws-sdk-resources (= 2.10.17)
-    aws-sdk-core (2.10.17)
+    aws-sdk (2.10.130)
+      aws-sdk-resources (= 2.10.130)
+    aws-sdk-core (2.10.130)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.17)
-      aws-sdk-core (= 2.10.17)
-    aws-sigv4 (1.0.1)
-    chef-config (12.13.37)
+    aws-sdk-resources (2.10.130)
+      aws-sdk-core (= 2.10.130)
+    aws-sigv4 (1.0.2)
+    chef-config (13.7.16)
+      addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-sugar (3.5.0)
+      tomlrb (~> 1.2)
+    chef-sugar (3.6.0)
+    citrus (3.0.2)
     cleanroom (1.0.0)
-    ffi (1.9.14)
+    ffi (1.9.21)
     ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
@@ -32,16 +37,17 @@ GEM
     ipaddress (0.8.3)
     jmespath (1.3.1)
     libyajl2 (1.2.0)
-    license_scout (0.1.3)
+    license_scout (1.0.0)
       ffi-yajl (~> 2.2)
       mixlib-shellout (~> 2.2)
+      toml-rb (~> 1.0)
     mixlib-cli (1.7.0)
-    mixlib-config (2.2.4)
+    mixlib-config (2.2.5)
     mixlib-log (1.7.1)
-    mixlib-shellout (2.2.7)
-    mixlib-versioning (1.1.0)
+    mixlib-shellout (2.3.2)
+    mixlib-versioning (1.2.2)
     multipart-post (2.0.0)
-    ohai (8.24.1)
+    ohai (8.26.1)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -53,12 +59,12 @@ GEM
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    omnibus (5.6.1)
+    omnibus (5.6.8)
       aws-sdk (~> 2)
       chef-sugar (~> 3.3)
       cleanroom (~> 1.0)
       ffi-yajl (~> 2.2)
-      license_scout
+      license_scout (~> 1.0)
       mixlib-shellout (~> 2.0)
       mixlib-versioning
       ohai (~> 8.0)
@@ -71,11 +77,15 @@ GEM
       multipart-post (~> 2.0.0)
       progressbar
       zhexdump (>= 0.0.2)
-    plist (3.3.0)
-    progressbar (1.8.2)
-    ruby-progressbar (1.8.1)
+    plist (3.4.0)
+    progressbar (1.9.0)
+    public_suffix (3.0.2)
+    ruby-progressbar (1.9.0)
     systemu (2.6.5)
-    thor (0.19.1)
+    thor (0.20.0)
+    toml-rb (1.1.1)
+      citrus (~> 3.0, > 3.0)
+    tomlrb (1.2.6)
     wmi-lite (1.0.0)
     zhexdump (0.0.2)
 
@@ -87,4 +97,4 @@ DEPENDENCIES
   omnibus-software!
 
 BUNDLED WITH
-   1.15.3
+   1.16.0

data/omnibus/config/projects/kontena.rb

@@ -11,6 +11,8 @@ description "Command-line tool for the Kontena Platform"
 maintainer "Kontena, Inc."
 homepage "https://kontena.io"
 
+override :ruby, version: "2.5.0"
+
 # Defaults to C:/kontena on Windows
 # and /opt/kontena on all other platforms
 install_dir "#{default_root}/#{name}"

data/omnibus/config/software/kontena-cli.rb

@@ -9,9 +9,11 @@ dependency "libxml2"
 dependency "libxslt"
 whitelist_file "./wrappers/sh/kontena"
 build do
-  gem "install rb-readline -v 0.5.4 --no-ri --no-doc"
-  gem "install nokogiri -v 1.6.8 --no-ri --no-doc"
-  gem "install kontena-cli -v #{default_version} --no-ri --no-doc"
-  gem "install kontena-plugin-cloud --no-ri --no-doc"
+  env = with_standard_compiler_flags(with_embedded_path)
+  gem "install rb-readline -v 0.5.4 -N", env: env
+  gem "install nokogiri -v 1.8.2 -N", env: env
+  gem "build kontena-cli.gemspec", env: env, cwd: File.expand_path('..', Omnibus::Config.project_root)
+  gem "install -N #{Dir[File.expand_path('../kontena-cli-%s.gem' % default_version, Omnibus::Config.project_root)].first}", env: env
+  gem "install kontena-plugin-cloud -N", env: env
   copy "sh/kontena", "#{install_dir}/bin/kontena"
 end

data/omnibus/package-scripts/kontena/postinstall

@@ -4,7 +4,7 @@
 # after package is installed.
 #
 chown $USER /opt/kontena/embedded/bin
-chown $USER -R /opt/kontena/embedded/lib/ruby/gems/2.1.0
+chown $USER -R /opt/kontena/embedded/lib/ruby/gems/2.5.0
 
 mkdir -p /usr/local/bin
 ln -s /opt/kontena/bin/kontena /usr/local/bin/kontena

data/omnibus/wrappers/sh/kontena

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 export PATH=/opt/kontena/embedded/bin:$PATH
-export GEM_HOME=/opt/kontena/embedded/lib/ruby/gems/2.1.0
+export GEM_HOME=/opt/kontena/embedded/lib/ruby/gems/2.5.0
 export GEM_PATH=$GEM_HOME
 
 exec /opt/kontena/embedded/bin/kontena "$@"

data/spec/fixtures/kontena_v3_with_registry_extends.yml

@@ -0,0 +1,20 @@
+stack: user/stackname
+version: 0.1.1
+services:
+  wordpress:
+    extends:
+      stack: registrystack/compose:1.0.0
+      service: wordpress
+    stateful: true
+    environment:
+      WORDPRESS_DB_PASSWORD: ${STACK}_secret
+    instances: 2
+    deploy:
+      strategy: ha
+  mysql:
+    extends:
+      stack: registrystack/compose:1.0.0
+      service: mysql
+    stateful: true
+    environment:
+      - MYSQL_ROOT_PASSWORD=${STACK}_secret

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

@@ -0,0 +1,81 @@
+require 'kontena/cli/certificate/authorize_command'
+
+describe Kontena::Cli::Certificate::AuthorizeCommand do
+  include ClientHelpers
+  include OutputHelpers
+
+  let(:subject) { described_class.new("kontena") }
+
+  let(:challenge_opts) { {} }
+  let(:linked_service) { {} }
+  let(:domain_authorization) {
+    {
+      'id' => 'test/example.com',
+      'domain' => 'example.com',
+      'challenge_opts' => challenge_opts,
+      'linked_service' => linked_service,
+    }
+  }
+
+  describe '--type=dns-01' do
+    let(:challenge_opts) {
+      {
+        'record_name' => '_acme-challenge',
+        'record_type' => 'TXT',
+        'record_content' => 'qyANS...sqXm4',
+
+      }
+    }
+
+    it "requests domain authorization and shows the record contents" do
+      allow(client).to receive(:post).with('grids/test-grid/domain_authorizations', {domain: 'example.com', authorization_type: 'dns-01'}).and_return(domain_authorization)
+
+      expect{subject.run(['--type=dns-01', 'example.com'])}.to output(<<-EOM
+Authorization successfully created. Use the following details to create necessary validations:
+Record name: _acme-challenge.example.com
+Record type: TXT
+Record content: qyANS...sqXm4
+EOM
+      ).to_stdout
+    end
+  end
+
+  describe '--type=http-01' do
+    let(:challenge_opts) {
+      {
+        'token' => 'LoqXcYV8q5ONbJQxbmR7SCTNo3tiAXDfowyjxAjEuX0',
+        'content' => 'LoqXcYV8q5ONbJQxbmR7SCTNo3tiAXDfowyjxAjEuX0.9jg46WB3rR_AHD-EBXdN7cBkH1WOu0tA3M9fm21mqTI',
+      }
+    }
+    let(:linked_service) { { 'id' => 'test-grid/test/lb' } }
+
+    it "fails without --linked-service" do
+      expect{subject.run(["--type=http-01", 'example.com'])}.to exit_with_error.and output(/--linked-service is required with --type=http-01/).to_stderr
+    end
+
+    it "requests domain authorization" do
+      allow(client).to receive(:post).with('grids/test-grid/domain_authorizations', {domain: 'example.com', authorization_type: 'http-01', linked_service: 'test/lb'}).and_return(domain_authorization)
+      allow(subject).to receive(:wait_for_domain_auth_deployed).with(domain_authorization).and_return(domain_authorization)
+
+      expect{subject.run(['--type=http-01', '--linked-service=test/lb', 'example.com'])}.to output(/Waiting for http-01 challenge to be deployed into .*\nHTTP challenge is deployed, you can now request the actual certificate/m).to_stdout
+    end
+  end
+
+  describe '--type=tls-sni-01' do
+    let(:challenge_opts) {
+      { }
+    }
+    let(:linked_service) { { 'id' => 'test-grid/test/lb' } }
+
+    it "fails without --linked-service" do
+      expect{subject.run(["--type=tls-sni-01", 'example.com'])}.to exit_with_error.and output(/--linked-service is required with --type=tls-sni-01/).to_stderr
+    end
+
+    it "requests domain authorization and waits for deploy" do
+      allow(client).to receive(:post).with('grids/test-grid/domain_authorizations', {domain: 'example.com', authorization_type: 'tls-sni-01', linked_service: 'test/lb'}).and_return(domain_authorization)
+      allow(subject).to receive(:wait_for_domain_auth_deployed).with(domain_authorization).and_return(domain_authorization)
+
+      expect{subject.run(['--type=tls-sni-01', '--linked-service=test/lb', 'example.com'])}.to output(/Waiting for tls-sni-01 challenge to be deployed into .*\nTLS-SNI challenge certificate is deployed, you can now request the actual certificate/m).to_stdout
+    end
+  end
+end