kontena-cli 1.2.2 → 1.3.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ba6c6982719bd042e6289125deef78e98718195
-  data.tar.gz: 82bb60f9a2047d1ddc5847edb97803836e31ce5d
+  metadata.gz: 94ab10349d6c3c14f160614a1889a8de25719076
+  data.tar.gz: 5969036b74c54688c2ced991d4ec63c02f84c539
 SHA512:
-  metadata.gz: b880299d9fb59cfbf1bb800dd471411807bb1c170e7f8226781dc2fee1ca8ab4dff42df65c0eee2e628d5965168fa9302d3e1155f59c69abcbf202545249e034
-  data.tar.gz: 52aa18034fac31b990c3b3d4d45eee5512f51681624e5c6f35dfc4ea241b51246d62d99edb26c87990fda5b3d10eae749086a061cc3d666492e209a939b585e1
+  metadata.gz: 8b54fac59b78a266deb4111a1e66841826e43bf41b494f9a63955cb661e9bd5f58c6251625e4f2e8fb62173a975cdc374336d47d4f6368d5076ee1db393da60f
+  data.tar.gz: c488fdc913c0806f16deb27c891064c48141c19fd67944f7b80117f946f6b9ad2a61034772e09837261625dab84469eee9606fbd2626aa15e8840b175b0aafdf

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.3.0.pre1

data/lib/kontena/callbacks/auth/01_list_and_select_grid_after_master_auth.rb

@@ -20,7 +20,7 @@ module Kontena
         return unless command.exit_code == 0
         return unless current_master.grid.nil?
 
-        Kontena.run('grid list --use --verbose')
+        Kontena.run(%w(grid list --use --verbose))
       end
     end
   end

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

@@ -39,7 +39,7 @@ module Kontena
         puts
         puts "You don't seem to be logged in to Kontena Cloud"
         puts
-        Kontena.run("cloud login --verbose")
+        Kontena.run!(%w(cloud login --verbose))
         config.reset_instance
         reset_cloud_client
         result = false

data/lib/kontena/callbacks/master/deploy/50_authenticate_after_deploy.rb

@@ -50,10 +50,15 @@ module Kontena
         end
 
         require 'shellwords'
-        cmd = "master login --no-login-info --skip-grid-auto-select --verbose --name #{command.result[:name].shellescape} --code #{command.result[:code].shellescape} #{new_master.url.shellescape}"
+        cmd = [
+          'master', 'login', '--no-login-info' ,'--skip-grid-auto-select', '--verbose',
+          '--name', command.result[:name],
+          '--code', command.result[:code],
+          new_master.url
+        ]
         Retriable.retriable do
           ENV["DEBUG"] && $stderr.puts("Running: #{cmd}")
-          Kontena.run(cmd)
+          Kontena.run!(cmd)
         end
       end
     end

data/lib/kontena/callbacks/master/deploy/55_create_initial_grid_after_deploy.rb

@@ -11,10 +11,9 @@ module Kontena
         return unless config.current_master
         return unless config.current_master.name == command.result[:name]
 
-        cmd = "grid create --silent test"
-        ENV["DEBUG"] && $stderr.puts("Running: #{cmd}")
+        cmd = %w(grid create --silent test)
         Retriable.retriable do
-          Kontena.run(cmd)
+          Kontena.run!(cmd)
         end
       end
     end

data/lib/kontena/callbacks/master/deploy/56_set_server_provider_after_deploy.rb

@@ -15,8 +15,8 @@ module Kontena
         require 'shellwords'
 
         cmd = ['master', 'config', 'set', "server.provider=#{command.result[:provider]}"]
-        spinner "Setting Master configuration server.provider to '#{command.result[:provider]}'" do
-          Kontena.run(cmd.shelljoin)
+        spinner "Setting Master configuration server.provider to '#{command.result[:provider]}'" do |spin|
+          spin.fail! unless Kontena.run(cmd)
         end
       end
     end

data/lib/kontena/callbacks/master/deploy/60_configure_auth_provider_after_deploy.rb

@@ -8,15 +8,11 @@ module Kontena
 
       def init_cloud_args
         args = []
-        args << '--force' 
+        args << '--force'
         args << "--cloud-master-id #{command.cloud_master_id}" if command.cloud_master_id
         args << "--provider #{command.result[:provider]}" if command.result[:provider]
         args << "--version #{command.result[:version]}" if command.result[:version]
-        args.join(' ')
-      end
-
-      def configure_auth_provider
-        Kontena.run("master init-cloud #{init_cloud_args}")
+        args
       end
 
       def after
@@ -25,11 +21,10 @@ module Kontena
         return unless command.result.has_key?(:name)
         return unless config.current_master
         return unless config.current_master.name == command.result[:name]
-        if command.respond_to?(:skip_auth_provider?) && command.skip_auth_provider?
-          return
-        end
 
-        configure_auth_provider
+        unless command.respond_to?(:skip_auth_provider?) && command.skip_auth_provider?
+          Kontena.run(['master', 'init-cloud'] + init_cloud_args)
+        end
       end
     end
   end

data/lib/kontena/callbacks/master/deploy/70_invite_self_after_deploy.rb

@@ -32,36 +32,30 @@ module Kontena
 
         invite_response = nil
         spinner "Creating user #{cloud_user_data[:email]} into Kontena Master" do |spin|
-          invite_response = Kontena.run(["master", "user", "invite", "--external-id", cloud_user_data[:id], "--return", cloud_user_data[:email]], returning: :result)
-          unless invite_response.kind_of?(Hash) && invite_response.has_key?('invite_code')
-            spin.fail
-          end
+          invite_response = Kontena.run(["master", "user", "invite", "--external-id", cloud_user_data[:id], "--return", cloud_user_data[:email]])
+          spin.fail! unless invite_response.kind_of?(Hash) && invite_response.has_key?('invite_code')
         end
 
         return nil unless invite_response
         ENV["DEBUG"] && $stderr.puts("Got invite code: #{invite_response['invite_code']}")
 
-        role_status = nil
-
-        spinner "Adding master_admin role for #{cloud_user_data[:email]}" do |spin|
-          role_status = Kontena.run(["master", "user", "role", "add", "--silent", "master_admin", cloud_user_data[:email]])
-          spin.fail if role_status.to_i > 0
+        success = spinner "Adding master_admin role for #{cloud_user_data[:email]}" do |spin|
+          spin.fail! unless Kontena.run(["master", "user", "role", "add", "--silent", "master_admin", cloud_user_data[:email]])
+          true
         end
 
-        return nil if role_status.to_i > 0
+        return nil unless success
 
         if current_master.grid
           spinner "Adding #{cloud_user_data[:email]} to grid '#{current_master.grid}'" do |spin|
-            grid_add_status = Kontena.run(["grid", "user", "add", "--grid", current_master.grid, cloud_user_data[:email]])
-            spin.fail if grid_add_status.to_i > 0
+            spin.fail! unless Kontena.run(["grid", "user", "add", "--grid", current_master.grid, cloud_user_data[:email]])
           end
         end
 
-        return unless current_master.username.to_s == 'admin'
+        return nil unless current_master.username.to_s == 'admin'
 
-        new_user_token = nil
-        spinner "Creating an access token for #{cloud_user_data[:email]}" do |spin|
-          new_user_token = Kontena.run(["master", "token", "create", "-e", "0", "-s", "user", "--return", "-u", cloud_user_data[:email]], returning: :result)
+        new_user_token = spinner "Creating an access token for #{cloud_user_data[:email]}" do |spin|
+          Kontena.run!(["master", "token", "create", "-e", "0", "-s", "user", "--return", "-u", cloud_user_data[:email]])
         end
 
         master_name = current_master.name.dup

data/lib/kontena/cli/app_command.rb

@@ -1,6 +1,8 @@
 
 class Kontena::Cli::AppCommand < Kontena::Command
 
+  warn Kontena.pastel.yellow("[DEPRECATED] The `kontena app` commands are deprecated in favor of `kontena stack` commands and will be removed in future releases")
+
   subcommand "init", "Init Kontena application", load_subcommand('apps/init_command')
   subcommand "build", "Build Kontena services", load_subcommand('apps/build_command')
   subcommand "config", "View service configurations", load_subcommand('apps/config_command')

data/lib/kontena/cli/cloud/master/add_command.rb

@@ -47,7 +47,7 @@ module Kontena::Cli::Cloud::Master
       masters = []
       spinner "Retrieving a list of your registered Kontena Masters in Kontena Cloud" do |spin|
         begin
-          masters = Kontena.run("cloud master list --return", returning: :result)
+          masters = Kontena.run!(%w(cloud master list --return))
         rescue SystemExit
           spin.fail
         end
@@ -96,12 +96,12 @@ module Kontena::Cli::Cloud::Master
         end
         if response && response.kind_of?(Hash) && response.has_key?('data') && response['data']['attributes']
           if (self.provider && response['data']['attributes']['provider'] != self.provider) || (self.version && response['data']['attributes']['version'] != self.version)
-            spinner "Updating provider and version attributes to Kontena Cloud master" do
+            spinner "Updating provider and version attributes to Kontena Cloud master" do |spin|
               args = []
-              args << "--provider #{self.provider.shellescape}" if self.provider
-              args << "--version #{self.version.shellescape}" if self.version
+              args += ['--provider', self.provider] if self.provider
+              args += ['--version', self.version] if self.version
               args << self.cloud_master_id
-              Kontena.run("cloud master update #{args.join(' ')}")
+              spin.fail! unless Kontena.run(['cloud', 'master', 'update'] + args)
             end
           end
         end
@@ -111,18 +111,27 @@ module Kontena::Cli::Cloud::Master
         end
       end
 
-      spinner "Loading Kontena Cloud auth provider base configuration to Kontena Master" do
-        Kontena.run('master config import --force --preset kontena_auth_provider')
+      spinner "Loading Kontena Cloud auth provider base configuration to Kontena Master" do |spin|
+        spin.fail! unless Kontena.run(%w(master config import --force --preset kontena_auth_provider))
       end
 
-      spinner "Updating OAuth2 client-id and client-secret to Kontena Master" do
-        Kontena.run("master config set oauth2.client_id=#{response['data']['attributes']['client-id'].shellescape} oauth2.client_secret=#{response['data']['attributes']['client-secret'].shellescape} server.root_url=#{current_master.url.shellescape} server.name=#{current_master.name.shellescape} cloud.provider_is_kontena=true")
+      spinner "Updating OAuth2 client-id and client-secret to Kontena Master" do |spin|
+        spin.fail! unless Kontena.run(
+          [
+            'master', 'config', 'set',
+            "oauth2.client_id=#{response['data']['attributes']['client-id'].shellescape}",
+            "oauth2.client_secret=#{response['data']['attributes']['client-secret'].shellescape}",
+            "server.root_url=#{current_master.url.shellescape}",
+            "server.name=#{current_master.name.shellescape}",
+            "cloud.provider_is_kontena=true"
+          ]
+        )
       end
     end
 
     def execute
       unless cloud_client.authentication_ok?(kontena_account.userinfo_endpoint)
-        Kontena.run('cloud login')
+        Kontena.run!(%w(cloud login))
         config.reset_instance
         reset_cloud_client
       end

data/lib/kontena/cli/common.rb

@@ -296,44 +296,14 @@ module Kontena
       def any_key_to_continue_with_timeout(timeout=9)
         return nil if running_silent?
         return nil unless $stdout.tty?
-        start_time = Time.now.to_i
-        end_time   = start_time + timeout
-        Thread.main['any_key.timed_out']   = false
-        msg = "Press any key to continue or ctrl-c to cancel.. (Automatically continuing in ? seconds)"
-
-        reader_thread = Thread.new do
-          Thread.main['any_key.char'] = $stdin.getch
-        end
-
-        countdown_thread = Thread.new do
-          time_left = timeout
-          while time_left > 0 && Thread.main['any_key.char'].nil?
-            print "\r#{pastel.bright_white("#{msg.sub("?", time_left.to_s)}")} "
-            time_left = end_time - Time.now.to_i
-            sleep 0.1
-          end
-          print "\r#{' ' * msg.length}  \r"
-          reader_thread.kill if reader_thread.alive?
-        end
-
-        countdown_thread.join
-
-        if Thread.main['any_key.char'] == "\u0003"
-          error "Canceled"
-        end
+        prompt.keypress("Press any key to continue or ctrl-c to cancel (Automatically continuing in :countdown seconds) ...", timeout: timeout)
       end
 
       def any_key_to_continue(timeout = nil)
         return nil if running_silent?
         return nil unless $stdout.tty?
         return any_key_to_continue_with_timeout(timeout) if timeout
-        msg = "Press any key to continue or ctrl-c to cancel.. "
-        print pastel.bright_cyan("#{msg}")
-        char = $stdin.getch
-        print "\r#{' ' * msg.length}\r"
-        if char == "\u0003"
-          error "Canceled"
-        end
+        prompt.keypress("Press any key to continue or ctrl-c to cancel..")
       end
 
       def display_account_login_info

data/lib/kontena/cli/grids/trusted_subnets/add_command.rb

@@ -1,17 +1,17 @@
 module Kontena::Cli::Grids::TrustedSubnets
   class AddCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
-    parameter "NAME", "Grid name"
     parameter "SUBNET", "Trusted subnet"
 
+    requires_current_master
+
     def execute
-      require_api_url
-      token = require_token
-      grid = client(token).get("grids/#{name}")
+      grid = client.get("grids/#{current_grid}")
       data = {trusted_subnets: grid['trusted_subnets'] + [self.subnet]}
-      spinner "Adding #{subnet.colorize(:cyan)} as a trusted subnet in #{name.colorize(:cyan)} grid " do
-        client(token).put("grids/#{name}", data)
+      spinner "Adding #{subnet.colorize(:cyan)} as a trusted subnet in #{current_grid.colorize(:cyan)} grid " do
+        client.put("grids/#{current_grid}", data)
       end
     end
   end

data/lib/kontena/cli/grids/trusted_subnets/list_command.rb

@@ -1,13 +1,12 @@
 module Kontena::Cli::Grids::TrustedSubnets
   class ListCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
-    parameter "NAME", "Grid name"
+    requires_current_master
 
     def execute
-      require_api_url
-      token = require_token
-      grid = client(token).get("grids/#{current_grid}")
+      grid = client.get("grids/#{current_grid}")
       trusted_subnets = grid['trusted_subnets'] || []
       trusted_subnets.each do |subnet|
         puts subnet

data/lib/kontena/cli/grids/trusted_subnets/remove_command.rb

@@ -1,23 +1,23 @@
 module Kontena::Cli::Grids::TrustedSubnets
   class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
-    parameter "NAME", "Grid name"
     parameter "SUBNET", "Trusted subnet"
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
+    requires_current_master
+
     def execute
-      require_api_url
-      token = require_token
-      grid = client(token).get("grids/#{name}")
+      grid = client.get("grids/#{current_grid}")
       confirm_command(subnet) unless forced?
       trusted_subnets = grid['trusted_subnets'] || []
       unless trusted_subnets.delete(self.subnet)
-        exit_with_error("Grid #{name.colorize(:cyan)} does not have trusted subnet #{subnet.colorize(:cyan)}")
+        exit_with_error("Grid #{current_grid.colorize(:cyan)} does not have trusted subnet #{subnet.colorize(:cyan)}")
       end
       data = {trusted_subnets: trusted_subnets}
-      spinner "Removing trusted subnet #{subnet.colorize(:cyan)} from #{name.colorize(:cyan)} grid " do
-        client(token).put("grids/#{name}", data)
+      spinner "Removing trusted subnet #{subnet.colorize(:cyan)} from #{current_grid.colorize(:cyan)} grid " do
+        client.put("grids/#{current_grid}", data)
       end
     end
   end

data/lib/kontena/cli/master/create_command.rb

@@ -66,9 +66,8 @@ module Kontena::Cli::Master
           end
         end
       end
-      command = cmd_class.to_s[/Plugin::(.+?)::/, 1].downcase
-      command << " master create #{options.join(" ")}"
-      Kontena.run(command)
+      cmd = [cmd_class.to_s[/Plugin::(.+?)::/, 1].downcase, 'master', 'create'] + options
+      Kontena.run!(cmd)
     end
   end
 

data/lib/kontena/cli/master/init_cloud_command.rb

@@ -20,7 +20,7 @@ module Kontena::Cli::Master
       args += ["--cloud-master-id", self.cloud_master_id.shellescape] if self.cloud_master_id
       args += ["--provider", self.provider.shellescape] if self.provider
       args += ["--version", self.version.shellescape] if self.version
-      Kontena.run("cloud master add #{args.join(' ')}")
+      Kontena.run!(['cloud', 'master', 'add'] + args)
     end
   end
 end

data/lib/kontena/cli/master/join_command.rb

@@ -14,7 +14,9 @@ module Kontena::Cli::Master
       params << "--name #{self.name.shellescape}" if self.name
       params << "--verbose" if self.verbose?
 
-      Kontena.run("master login #{params.join(' ')} #{self.url.shellescape}")
+      cmd = ['master', 'login'] + params
+      cmd << url
+      Kontena.run!(cmd)
     end
   end
 end

data/lib/kontena/cli/master/ssh_command.rb

@@ -16,20 +16,17 @@ module Kontena::Cli::Master
     end
 
     def master_provider
-      Kontena.run('master config get --return server.provider', returning: :result)
+      Kontena.run!(%w(master config get --return server.provider))
     end
 
     def execute
-
-      commands_list.insert('--') unless commands_list.empty?
-
       if master_provider == 'vagrant'
         unless Kontena::PluginManager.instance.plugins.find { |plugin| plugin.name == 'kontena-plugin-vagrant' }
           exit_with_error 'You need to install vagrant plugin to ssh into this node. Use kontena plugin install vagrant'
         end
         cmd = ['vagrant', 'master', 'ssh']
         cmd += commands_list
-        Kontena.run(cmd)
+        Kontena.run!(cmd)
       else
         cmd = ['ssh']
         cmd << "#{user}@#{master_host}"
@@ -40,4 +37,3 @@ module Kontena::Cli::Master
     end
   end
 end
-

data/lib/kontena/cli/master/token/current_command.rb

@@ -33,7 +33,7 @@ module Kontena::Cli::Master::Token
         exit 0
       end
 
-      Kontena.run("master token show #{current_master.token.access_token}")
+      Kontena.run!(['master', 'token', 'show',  current_master.token.access_token])
     end
   end
 end

data/lib/kontena/cli/master/user/invite_command.rb

@@ -39,11 +39,11 @@ module Kontena::Cli::Master::User
             puts "  * command: kontena master join #{current_master.url} #{response['invite_code']}"
           end
           roles.each do |role|
-            Kontena.run(["master", "user", "role", "add", role, email])
+            raise "Failed to add role" unless Kontena.run(["master", "user", "role", "add", role, email])
           end
         rescue => ex
-          $stderr.puts pastel.red("Failed to invite #{email}")
           ENV["DEBUG"] && $stderr.puts("#{ex} : #{ex.message}\n#{ex.backtrace.join("\n  ")}")
+          exit_with_error "Failed to invite #{email} : #{ex.message}"
         end
       end
     end

data/lib/kontena/cli/master/user_command.rb

@@ -1,5 +1,3 @@
-require 'kontena/cli/master/user_command'
-
 module Kontena::Cli::Master
   class UserCommand < Kontena::Command
     subcommand "invite", "Invite user to Kontena Master", load_subcommand('master/user/invite_command')

data/lib/kontena/cli/nodes/ssh_command.rb

@@ -28,14 +28,12 @@ module Kontena::Cli::Nodes
 
       provider = Array(node["labels"]).find{ |l| l.start_with?('provider=')}.to_s.split('=').last
 
-      commands_list.insert('--') unless commands_list.empty?
-
       if provider == 'vagrant'
         unless Kontena::PluginManager.instance.plugins.find { |plugin| plugin.name == 'kontena-plugin-vagrant' }
           exit_with_error 'You need to install vagrant plugin to ssh into this node. Use kontena plugin install vagrant'
         end
         cmd = ['vagrant', 'node', 'ssh', node['name']] + commands_list
-        Kontena.run(cmd)
+        Kontena.run!(cmd)
       else
         cmd = ['ssh']
         cmd += ["-i", identity_file] if identity_file

data/lib/kontena/cli/stack_command.rb

@@ -11,6 +11,8 @@ class Kontena::Cli::StackCommand < Kontena::Command
   subcommand "build", "Build images listed in a stack file and push them to an image registry", load_subcommand('stacks/build_command')
   subcommand ["reg", "registry"], "Stack registry related commands", load_subcommand('stacks/registry_command')
   subcommand "validate", "Process and validate a stack file", load_subcommand('stacks/validate_command')
+  subcommand "stop", "Stop stacks services", load_subcommand('stacks/stop_command')
+  subcommand "restart", "Restart stacks services", load_subcommand('stacks/restart_command')
 
   def execute
   end

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

@@ -154,7 +154,7 @@ module Kontena::Cli::Stacks
 
     def stacks_client
       return @stacks_client if @stacks_client
-      Kontena.run('cloud login') unless cloud_auth?
+      Kontena.run!(%w(cloud login)) unless cloud_auth?
       config.reset_instance
       @stacks_client = Kontena::StacksClient.new(kontena_account.stacks_url, kontena_account.token)
     end

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

@@ -26,7 +26,7 @@ module Kontena::Cli::Stacks
       spinner "Creating stack #{pastel.cyan(stack['name'])} " do
         create_stack(stack)
       end
-      Kontena.run("stack deploy #{stack['name']}") if deploy?
+      Kontena.run!(['stack', 'deploy', stack['name']]) if deploy?
     end
 
     def create_stack(stack)

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

@@ -0,0 +1,23 @@
+require_relative 'common'
+
+module Kontena::Cli::Stacks
+  class RestartCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Common
+
+    banner "Restarts all services of a stack that has been installed in a grid on Kontena Master"
+
+    parameter "NAME", "Stack name"
+
+    requires_current_master
+    requires_current_master_token
+
+    def execute
+      spinner "Sending restart signal for stack services" do
+        client.post("stacks/#{current_grid}/#{name}/restart", {})
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,23 @@
+require_relative 'common'
+
+module Kontena::Cli::Stacks
+  class StopCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Common
+
+    banner "Stops all services of a stack that has been installed in a grid on Kontena Master"
+
+    parameter "NAME", "Stack name"
+
+    requires_current_master
+    requires_current_master_token
+
+    def execute
+      spinner "Sending stop signal for stack services" do
+        client.post("stacks/#{current_grid}/#{name}/stop", {})
+      end
+    end
+
+  end
+end

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

@@ -37,7 +37,7 @@ module Kontena::Cli::Stacks
         update_stack(stack) || spin.fail!
       end
 
-      Kontena.run(['stack', 'deploy', name]) if deploy?
+      Kontena.run!(['stack', 'deploy', name]) if deploy?
     end
 
     def update_stack(stack)

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

@@ -43,7 +43,7 @@ module Kontena::Cli::Stacks::YAML
               )
             end
           elsif value.is_a?(Array)
-            value.all? { |v| v.kind_of?(String) && v =~ /\A\S+(?<!\\)=.*/ }
+            value.all? { |v| v.kind_of?(String) && v =~ /\A[^=]+=/ }
           else
             false
           end

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

@@ -13,8 +13,8 @@ module Kontena::Cli::Vault
       require 'shellwords'
       meth = json? ? :to_json : :to_yaml
       puts Hash[
-        *Kontena.run('vault ls --return', returning: :result).sort.flat_map do |secret|
-          [secret, Kontena.run("vault read --return #{secret.shellescape}", returning: :result)]
+        *Kontena.run!(['vault', 'ls', '--return']).sort.flat_map do |secret|
+          [secret, Kontena.run!(['vault', 'read', '--return', secret])]
         end
       ].send(meth)
     end

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

@@ -14,10 +14,6 @@ module Kontena::Cli::Vault
 
     requires_current_master
 
-    UPDATE_CMD = 'vault update --upsert --silent %{key} %{value}'
-    DELETE_CMD = 'vault rm --silent --force %{key}'
-
-
     def parsed_input
       json? ? JSON.load(input) : YAML.safe_load(input)
     end
@@ -60,18 +56,16 @@ module Kontena::Cli::Vault
 
       unless updates.empty?
         spinner "Updating #{updates.size} secrets" do |spin|
-          updates.each do |pair|
-            result = Kontena.run(UPDATE_CMD % { key: pair.first.shellescape, value: pair.last.shellescape })
-            spin.fail! unless result.zero?
+          updates.each do |key_value_pair|
+            spin.fail! unless Kontena.run(['vault', 'update', '--upsert', '--silent'] + key_value_pair)
           end
         end
       end
 
       unless deletes.empty? || skip_null?
         spinner "Deleting #{deletes.size} secrets" do |spin|
-          deletes.map(&:shellescape).each do |del|
-            result = Kontena.run(DELETE_CMD % { key: del })
-            spin.fail! unless result.zero?
+          deletes.map(&:shellescape).each do |key_to_delete|
+            spin.fail! unless Kontena.run(['vault', 'rm', '--silent', '--force', key_to_delete])
           end
         end
       end

data/lib/kontena/main_command.rb

@@ -51,6 +51,6 @@ class Kontena::MainCommand < Kontena::Command
   end
 
   def known_plugin_subcommand?(name)
-    ['vagrant', 'packet', 'digitalocean', 'azure', 'upcloud', 'aws'].include?(name)
+    ['vagrant', 'packet', 'digitalocean', 'azure', 'upcloud', 'aws', 'shell'].include?(name)
   end
 end