kontena-cli 1.4.2.pre1 → 1.4.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d83ecd393990f31582a50935e3f654d2bb80d800f5b5d196aa3dd37fb8384fb
-  data.tar.gz: '06882cc66e76fea42a919d1d8b3df32980f3f28bd20e5f72252f14ccb2537cb0'
+  metadata.gz: d80c5a60886f305951632390349ef6168fc24b69542c108309fa0119e912c79e
+  data.tar.gz: f8cfba36671e56f8262aa6e90a41547ee229434f96ca5409e48c79b4deca8b68
 SHA512:
-  metadata.gz: 7cb24f24e500a85564e50180cdf1f846f168320aafb4c612df7c112dcf8b090e3d085d0933550d080629743f97988a8ece671d4d11ca1df89a3c8ca1d113a42c
-  data.tar.gz: 4a3bd5066d50938bcd3dba051f4a61cfdf89e7cad81af0eb01a2297c3027db3aafd45ee773d9da33681cbffa6ab550ba2ef6bfcd650139337f83c25fac488043
+  metadata.gz: b71ece37a3830283045dac25fb34d4f3f844df2954a83d3f0e6d88236477f334e9a65dc0fc74ac557eb75c0218f5dc691568ee96789f590479b76d43c02a525b
+  data.tar.gz: fdc0e18068f530dfc3fc06a403f4b002424cfb4d9c8cfc53e26b68570a8502ef5677c4959a90be85bf24f6d26c725596acf2c9be63d9ff8fa4fa064b15f23f1d

data/VERSION

@@ -1 +1 @@
-1.4.2.pre1
+1.4.2.rc1

data/lib/kontena/cli/config.rb

@@ -40,53 +40,94 @@ module Kontena
       def initialize
         super
         @logger = Kontena.logger
-        load_settings_from_env || load_settings_from_config_file
 
-        debug { "Configuration loaded with #{servers.count} servers." }
+        load_settings_from_config_file
+
+        override_master_settings_from_env
+        override_cloud_settings_from_env
+
+        debug { "Configuration loaded with #{servers.count} servers and #{accounts.count} accounts." }
         debug { "Current master: #{current_server || '(not selected)'}" }
         debug { "Current grid: #{current_grid || '(not selected)'}" }
+        debug { "Current account: #{current_account.nil? ? '(not selected)' : current_account.name}" }
       end
 
       def debug(&block)
         Kontena.logger.add(Logger::DEBUG, nil, 'CONFIG', &block)
       end
 
-      # Craft a regular looking configuration based on ENV variables
-      def load_settings_from_env
-        load_cloud_settings_from_env
-        load_master_settings_from_env
-      end
+      def override_master_settings_from_env
+        if ENV['KONTENA_URL']
+          server = find_server_by(url: ENV['KONTENA_URL'])
+          if server.nil?
+            debug { 'Using new master url from env KONTENA_URL' }
+            server = Server.new(
+              url: ENV['KONTENA_URL'],
+              name: ENV['KONTENA_MASTER'] || 'default'
+            )
+            servers << server
+          else
+            debug { "Using master #{server.name} in config found via url in env KONTENA_URL" }
+          end
+        elsif ENV['KONTENA_MASTER']
+          server = find_server_by(name: ENV['KONTENA_MASTER'])
+          if server
+            debug { "Using master #{ENV['KONTENA_MASTER']} set via env KONTENA_MASTER" }
+          end
+        elsif current_master
+          server = current_master
+        end
 
-      def load_master_settings_from_env
-        return nil unless ENV['KONTENA_URL']
+        if server.nil?
+          debug { 'Could not determine a master through config or env' }
+          self.current_master = nil
+          return
+        else
+          self.current_master = server.name
+        end
 
-        debug { 'Loading master configuration from ENV' }
-        servers << Server.new(
-          url: ENV['KONTENA_URL'],
-          name: 'default',
-          token: Token.new(
-            access_token: ENV['KONTENA_TOKEN'],
-            parent_type: :master, parent_name: 'default'
-          ),
-          grid: ENV['KONTENA_GRID'],
-          parent_type: :master,
-          parent_name: 'default'
-        )
+        if ENV['KONTENA_GRID']
+          debug { "Using grid #{ENV['KONTENA_GRID']} from env KONTENA_GRID" }
+          server.grid = ENV['KONTENA_GRID']
+        end
 
-        self.current_master  = 'default'
+        if ENV['KONTENA_TOKEN']
+          debug { 'Using master token from env KONTENA_TOKEN' }
+          server.token ||= Token.new(parent_type: :master, parent_name: server.name)
+          server.token.access_token = ENV['KONTENA_TOKEN']
+          server.token.refresh_token = nil
+          server.token.expires_at = nil
+        end
       end
 
-      def load_cloud_settings_from_env
-        return unless ENV['KONTENA_CLOUD_TOKEN']
+      def override_cloud_settings_from_env
+        if ENV['KONTENA_CLOUD']
+          account = find_account(ENV['KONTENA_CLOUD'])
+          if account
+            debug { "Using cloud account #{ENV['KONTENA_CLOUD']} from config selected by env KONTENA_CLOUD" }
+            self.current_account = account.name
+          else
+            debug { "Using new cloud account #{ENV['KONTENA_CLOUD']} from env" }
+            account = Accout.new(kontena_account_data.merge(name: ENV['KONTENA_CLOUD']))
+            accounts << account
+          end
+        elsif current_account
+          account = current_account
+        end
 
-        debug { 'Loading cloud configuration from ENV' }
-        accounts << Account.new(kontena_account_data.merge(
-          token: Token.new(
-            access_token: ENV['KONTENA_CLOUD_TOKEN'],
-            parent_type: :account, parent_name: 'default'
-          )
-        ))
-        self.current_account = 'kontena'
+        if account.nil?
+          debug { 'No account data from config or env' }
+          self.current_account = nil
+          return
+        end
+
+        if ENV['KONTENA_CLOUD_TOKEN']
+          debug { 'Using cloud token from env KONTENA_CLOUD_TOKEN' }
+          account.token ||= Token.new(parent_type: :account, parent_name: account.name)
+          account.token.access_token = ENV['KONTENA_CLOUD_TOKEN']
+          account.token.refresh_token = nil
+          account.token.expires_at = nil
+        end
       end
 
       def extract_token!(hash={})
@@ -120,7 +161,7 @@ module Kontena
           servers << server
         end
 
-        self.current_server = ENV['KONTENA_MASTER'] || settings['current_server']
+        self.current_server = settings['current_server']
 
         Array(settings['accounts']).each do |account_data|
           if account_data['token']
@@ -146,7 +187,7 @@ module Kontena
         accounts.delete_at(master_index) if master_index
         accounts << Account.new(master_account_data)
 
-        self.current_account = ENV['KONTENA_CLOUD'] || settings['current_account'] || 'kontena'
+        self.current_account = settings['current_account'] || 'kontena'
       end
 
       def kontena_account_data
@@ -232,7 +273,13 @@ module Kontena
       #
       # @return [String] path
       def config_filename
-        @config_filename ||= ENV['KONTENA_CONFIG'] || default_config_filename
+        return @config_filename if @config_filename
+        if ENV['KONTENA_CONFIG']
+          debug { "Using #{ENV['KONTENA_CONFIG']} as config file set through env KONTENA_CONFIG"}
+          @config_filename = ENV['KONTENA_CONFIG']
+        else
+          @config_filename = default_config_filename
+        end
       end
 
       # Generate the default configuration filename
@@ -401,7 +448,9 @@ module Kontena
       #
       # @return [String, NilClass]
       def current_grid
-        ENV['KONTENA_GRID'] || (current_master && current_master.grid)
+        return ENV['KONTENA_GRID'] unless ENV['KONTENA_GRID'].to_s.empty?
+        return nil unless current_master
+        current_master.grid
       end
 
       # Set the current grid name.

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

@@ -19,6 +19,7 @@ module Kontena::Cli::Stacks
     option '--dependency-tree', :flag, "Show dependency tree"
     option '--[no-]dependencies', :flag, "Validate dependencies", default: true
     option '--parent-name', '[PARENT_NAME]', "Set parent name", hidden: true
+    option '--format', 'yaml|api-json', "Output Format", default: 'yaml'
 
     def validate_dependencies
       dependencies = loader.dependencies
@@ -59,18 +60,16 @@ module Kontena::Cli::Stacks
 
       dump_variables if values_to
 
-      result = stack.reject { |k, _| k == 'source' }
-      result.merge!(
-        'variables' => Kontena::Util.stringify_keys(
-          reader.variable_values(without_defaults: true, without_vault: true, with_errors: true)
-        )
-      )
-      if dependencies?
-        puts ::YAML.dump(result).sub(/\A---$/, "---\n# #{loader.source}")
+      case self.format
+      when 'api-json'
+        puts JSON.pretty_generate(stack)
+      when 'yaml'
+        result = ::YAML.dump(reader.fully_interpolated_yaml)
+        result = result.sub(/\A---$/, "---\n# #{loader.source}") if dependencies?
+        puts result
       else
-        puts ::YAML.dump(result)
+        exit_with_error "Unknown --format=#{self.format}"
       end
     end
   end
 end
-

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

@@ -273,6 +273,7 @@ module Kontena::Cli::Stacks
       # @param [String] service_name - optional service to parse
       # @return [Hash]
       def parse_services(service_name = nil)
+        services = self.services.dup # do not modify the fully_interpolated_yaml['services'] hash in-place
         if service_name.nil?
           services.each do |name, config|
             services[name] = process_config(config, name)

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

@@ -5,26 +5,71 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
   include ClientHelpers
   include RequirementsHelper
   include FixturesHelpers
+  include OutputHelpers
 
   context 'without dependencies' do
     before do
       [:read, :exist?].each do |meth|
         allow(File).to receive(meth).with(fixture_path('kontena_v3.yml')).and_call_original
         allow(File).to receive(meth).with(fixture_path('docker-compose_v2.yml')).and_call_original
+        allow(File).to receive(meth).with(fixture_path('stack-with-liquid.yml')).and_call_original
       end
     end
 
-    it 'validates a yaml file' do
-      expect{Kontena.run!('stack', 'validate', fixture_path('kontena_v3.yml'))}.not_to exit_with_error
-      expect{Kontena.run!('stack', 'validate', fixture_path('kontena_v3.yml'))}.to output(/stack:.*version:.*services:.*variables:/m).to_stdout
+    it 'outputs interpolated YAML' do
+      expect{Kontena.run!('stack', 'validate', fixture_path('stack-with-liquid.yml'))}.to output_yaml(
+        'stack' => 'user/stackname',
+        'version' => '0.1.1',
+        'variables' => {
+          'grid_name' => hash_including(
+              'value' => 'validate stackname',
+          ),
+          'copies' => {
+            'type' => 'integer',
+            'value' => 5,
+          }
+        },
+        'services' => hash_including(
+          'service-1' => hash_including(
+            'image' => 'foo:1',
+          ),
+        ),
+      )
+    end
+
+    it 'outputs API JSON' do
+      expect{Kontena.run!('stack', 'validate', '-v', 'copies=2', '--format=api-json', fixture_path('stack-with-liquid.yml'))}.to output_json(hash_including(
+        'stack' => 'user/stackname',
+        'version' => '0.1.1',
+        'name' => 'stackname',
+        'registry' => 'file://',
+        'expose' => nil,
+        'volumes' => [ ],
+        'dependencies' => nil,
+        'source' => a_string_matching(/.+/),
+        'parent_name' => nil,
+        'variables' => {
+          'grid_name' => '{{ GRID }} stackname',
+          'copies' => 2,
+        },
+        'services' => [
+          hash_including(
+            'name' => 'service-1',
+            'image' => 'foo:1',
+          ),
+          hash_including(
+            'name' => 'service-2',
+            'image' => 'foo:2',
+          ),
+        ],
+      ))
     end
 
     context '--online' do
       it 'validates a yaml file' do
-        expect{Kontena.run!('stack', 'validate', '--online', fixture_path('kontena_v3.yml'))}.to output(/stack:.*version:.*services:.*variables:/m).to_stdout
+        expect{Kontena.run!('stack', 'validate', '--online', fixture_path('kontena_v3.yml'))}.to output(/stack:.*version:.*services:/m).to_stdout
       end
     end
-
   end
 
   context 'with dependencies' do

data/spec/support/exit_with_error_helper.rb

@@ -1,3 +1,4 @@
+RSpec::Matchers.define_negated_matcher :exit_without_error, :exit_with_error
 RSpec::Matchers.define :exit_with_error do
 
   def supports_block_expectations?

data/spec/support/output_helpers.rb

@@ -97,6 +97,44 @@ module OutputHelpers
     end
   end
 
+  matcher :output_yaml do |expected|
+    supports_block_expectations
+
+    match do |block|
+      output = CaptureStdout.capture(block)
+      actual = ::YAML.safe_load(output)
+
+      values_match?(expected, actual)
+    end
+  end
+
+  matcher :output_json do |expected|
+    supports_block_expectations
+
+    match do |block|
+      output = CaptureStdout.capture(block)
+      @actual = JSON.parse(output)
+
+      values_match?(expected,   @actual)
+    end
+
+    failure_message do |block|
+      return "expected block to return #{expected}, but returned #{@actual}"
+    end
+  end
+
+  module CaptureStdout
+    def self.capture(block)
+      capture = StringIO.new
+      original = $stdout
+      $stdout = capture
+      block.call
+      capture.string
+    ensure
+      $stdout = original
+    end
+  end
+
   module CaptureStdoutLines
     def self.capture(block)
       capture = StringIO.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.2.pre1
+  version: 1.4.2.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler