kontena-cli 1.0.0.pre1 → 1.0.0.pre2

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

@@ -15,63 +15,54 @@ module Kontena::Cli::Stacks
       # @param [Hash] from
       # @return [Hash]
       def extend_from(from)
-        service_config['environment'] = extend_env_vars(
-          from['environment'],
-          service_config['environment']
-        )
-        service_config['secrets'] = extend_secrets(
-          from['secrets'],
-          service_config['secrets']
-        )
-        build_args = extend_build_args(safe_dig(from, 'build', 'args'), safe_dig(service_config, 'build', 'args'))
+        service_config['environment'] = extend_env_vars(from['environment'], service_config['environment'])
+        service_config['secrets']     = extend_secrets( from['secrets'], service_config['secrets'])
+        build_args                    = extend_build_args(safe_dig(from, 'build', 'args'), safe_dig(service_config, 'build', 'args'))
         unless build_args.empty?
-          service_config['build'] = {} unless service_config['build']
+          service_config['build'] ||= {}
           service_config['build']['args'] = build_args
         end
-
         from.merge(service_config)
       end
 
       private
 
+      # Takes two arrays of "key=value" pairs and merges them. Keys in "from"-array
+      # will not overwrite keys that already exist in "to"-array.
+      #
       # @param [Array] from
       # @param [Array] to
       # @return [Array]
       def extend_env_vars(from, to)
-        env_vars = to || []
-        if from
-          from.each do |env|
-            env_vars << env unless to && to.find do |key|
-              key.split('=').first == env.split('=').first
-            end
-          end
-        end
-        env_vars
+        to   ||= []
+        from ||= []
+        to_hash   = Hash[*to.flat_map {|t| t.split('=') }]
+        from_hash = Hash[*from.flat_map {|f| f.split('=') }]
+
+        from_hash.merge(to_hash).map {|k,v| "#{k}=#{v}"}
       end
 
+      # Takes two arrays of hashes containing { 'secret' => 'str', 'type' => 'str', 'name' => 'str' }
+      # and merges them. 'secret' is the primary key, secrets found in "to" are not overwritten.
+      #
       # @param [Array] from
       # @param [Array] to
       # @return [Array]
       def extend_secrets(from, to)
-        secrets = to || []
-        if from
-          from.each do |from_secret|
-            secrets << from_secret unless to && to.any? do |to_secret|
-              to_secret['secret'] == from_secret['secret']
-            end
-          end
+        from ||= []
+        to   ||= []
+        uniq_from = []
+        from.each do |from_hash|
+          uniq_from << from_hash unless to.find {|to_hash| from_hash['secret'] == to_hash['secret'] }
         end
-        secrets
+        to + uniq_from
       end
 
+      # Basic merge of two hashes, "to" is dominant.
       def extend_build_args(from, to)
-        args = to || {}
-        if from
-          from.each do |k,v|
-            args[k] = v unless args.has_key?(k)
-          end
-        end
-        args
+        from ||= {}
+        to   ||= {}
+        from.merge(to)
       end
     end
   end

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

@@ -43,6 +43,8 @@ module Kontena::Cli::Stacks::YAML
         'volumes_from' => optional('array'),
         'secrets' => optional('stacks_valid_secrets'),
         'hooks' => optional('stacks_valid_hooks'),
+        'only_if' => optional(-> (value) { value.is_a?(String) || value.is_a?(Hash) || value.is_a?(Array) }),
+        'skip_if' => optional(-> (value) { value.is_a?(String) || value.is_a?(Hash) || value.is_a?(Array) }),
         'deploy' => optional({
           'strategy' => optional(%w(ha daemon random)),
           'wait_for_port' => optional('integer'),

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

@@ -5,12 +5,15 @@ module Kontena::Cli::Vault
 
     parameter "NAME", "Secret name"
 
+    option '--return', :flag, 'Return the value', hidden: true
+
     def execute
       require_api_url
       require_current_grid
 
       token = require_token
       result = client(token).get("secrets/#{current_grid}/#{name}")
+      return result['value'] if self.return?
       puts "#{result['name']}:"
       puts "  created_at: #{result['created_at']}"
       puts "  value: #{result['value']}"

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

@@ -22,7 +22,7 @@ module Kontena::Cli::Vault
         upsert: upsert?
       }
       spinner "Updating #{name.colorize(:cyan)} value in the vault " do
-        client(token).put("grids/#{current_grid}/secrets/#{name}", data)
+        client(token).put("secrets/#{current_grid}/#{name}", data)
       end
     end
   end

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

@@ -6,6 +6,8 @@ module Kontena::Cli::Vault
     parameter 'NAME', 'Secret name'
     parameter '[VALUE]', 'Secret value'
 
+    option '--silent', :flag, "Reduce output verbosity"
+
     def execute
       require_api_url
       require_current_grid
@@ -20,7 +22,7 @@ module Kontena::Cli::Vault
           name: name,
           value: secret
       }
-      spinner "Writing #{name.colorize(:cyan)} to the vault " do
+      vspinner "Writing #{name.colorize(:cyan)} to the vault " do
         client(token).post("grids/#{current_grid}/secrets", data)
       end
     end

data/lib/kontena/stacks_cache.rb

@@ -0,0 +1,86 @@
+require_relative 'stacks_client'
+require_relative 'cli/common'
+require_relative 'cli/stacks/common'
+
+module Kontena
+  class StacksCache
+    class CachedStack
+
+      attr_reader :stack
+      attr_reader :version
+
+      def initialize(stack, version = nil)
+        unless version
+          stack, version = stack.split(':', 2)
+        end
+        @stack = stack
+        @version = version
+        raise ArgumentError, "Stack name and version required" unless @stack && @version
+      end
+
+      def read
+        File.read(path)
+      end
+
+      def load
+        YAML.load(read)
+      end
+
+      def write(content)
+        File.write(path, content)
+      end
+
+      def delete
+        File.unlink(path)
+      end
+
+      def cached?
+        File.exist?(path)
+      end
+
+      def path
+        return @path if @path
+        @path = File.expand_path(File.join(base_path, stack, version))
+        raise "Path traversal attempted" unless @path.start_with?(base_path)
+        @path
+      end
+
+      private
+
+      def base_path
+        Kontena::StacksCache.base_path
+      end
+    end
+
+    class RegistryClientFactory
+      include Kontena::Cli::Common
+      include Kontena::Cli::Stacks::Common
+    end
+
+    class << self
+      def get(stack, version = nil)
+        cache(stack, version).read
+      end
+
+      def cache(stack, version = nil)
+        stack = CachedStack.new(stack, version)
+        stack.write(client.pull(stack.stack, stack.version)) unless stack.cached?
+        stack
+      end
+
+      def client
+        @client ||= RegistryClientFactory.new.stacks_client
+      end
+
+      def base_path
+        return @base_path if @base_path
+        @base_path = File.join(Dir.home, '.kontena/cache/stacks')
+        unless File.directory?(@base_path)
+          require 'fileutils'
+          FileUtils.mkdir_p(@base_path)
+        end
+        @base_path
+      end
+    end
+  end
+end

data/lib/kontena/stacks_client.rb

@@ -0,0 +1,37 @@
+require_relative 'client'
+
+module Kontena
+  class StacksClient < Client
+
+    ACCEPT_JSON = { 'Accept' => 'application/json' }
+    ACCEPT_YAML = { 'Accept' => 'application/yaml' }
+    CT_YAML     = { 'Content-Type' => 'application/yaml' }
+
+    def path_to(repo_name, version = nil)
+      version ? "/stack/#{repo_name}/version/#{version}" : "/stack/#{repo_name}"
+    end
+
+    def push(repo_name, version, data)
+      post('/stack/', data, {}, CT_YAML)
+    end
+
+    def pull(repo_name, version = nil)
+      get(path_to(repo_name, version), {}, ACCEPT_YAML)
+    rescue StandardError => ex
+      ex.message << " : #{path_to(repo_name, version)}"
+      raise ex, ex.message
+    end
+
+    def search(query)
+      get('/search', { q: query }, {}, ACCEPT_JSON)
+    end
+
+    def versions(repo_name)
+      get("#{path_to(repo_name)}/versions", {}, ACCEPT_JSON)
+    end
+
+    def destroy(repo_name, version = nil)
+      delete(path_to(repo_name, version))
+    end
+  end
+end

data/lib/kontena_cli.rb

@@ -65,6 +65,7 @@ require_relative 'kontena/cli/version'
 require_relative 'kontena/cli/common'
 require_relative 'kontena/command'
 require_relative 'kontena/client'
+require_relative 'kontena/stacks_cache'
 require_relative 'kontena/plugin_manager'
 require_relative 'kontena/main_command'
 require_relative 'kontena/cli/spinner'

data/spec/fixtures/stack-invalid.yml

@@ -0,0 +1,5 @@
+wordpress:
+  stateful: 'true'
+  environment:
+    WORDPRESS_DB_PASSWORD: ${STACK}_secret
+

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

@@ -0,0 +1,66 @@
+stack: user/stackname
+version: 0.1.1
+variables:
+  enum_test:
+    type: enum
+    options: 
+      - Foo
+      - Bar
+      - Baz
+    from: prompt
+  wp_pass:
+    type: string # has a callback that writes the value to vault
+    required: true
+    min_length: 10
+    empty_is_nil: true
+    from: 
+      env: WORDPRESS_DB_PASSWORD # first try from local env
+      prompt: Enter a password for the wordpress instance  # then try from prompt
+      random_string: # if prompt returned nil, generate a random string
+        length: 10
+        charset: ascii_printable
+    to:
+      env: WP_PASS
+  test_var:
+    type: string
+    from:
+      random_string:
+        length: 16
+        charset: hex
+    to:
+      env: test_var
+  TEST_ENV_VAR:      # the default from/to is to set/read env of the option name
+    type: :string
+services:
+  wordpress:
+    extends:
+      file: docker-compose_v2.yml
+      service: wordpress
+    image: wordpress:$TAG
+    stateful: true
+    environment:
+      - WORDPRESS_DB_PASSWORD=${STACK}_secret
+    secrets: 
+      - secret: WP_ADMIN_PASSWORD
+        name: WORDPRESS_PASSWORD
+        type: env
+      - secret: FOO
+        name: FOOFOO
+        type: env
+    instances: 2
+    deploy:
+      strategy: ha
+  mysql:
+    extends:
+      file: docker-compose_v2.yml
+      service: mysql
+    image: ${MYSQL_IMAGE}
+    stateful: true
+    secrets: 
+      - secret: WP_MYSQL_ROOT_PW
+        name: MYSQL_PASSWORD
+        type: env
+    environment:
+      - INTERNAL_VAR=$$INTERNAL_VAR
+      - RANDOM_VAR=${test_var}
+      - TEST_VAR=$TEST_ENV_VAR

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

@@ -1,5 +1,29 @@
 stack: user/stackname
 version: 0.1.1
+variables:
+  wp_pass:
+    type: string # has a callback that writes the value to vault
+    required: true
+    min_length: 10
+    empty_is_nil: true
+    from: 
+      env: WORDPRESS_DB_PASSWORD # first try from local env
+      random_string: # if prompt returned nil, generate a random string
+        length: 10
+        charset: ascii_printable
+    to:
+      env: WP_PASS # put it to WP_PASS env variable
+  test_var:
+    type: string
+    from:
+      random_string:
+        length: 16
+        charset: hex
+    to: 
+      env: test_var
+  TEST_ENV_VAR:      # the default from/to is to set/read env of the option name
+    type: :string
+
 services:
   wordpress:
     extends:
@@ -9,6 +33,13 @@ services:
     stateful: true
     environment:
       - WORDPRESS_DB_PASSWORD=${STACK}_secret
+    secrets: 
+      - secret: WP_ADMIN_PASSWORD
+        name: WORDPRESS_PASSWORD
+        type: env
+      - secret: FOO
+        name: FOOFOO
+        type: env
     instances: 2
     deploy:
       strategy: ha
@@ -18,5 +49,11 @@ services:
       service: mysql
     image: ${MYSQL_IMAGE}
     stateful: true
+    secrets: 
+      - secret: WP_MYSQL_ROOT_PW
+        name: MYSQL_PASSWORD
+        type: env
     environment:
       - INTERNAL_VAR=$$INTERNAL_VAR
+      - RANDOM_VAR=${test_var}
+      - TEST_VAR=$TEST_ENV_VAR

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

@@ -171,7 +171,7 @@ describe Kontena::Cli::Apps::DeployCommand do
             'name' => 'kontena-test-mysql',
             'image' => 'mysql:5.6',
             'env' => ['MYSQL_ROOT_PASSWORD=kontena-test_secret'],
-            'container_count' => nil,
+            'instances' => nil,
             'stateful' => true,
         }
         expect(subject).to receive(:create_service).with(duck_type(:access_token), '1', hash_including(data))
@@ -186,7 +186,7 @@ describe Kontena::Cli::Apps::DeployCommand do
           'name' => 'kontena-test-wordpress',
           'image' => 'wordpress:4.1',
           'env' => ['WORDPRESS_DB_PASSWORD=kontena-test_secret'],
-          'container_count' => 2,
+          'instances' => 2,
           'stateful' => true,
           'strategy' => 'ha',
           'links' => [{ 'name' => 'kontena-test-mysql', 'alias' => 'mysql' }],

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

@@ -7,13 +7,11 @@ describe Kontena::Cli::Stacks::ListCommand do
 
   describe '#execute' do
     it 'requires api url' do
-      expect(subject).to receive(:require_api_url).once
-      subject.run([])
+      expect(subject.class.requires_current_master).to be_truthy
     end
 
     it 'requires token' do
-      expect(subject).to receive(:require_token).and_return(token)
-      subject.run([])
+      expect(subject.class.requires_current_master_token).to be_truthy
     end
 
     it 'fetches stacks from master' do