kontena-cli 1.5.0.pre5 → 1.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a7efe145812b07faaf7db786cfd9f5320f6790b1f687d87d0bf284dd75e13f2
-  data.tar.gz: b69ab9f071460527d24bee50a0429b469728d3fce545c23fbc37faf96105cc5f
+  metadata.gz: b512497470a658b7be3dae937f44e65d8ebc673d867a20e7d5a04bf9dab2b89f
+  data.tar.gz: 8486842c3eba0ee7af57283f108e02fb610a3e83ceb30090e9309fb1eaa3b204
 SHA512:
-  metadata.gz: f1132d851ba291392f713f01b5dd27f4ae9d98afe70e7fb2b3ef1fb00c944e73a73032b7afdcef7e1fedea499dd075cb1aa8936305f0b7e603a674b7adb218bb
-  data.tar.gz: f7bfa592fdf9663608321c79bed54b0feabac4337f6426c3fb07d0a1bcd004cd098c12e29679e4a096d4f8dc1eefedd5a03459971bb9224c72fd7525566a9a37
+  metadata.gz: 41400fae5d6590041c57594981ab97aea90e0e5103c0a0b8ea6215c8d00187259c529786f7230742f347666a525fb1fadfbcf0e6951c6971975e12823a2ba057
+  data.tar.gz: f60a87d8531854e09bea64fd2fa895dff9c6de9c7805ad7497a007910b80ec449d55dd7bed0af81cfacb051ad86dcf65a61ac882ca6a60b1b26151aa566d8d0e

data/VERSION

@@ -1 +1 @@
-1.5.0.pre5
+1.5.0.rc1

data/lib/kontena/callbacks/master/deploy/05_before_deploy_configuration_wizard.rb

@@ -83,13 +83,13 @@ module Kontena
               command.skip_auth_provider = false
             when :custom
               puts
-              puts 'Learn how to configure custom user authentication provider after installation at: www.kontena.io/docs/using-kontena/authentication'
+              puts 'Learn how to configure custom user authentication provider after installation at: www.kontena.io/docs/advanced/authentication'
               puts
               command.cloud_master_id = nil
               command.skip_auth_provider = true
             when :none
               puts
-              puts "You have selected to use Kontena Master in single user mode. You can configure an authentication provider later. For more information, see here: www.kontena.io/docs/using-kontena/authentication"
+              puts "You have selected to use Kontena Master in single user mode. You can configure an authentication provider later. For more information, see here: www.kontena.io/docs/advanced/authentication"
               puts
               command.cloud_master_id = nil
               command.skip_auth_provider = true

data/lib/kontena/cli/services/deploy_command.rb

@@ -7,7 +7,7 @@ module Kontena::Cli::Services
     include ServicesHelper
 
     parameter "NAME", "Service name"
-    option '--[no-]wait', :flag, 'Do not wait for service deployment', default: true
+    option '--[no-]wait', :flag, 'Wait for service deployment to finish', default: true
     option '--force', :flag, 'Force deploy even if service does not have any changes'
 
     def execute

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

@@ -10,7 +10,7 @@ module Kontena::Cli::Stacks
 
     parameter "NAME ...", "Stack name", attribute_name: :names
 
-    option '--[no-]wait', :flag, 'Do not wait for service deployment', default: true
+    option '--[no-]wait', :flag, 'Wait for deployment to finish', default: true
 
     requires_current_master
     requires_current_master_token

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

@@ -20,6 +20,8 @@ module Kontena::Cli::Stacks
     option '--parent-name', '[PARENT_NAME]', "Set parent stack name", hidden: true
     option '--skip-dependencies', :flag, "Do not install any stack dependencies"
 
+    option "--force", :flag, "Force install", default: false, attribute_name: :forced
+
     requires_current_master
     requires_current_master_token
 
@@ -30,6 +32,15 @@ module Kontena::Cli::Stacks
 
       stack # runs validations
 
+      kontena_requirement = stack.dig('metadata', 'required_kontena_version')
+      unless kontena_requirement.nil?
+        master_version = Gem::Version.new(client.server_version)
+        unless Gem::Requirement.new(kontena_requirement).satisfied_by?(master_version)
+          puts "#{pastel.red("Warning: ")} Stack requires kontena version #{kontena_requirement} but Master version is #{master_version}"
+          confirm("Are you sure? You can skip this prompt by running this command with --force option") unless forced?
+        end
+      end
+
       hint_on_validation_notifications(reader.notifications)
       abort_on_validation_errors(reader.errors)
 

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

@@ -0,0 +1,24 @@
+require_relative '../common'
+
+module Kontena::Cli::Stacks::Registry
+  class CreateCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::Stacks::Common
+    include Kontena::Cli::Stacks::Common::RegistryNameParam
+
+    banner "Creates a new Stack to Kontena Stack Registry"
+
+    option '--private', :flag, "Create as private", attribute_name: :is_private
+
+    requires_current_account_token
+
+    def execute
+      exit_with_error "Can't create a stack with a version number" unless stack_name.version.nil?
+      spinner "Creating #{is_private? ? pastel.yellow('private') : 'public'} stack #{pastel.cyan(stack_name)} in Kontena Stack Registry" do
+        stacks_client.create(stack_name, is_private: is_private?)
+      end
+    end
+  end
+end
+
+

data/lib/kontena/cli/stacks/registry/make_private_command.rb

@@ -0,0 +1,24 @@
+require_relative '../common'
+
+module Kontena::Cli::Stacks::Registry
+  class MakePrivateCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::Stacks::Common
+    include Kontena::Cli::Stacks::Common::RegistryNameParam
+
+    banner "Changes Stack visibility private in the Kontena Cloud Stack Registry"
+
+    option '--force', :flag, "Don't ask for confirmation"
+
+    requires_current_account_token
+
+    def execute
+      unless force?
+        confirm("Change stack #{pastel.cyan(stack_name)} visibility to private?")
+      end
+      spinner "Updating Stack #{pastel.cyan(stack_name)} visibility to private" do
+        stacks_client.make_private(stack_name)
+      end
+    end
+  end
+end

data/lib/kontena/cli/stacks/registry/make_public_command.rb

@@ -0,0 +1,24 @@
+require_relative '../common'
+
+module Kontena::Cli::Stacks::Registry
+  class MakePublicCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::Stacks::Common
+    include Kontena::Cli::Stacks::Common::RegistryNameParam
+
+    banner "Changes Stack visibility private in the Kontena Cloud Stack Registry"
+
+    option '--force', :flag, "Don't ask for confirmation"
+
+    requires_current_account_token
+
+    def execute
+      unless force?
+        confirm("Change stack #{pastel.cyan(stack_name)} visibility to public?")
+      end
+      spinner "Updating Stack #{pastel.cyan(stack_name)} visibility to public" do
+        stacks_client.make_public(stack_name)
+      end
+    end
+  end
+end

data/lib/kontena/cli/stacks/registry/pull_command.rb

@@ -14,7 +14,7 @@ module Kontena::Cli::Stacks::Registry
 
     def execute
       target = no_cache? ? stacks_client : Kontena::StacksCache
-      content = target.pull(stack_name.stack_name, stack_name.version)
+      content = target.pull(stack_name)
       if return?
         return content
       elsif file

data/lib/kontena/cli/stacks/registry/push_command.rb

@@ -30,8 +30,7 @@ module Kontena::Cli::Stacks::Registry
       spinner("Pushing #{pastel.cyan(source)} to stack registry as #{loader.stack_name}") do
         unless dry_run?
           stacks_client.push(
-            loader.stack_name.stack_name,
-            loader.stack_name.version,
+            loader.stack_name,
             loader.content
           )
         end

data/lib/kontena/cli/stacks/registry/remove_command.rb

@@ -23,7 +23,7 @@ module Kontena::Cli::Stacks::Registry
         end
       end
       spinner "Removing #{pastel.cyan(stack_name)} from the registry" do
-        stacks_client.destroy(stack_name.stack_name, stack_name.version)
+        stacks_client.destroy(stack_name)
       end
     end
   end

data/lib/kontena/cli/stacks/registry/search_command.rb

@@ -4,25 +4,38 @@ module Kontena::Cli::Stacks::Registry
   class SearchCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::Stacks::Common
+    include Kontena::Cli::TableGenerator::Helper
 
     banner "Search for stacks on the stack registry"
 
     parameter "[QUERY]", "Query string"
 
+    option ['--[no-]pre'], :flag, "Include pre-release versions", default: true
+    option ['--[no-]private'], :flag, "Include private stacks", default: true, attribute_name: :priv
+
+    option ['--tag', '-t'], '[TAG]', "Search by tags", multivalued: true
+
     option ['-q', '--quiet'], :flag, "Output the identifying column only"
 
+    def fields
+      quiet? ? ['name'] : %w(name version pulls description)
+    end
+
     def execute
-      results = stacks_client.search(query.to_s)
-      if quiet?
-        puts results.map { |s| s['stack'] }.join("\n")
-        exit 0
-      end
+      results = stacks_client.search(query.to_s, tags: tag_list, include_prerelease: pre?, include_private: priv?)
       exit_with_error 'Nothing found' if results.empty?
-      titles = ['NAME', 'VERSION', 'DESCRIPTION']
-      columns = "%-40s %-10s %-40s"
-      puts columns % titles
-      results.each do |stack|
-        puts columns % [stack['stack'], stack['version'] || '?', stack['description'] || '-'] if stack
+      print_table(results.map { |r| r['attributes'] }) do |row|
+        next if quiet?
+        row['name'] = '%s/%s' % [row['organization-id'], row['name']]
+        row['name'] = pastel.yellow(row['name']) if row['is-private']
+        if row['latest-version'] && row['latest-version']['version']
+          row['version'] = row['latest-version']['version']
+          row['description'] = row['latest-version']['description']
+        else
+          row['version'] = '?'
+        end
+
+        row['description'] = '-' if row['description'].to_s.empty?
       end
     end
   end

data/lib/kontena/cli/stacks/registry/show_command.rb

@@ -13,19 +13,52 @@ module Kontena::Cli::Stacks::Registry
     requires_current_account_token
 
     def execute
-      require 'semantic'
-      unless versions?
-        stack = ::YAML.safe_load(stacks_client.show(stack_name.stack_name, stack_name.version), [], [], true)
-        puts "#{stack['stack']}:"
-        puts "  #{"latest_" unless stack_name.version}version: #{stack['version']}"
-        puts "  expose: #{stack['expose'] || '-'}"
-        puts "  description: #{stack['description'] || '-'}"
+      versions = stacks_client.versions(stack_name)
 
-        puts "  available_versions:"
-      end
+      if versions?
+        stacks_client.versions(stack_name).each do |version|
+          puts version['attributes']['version']
+        end
+      else
+        data = stacks_client.show(stack_name).dig('data', 'attributes')
+        puts "#{data['organization-id']}/#{data['name']}:"
+        puts "  description: #{data.dig('latest-version', 'description') || '-'}"
+        puts "  latest_version: #{data.dig('latest-version', 'version') || '-'}"
+        puts "  created_at: #{data.dig('created-at')}"
+        puts "  pulls: #{data.dig('pulls')}"
+        puts "  private: #{data.dig('is-private')}"
+        meta = data.dig('latest-version', 'meta')
+        if meta
+          puts "  meta:"
+          readme = meta.delete('readme')
+          meta_lines = YAML.dump(meta).split(/[\r\n]/)
+          meta_lines.shift
+          meta_lines.each do |meta_line|
+            puts "    %s" % meta_line
+          end
+          if readme
+            if readme =~ /^http\S+$/
+              puts "    readme: readme"
+            else
+              puts "    readme: |"
+              readme.gsub!(/(\S{#{70}})(?=\S)/, '\1 ')
+              readme.gsub!(/(.{1,#{70}})(?:\s+|$)/, "\\1\n")
+              readme.gsub!(/^/, '      ')
+              puts readme
+            end
+          end
+        else
+          puts "  meta: -"
+        end
 
-      stacks_client.versions(stack_name.stack_name).reject {|s| s['version'].nil? || s['version'].empty?}.map { |s| Semantic::Version.new(s['version'])}.sort.reverse_each do |version|
-        puts versions? ? version : "    - #{version}"
+        if versions.empty?
+          puts "  versions: -"
+        else
+          puts "  versions:"
+          versions.each do |version|
+            puts "    - #{version['attributes']['version']} (#{version['attributes']['created-at']})"
+          end
+        end
       end
     end
   end

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

@@ -5,5 +5,8 @@ module Kontena::Cli::Stacks
     subcommand ["search"], "Search for stacks in the stacks registry", load_subcommand('stacks/registry/search_command')
     subcommand "show", "Show info about a stack in the stacks registry", load_subcommand('stacks/registry/show_command')
     subcommand ["remove", "rm"], "Remove a stack (or version) from the stacks registry", load_subcommand('stacks/registry/remove_command')
+    subcommand "create", "Create a stack in the registry", load_subcommand('stacks/registry/create_command')
+    subcommand "make-private", "Change Stack visibility to private", load_subcommand('stacks/registry/make_private_command')
+    subcommand "make-public", "Change Stack visibility to public", load_subcommand('stacks/registry/make_public_command')
   end
 end

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

@@ -26,6 +26,10 @@ module Kontena::Cli::Stacks
       @variables ||= stack['variables'] || {}
     end
 
+    def metadata
+      @metadata ||= stack['metadata'] || {}
+    end
+
     def stack
       @stack ||= client.get("stacks/#{current_grid}/#{name}")
     end
@@ -41,7 +45,7 @@ module Kontena::Cli::Stacks
     def write_variables
       File.write(values_to, variable_yaml)
     end
-      
+
     def show_stack
       puts "#{stack['name']}:"
       puts "  created: #{stack['created_at']}"
@@ -51,10 +55,19 @@ module Kontena::Cli::Stacks
       puts "  version: #{stack['version']}"
       puts "  revision: #{stack['revision']}"
       puts "  expose: #{stack['expose'] || '-'}"
+
       puts "  variables:#{' -' if variables.empty?}"
       variables.each do |var, val|
         puts "    #{var}: #{val}"
       end
+
+      puts "  metadata:#{' -' if metadata.empty?}"
+      unless metadata.empty?
+        output_lines = ::YAML.dump(metadata).split(/[\r\n]/)
+        output_lines.shift # get rid of "---"
+        puts output_lines.map { |line| '    %s' % line }.join("\n")
+      end
+
       puts "  parent: #{stack['parent'] ? stack['parent']['name'] : '-'}"
       if stack['children'] && !stack['children'].empty?
         puts "  children:"
@@ -62,6 +75,7 @@ module Kontena::Cli::Stacks
           puts "    - #{child['name']}"
         end
       end
+
       puts "  services:"
       stack['services'].each do |service|
         show_service(service['id'])

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

@@ -33,6 +33,15 @@ module Kontena::Cli::Stacks
         gather_master_data(stack_name)
       end
 
+      kontena_requirement = loader.yaml.dig('meta', 'required_kontena_version')
+      unless kontena_requirement.nil?
+        master_version = Gem::Version.new(client.server_version)
+        unless Gem::Requirement.new(kontena_requirement).satisfied_by?(master_version)
+          puts "#{pastel.red("Warning: ")} Stack requires kontena version #{kontena_requirement} but Master version is #{master_version}"
+          confirm("Are you sure? You can skip this prompt by running this command with --force option") unless force?
+        end
+      end
+
       new_data = spinner "Parsing #{pastel.cyan(source)}" do
         loader.flat_dependencies(
           stack_name,

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

@@ -213,7 +213,9 @@ module Kontena::Cli::Stacks
           result['dependencies']  = dependencies
           result['source']        = raw_content
           result['variables']     = variable_values(without_defaults: true, without_vault: true)
+          result['metadata']      = raw_yaml['meta'] || {}
         end
+
         if parent_name
           result['parent'] = { 'name' => parent_name }
         else

data/lib/kontena/cli/stacks/yaml/stack_file_loader/registry_loader.rb

@@ -6,7 +6,7 @@ module Kontena::Cli::Stacks
       end
 
       def read_content
-        Kontena::StacksCache.pull(source)
+        Kontena::StacksCache.pull(Kontena::Cli::Stacks::StackName.new(source))
       end
 
       def origin

data/lib/kontena/client.rb

@@ -542,6 +542,14 @@ module Kontena
 
       if data.is_a?(Hash) && data.has_key?('error') && data['error'].is_a?(Hash)
         raise Kontena::Errors::StandardErrorHash.new(response.status, response.reason_phrase, data['error'])
+      elsif data.is_a?(Hash) && data.has_key?('errors') && data['errors'].is_a?(Array) && data['errors'].all? { |e| e.is_a?(Hash) }
+        error_with_status = data['errors'].find { |error| error.key?('status') }
+        if error_with_status
+          status = error_with_status['status']
+        else
+          status = response.status
+        end
+        raise Kontena::Errors::StandardErrorHash.new(status, response.reason_phrase, data)
       elsif data.is_a?(Hash) && data.has_key?('error')
         raise Kontena::Errors::StandardError.new(response.status, data['error'] + request_path)
       elsif data.is_a?(String) && !data.empty?

data/lib/kontena/scripts/completer.rb

@@ -292,11 +292,11 @@ begin
                           logs monitor show registry inspect)
         if words[1]
           if words[1] == 'registry' || words[1] == 'reg'
-            registry_sub_commands = %(push pull search show remove)
+            registry_sub_commands = %(push pull search show remove make-public make-private create)
             if words[2]
               if words[2] == 'push'
                 completion.push helper.yml_files(words[3])
-              elsif %w(pull search show remove rm).include?(words[2]) && words[4].nil?
+              elsif %w(pull search show remove rm make-public make-private).include?(words[2]) && words[4].nil?
                 completion.push helper.registry_stacks(words[3].to_s)
               else
                 completion.push registry_sub_commands

data/lib/kontena/stacks_cache.rb

@@ -4,15 +4,10 @@ module Kontena
   class StacksCache
     class CachedStack
 
-      attr_accessor :stack
-      attr_accessor :version
+      attr_reader :stack_name
 
-      def initialize(stack, version = nil)
-        unless version
-          stack, version = stack.split(':', 2)
-        end
-        @stack = stack
-        @version = version
+      def initialize(stack_name)
+        @stack_name = stack_name
       end
 
       def read
@@ -24,7 +19,8 @@ module Kontena
       end
 
       def write(content)
-        raise ArgumentError, "Stack name and version required" unless @stack && @version
+        puts "WHATHAT??? #{stack_name.inspect} #{stack_name.version} #{stack_name.stack_name}"
+        raise ArgumentError, "Stack name and version required" unless stack_name.stack_name && stack_name.version
         unless File.directory?(File.dirname(path))
           require 'fileutils'
           FileUtils.mkdir_p(File.dirname(path))
@@ -37,12 +33,12 @@ module Kontena
       end
 
       def cached?
-        return false unless version
+        return false unless stack_name.version
         File.exist?(path)
       end
 
       def path
-        path = File.expand_path(File.join(base_path, "#{stack}-#{version}.yml"))
+        path = File.expand_path(File.join(base_path, "#{stack_name.stack_name}-#{stack_name.version}.yml"))
         raise "Path traversal attempted" unless path.start_with?(base_path)
         path
       end
@@ -62,39 +58,40 @@ module Kontena
     end
 
     class << self
-      def pull(stack, version = nil)
-        cache(stack, version).read
+      def pull(stack_name)
+        cache(stack_name).read
       end
 
       def dputs(msg)
         Kontena.logger.debug { msg }
       end
 
-      def cache(stack, version = nil)
-        stack = CachedStack.new(stack, version)
+      def cache(stack_name)
+        stack = CachedStack.new(stack_name)
         if stack.cached?
           dputs "Reading from cache: #{stack.path}"
         else
-          dputs "Retrieving #{stack.stack}:#{stack.version} from registry"
-          content = client.pull(stack.stack, stack.version)
-          yaml    = ::YAML.safe_load(content, [], [], true, stack.stack)
-          new_stack = CachedStack.new(yaml['stack'], yaml['version'])
+          dputs "Retrieving #{stack.stack_name} from registry"
+          content = client.pull(stack_name)
+          yaml    = ::YAML.safe_load(content, [], [], true, stack.stack_name.to_s)
+          new_stack_name = Kontena::Cli::Stacks::StackName.new(yaml['stack'], yaml['version'])
+          puts new_stack_name.inspect
+          new_stack = CachedStack.new(new_stack_name)
           if new_stack.cached?
             dputs "Already cached"
             stack = new_stack
           else
-            stack.stack = yaml['stack']
-            stack.version = yaml['version']
             dputs "Writing #{stack.path}"
-            stack.write(content)
-            dputs "#{stack.stack}:#{stack.version} cached to #{stack.path}"
+            new_stack.write(content)
+            dputs "#{new_stack.stack_name} cached to #{new_stack.path}"
+            stack = new_stack
           end
         end
         stack
       end
 
-      def registry_url(stack, version = nil)
-        client.full_uri(stack, version)
+      def registry_url(stack_name)
+        client.full_uri(stack_name)
       end
 
       def client

data/lib/kontena/stacks_client.rb

@@ -3,9 +3,11 @@ require 'kontena/client'
 module Kontena
   class StacksClient < Client
 
-    ACCEPT_JSON = { 'Accept' => 'application/json' }
-    ACCEPT_YAML = { 'Accept' => 'application/yaml' }
-    CT_YAML     = { 'Content-Type' => 'application/yaml' }
+    ACCEPT_JSON    = { 'Accept' => 'application/json' }
+    ACCEPT_YAML    = { 'Accept' => 'application/yaml' }
+    ACCEPT_JSONAPI = { 'Accept' => 'application/vnd.api+json' }
+    CT_YAML        = { 'Content-Type' => 'application/yaml' }
+    CT_JSONAPI     = { 'Content-Type' => 'application/vnd.api+json' }
 
     def raise_unless_token
       unless token && token['access_token']
@@ -20,45 +22,156 @@ module Kontena
       end
     end
 
-    def full_uri(stack_name, version = nil)
-      URI.join(api_url, path_to(stack_name, version)).to_s
+    def full_uri(stack_name)
+      URI.join(api_url, path_to_version(stack_name)).to_s
     end
 
-    def path_to(stack_name, version = nil)
-      version ? "/stack/#{stack_name}/version/#{version}" : "/stack/#{stack_name}"
+    def path_to_version(stack_name)
+      path_to_stack(stack_name) + "/stack-versions/%s" % (stack_name.version || 'latest')
     end
 
-    def push(stack_name, version, data)
+    def path_to_stack(stack_name)
+      "/v2/organizations/%s/stacks/%s" % [stack_name.user, stack_name.stack]
+    end
+
+    def push(stack_name, data)
       raise_unless_token
-      post('/stack/', data, {}, CT_YAML, true)
+      post(
+        '/v2/stack-files',
+        {
+          'data' => {
+            'type' => 'stack-files',
+            'attributes' => { 'content' => data }
+          }
+        },
+        {},
+        CT_JSONAPI,
+        true
+      )
     end
 
-    def show(stack_name, stack_version = nil)
+    def show(stack_name, include_prerelease: true)
       raise_unless_read_token
-      get("#{path_to(stack_name, stack_version)}", nil, ACCEPT_JSON, options[:read_requires_token])
+      result = get("#{path_to_stack(stack_name)}", { 'include' => 'latest-version', 'include-prerelease' => include_prerelease }, ACCEPT_JSONAPI)
+      if result['included']
+        latest = result['included'].find { |i| i['type'] == 'stack-versions' }
+        return result unless latest
+        result['data']['attributes']['latest-version'] = {}
+        result['data']['attributes']['latest-version']['version'] = latest['attributes']['version']
+        result['data']['attributes']['latest-version']['description'] = latest['attributes']['description']
+        result['data']['attributes']['latest-version']['meta'] = latest['meta']
+      end
+      result
     end
 
-    def versions(stack_name)
+    def versions(stack_name, include_prerelease: true, include_deleted: false)
       raise_unless_read_token
-      get("#{path_to(stack_name, nil)}/versions", nil, ACCEPT_JSON, options[:read_requires_token])['versions']
+      get("#{path_to_stack(stack_name)}/stack-versions", { 'include-prerelease' => include_prerelease, 'include-deleted' => include_deleted}, ACCEPT_JSONAPI).dig('data')
     end
 
-    def pull(stack_name, version = nil)
+    def pull(stack_name)
       raise_unless_read_token
-      get(path_to(stack_name, version), nil, ACCEPT_YAML, options[:read_requires_token])
+      get(path_to_version(stack_name) + '/yaml', nil, ACCEPT_YAML)
     rescue StandardError => ex
-      ex.message << " : #{path_to(stack_name, version)}"
+      ex.message << " : #{path_to_version(stack_name)}"
       raise ex, ex.message
     end
 
-    def search(query)
+    def search(query, tags: [], include_prerelease: true, include_private: true, include_versionless: true)
       raise_unless_read_token
-      get('/search', { q: query }, ACCEPT_JSON, options[:read_requires_token])['stacks']
+      if tags.empty?
+        result = get('/v2/stacks', { 'query' => query, 'include' => 'latest-version', 'include-prerelease' => include_prerelease, 'include-private' => include_private, 'include-versionless' => include_versionless }, ACCEPT_JSONAPI)
+      else
+        result = get('/v2/tags/%s/stacks' % tags.join(','), { 'query' => query, 'include' => 'latest-version', 'include-prerelease' => include_prerelease, 'include-private' => include_private }, ACCEPT_JSONAPI)
+      end
+
+      data = result.dig('data')
+      included = result.dig('included')
+      if included
+        data.each do |row|
+          name = '%s/%s' % [row.fetch('attributes', {}).fetch('organization-id'), row.fetch('attributes', {}).fetch('name')]
+          next if name.nil?
+          included_version = included.find { |i| i.fetch('attributes', {}).fetch('name') == name }
+          if included_version
+            row['attributes']['latest-version'] = {}
+            row['attributes']['latest-version']['version'] = included_version['attributes']['version']
+            row['attributes']['latest-version']['description'] = included_version['attributes']['description']
+          end
+        end
+      end
+      data
+    end
+
+    def destroy(stack_name)
+      raise_unless_token
+      if stack_name.version
+        id = stack_version_id(stack_name)
+        if id.nil?
+          raise Kontena::Errors::StandardError.new(404, 'Not found')
+        end
+        delete('/v2/stack-versions/%s' % id, nil, {}, ACCEPT_JSONAPI)
+      else
+        id = stack_id(stack_name)
+        if id.nil?
+          raise Kontena::Errors::StandardError.new(404, 'Not found')
+        end
+        delete('/v2/stacks/%s' % id, nil, {}, ACCEPT_JSONAPI)
+      end
+    end
+
+    def make_private(stack_name)
+      change_visibility(stack_name, is_private: true)
     end
 
-    def destroy(stack_name, version = nil)
+    def make_public(stack_name)
+      change_visibility(stack_name, is_private: false)
+    end
+
+    def create(stack_name, is_private: true)
+      post(
+        '/v2/stacks',
+        stack_data(stack_name, is_private: is_private),
+        {},
+        CT_JSONAPI.merge(ACCEPT_JSONAPI)
+      )
+    end
+
+    private
+
+    def stack_id(stack_name)
+      show(stack_name).dig('data', 'id')
+    end
+
+    def stack_version_id(stack_name)
+      version = versions(stack_name, include_prerelease: true).find { |v| v.dig('attributes', 'version') == stack_name.version }
+      if version
+        version['id']
+      else
+        nil
+      end
+    end
+
+    def change_visibility(stack_name, is_private: true)
       raise_unless_token
-      delete(path_to(stack_name, version), {})
+      put(
+        '/v2/stacks/%s' % stack_id(stack_name),
+        stack_data(stack_name, is_private: is_private),
+        {},
+        CT_JSONAPI.merge(ACCEPT_JSONAPI)
+      )
+    end
+
+    def stack_data(stack_name, is_private: true)
+      {
+        data: {
+          type: 'stacks',
+          attributes: {
+            'name' => stack_name.stack,
+            'organization-id' => stack_name.user,
+            'is-private' => is_private
+          }
+        }
+      }
     end
   end
 end

data/omnibus/wrappers/sh/kontena

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

data/spec/fixtures/kontena_v3_with_metadata.yml

@@ -0,0 +1,28 @@
+stack: user/stackname
+version: 0.1.1
+services:
+  wordpress:
+    extends:
+      file: docker-compose_v2.yml
+      service: wordpress
+    stateful: true
+    environment:
+      WORDPRESS_DB_PASSWORD: ${STACK}_secret
+    instances: 2
+    deploy:
+      strategy: ha
+  mysql:
+    extends:
+      file: docker-compose_v2.yml
+      service: mysql
+    stateful: true
+    environment:
+      - MYSQL_ROOT_PASSWORD=${STACK}_secret
+meta:
+  tags:
+    - tag1
+    - tag2
+  readme: |
+    Text goes
+    here
+  required_kontena_version: ">= 0.5.0"

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

@@ -10,6 +10,7 @@ describe Kontena::Cli::Stacks::InstallCommand do
 
   before(:each) do
     ENV['STACK'] = nil
+    allow(client).to receive(:server_version).and_return(Kontena::Cli::VERSION)
   end
 
   describe '#execute' do
@@ -25,7 +26,8 @@ describe Kontena::Cli::Stacks::InstallCommand do
         'dependencies' => nil,
         'source' => /stack:/,
         'parent' => nil,
-        'expose' => nil
+        'expose' => nil,
+        'metadata' => {}
       }
     end
 
@@ -85,6 +87,29 @@ describe Kontena::Cli::Stacks::InstallCommand do
         subject.run(['-n', 'deptest', '--no-deploy', '-v', 'dep_1.dep_1.dep_var=1', fixture_path('stack-with-dependencies.yml')])
       end
     end
+
+    context 'with a stack including metadata' do
+      let(:stack_meta_expectation) do
+        stack_expectation.merge(
+          'metadata' => hash_including(
+            'tags' => array_including('tag1', 'tag2'),
+            'readme' => /Text goes/,
+            'required_kontena_version' => ">= 0.5.0"
+          )
+        )
+      end
+
+      it 'includes the metadata in the json sent to master' do
+        expect(client).to receive(:post).with('grids/test-grid/stacks', hash_including(stack_meta_expectation))
+        subject.run(['--no-deploy', fixture_path('kontena_v3_with_metadata.yml')])
+      end
+
+      it 'requires force if master version does not match metadata required_kontena_version' do
+        expect(client).to receive(:server_version).and_return('0.2.0')
+        expect(subject).to receive(:confirm).and_call_original
+        expect{subject.run(['--no-deploy', fixture_path('kontena_v3_with_metadata.yml')])}.to exit_with_error.and output(/version/).to_stdout
+      end
+    end
   end
 
   context 'variable value input' do

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

@@ -11,6 +11,7 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
 
   before(:each) do
     ENV['STACK'] = nil
+    allow(client).to receive(:server_version).and_return(Kontena::Cli::VERSION)
   end
 
   describe '#execute' do
@@ -69,6 +70,13 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
       subject.run(['--force', 'stack-a', fixture_path('kontena_v3.yml')])
     end
 
+    it 'requires force if master version does not match metadata required_kontena_version' do
+      expect(client).to receive(:get).with('stacks/test-grid/stack-a').and_return(stack_response)
+      expect(client).to receive(:server_version).and_return('0.2.0')
+      expect(subject).to receive(:confirm).and_call_original
+      expect{subject.run(['--no-deploy', 'stack-a', fixture_path('kontena_v3_with_metadata.yml')])}.to exit_with_error.and output(/version/).to_stdout
+    end
+
     context '--no-deploy option' do
       it 'does not trigger deploy' do
         expect(client).to receive(:get).with('stacks/test-grid/stack-a').and_return(stack_response)
@@ -79,7 +87,6 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
         subject.run(['--no-deploy', '--force', 'stack-a', fixture_path('kontena_v3.yml')])
       end
     end
-
     context 'with a stack including dependencies' do
 
       let(:expectation)     {{ 'name' => 'deptest', 'stack' => 'user/depstack1' }}

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

@@ -61,8 +61,7 @@ describe Kontena::Cli::Stacks::YAML::Reader do
 
     it 'returns result hash' do
       result = subject.execute
-      expect(result).to be_kind_of(Hash)
-      %w(
+      top_level_fields = %w(
         stack
         version
         name
@@ -74,9 +73,9 @@ describe Kontena::Cli::Stacks::YAML::Reader do
         source
         variables
         parent
-      ).each do |k|
-        expect(result.key?(k)).to be_truthy
-      end
+        metadata
+      )
+      expect(result).to match hash_including(*top_level_fields)
     end
 
     context 'when extending services' do
@@ -178,7 +177,9 @@ describe Kontena::Cli::Stacks::YAML::Reader do
         end
 
         it 'extends services from a registry stack' do
-          expect(Kontena::StacksCache).to receive(:pull).at_least(:once).with('registrystack/compose:1.0.0').and_return(File.read(fixture_path('docker-compose_v2.yml')))
+          expect(Kontena::StacksCache).to receive(:pull).at_least(:once) do |stackname|
+            expect(stackname.to_s).to eq 'registrystack/compose:1.0.0'
+          end.and_return(File.read(fixture_path('docker-compose_v2.yml')))
           expect(subject.execute['services']).to match array_including(
             hash_including(
               "instances"=>2,
@@ -332,8 +333,7 @@ describe Kontena::Cli::Stacks::YAML::Reader do
 
         it 'discards empty lines' do
           result = env_file
-          result << '
-    '
+          result << "  \n    \n"
           allow(File).to receive(:readlines).with('.env').and_return(result)
           variables = subject.send(:read_env_file, '.env')
           expect(variables).to eq([

data/spec/kontena/cli/stacks/yaml/stack_file_loader/registry_loader_spec.rb

@@ -23,7 +23,7 @@ describe Kontena::Cli::Stacks::YAML::RegistryLoader do
     let(:subject) { described_class.new('user/stack') }
 
     before do
-      allow(Kontena::StacksCache).to receive(:pull).with('user/stack').and_return(
+      allow(Kontena::StacksCache).to receive(:pull).with(duck_type(:stack_name)).and_return(
         fixture('kontena_v3.yml')
       )
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre5
+  version: 1.5.0.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -407,6 +407,9 @@ files:
 - lib/kontena/cli/stacks/list_command.rb
 - lib/kontena/cli/stacks/logs_command.rb
 - lib/kontena/cli/stacks/monitor_command.rb
+- lib/kontena/cli/stacks/registry/create_command.rb
+- lib/kontena/cli/stacks/registry/make_private_command.rb
+- lib/kontena/cli/stacks/registry/make_public_command.rb
 - lib/kontena/cli/stacks/registry/pull_command.rb
 - lib/kontena/cli/stacks/registry/push_command.rb
 - lib/kontena/cli/stacks/registry/remove_command.rb
@@ -535,6 +538,7 @@ files:
 - spec/fixtures/kontena_build_v3.yml
 - spec/fixtures/kontena_v3.yml
 - spec/fixtures/kontena_v3_with_compose_variables.yml
+- spec/fixtures/kontena_v3_with_metadata.yml
 - spec/fixtures/kontena_v3_with_registry_extends.yml
 - spec/fixtures/stack-internal-extend.yml
 - spec/fixtures/stack-invalid.yml
@@ -718,6 +722,7 @@ test_files:
 - spec/fixtures/kontena_build_v3.yml
 - spec/fixtures/kontena_v3.yml
 - spec/fixtures/kontena_v3_with_compose_variables.yml
+- spec/fixtures/kontena_v3_with_metadata.yml
 - spec/fixtures/kontena_v3_with_registry_extends.yml
 - spec/fixtures/stack-internal-extend.yml
 - spec/fixtures/stack-invalid.yml