kontena-cli 0.10.3 → 0.11.0

data/lib/kontena/cli/logout_command.rb

@@ -2,7 +2,6 @@ class Kontena::Cli::LogoutCommand < Clamp::Command
   include Kontena::Cli::Common
 
   def execute
-    settings['server'].delete('token')
-    save_settings
+    self.access_token = nil
   end
 end

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

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Kontena::Cli::Master::Aws
   class CreateCommand < Clamp::Command
     include Kontena::Cli::Common
@@ -12,6 +14,8 @@ module Kontena::Cli::Master::Aws
     option "--subnet-id", "SUBNET ID", "VPC option to specify subnet to launch instance into"
     option "--type", "SIZE", "Instance type", default: 't2.small'
     option "--storage", "STORAGE", "Storage size (GiB)", default: '30'
+    option "--vault-secret", "VAULT_SECRET", "Secret key for Vault"
+    option "--vault-iv", "VAULT_IV", "Initialization vector for Vault"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
     option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url"
 
@@ -28,7 +32,9 @@ module Kontena::Cli::Master::Aws
           storage: storage,
           version: version,
           key_pair: key_pair,
-          auth_server: auth_provider_url
+          auth_server: auth_provider_url,
+          vault_secret: vault_secret || SecureRandom.hex(24),
+          vault_iv: vault_iv || SecureRandom.hex(24)
       )
     end
   end

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

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Kontena::Cli::Master::Azure
   class CreateCommand < Clamp::Command
     include Kontena::Cli::Common
@@ -11,6 +13,8 @@ module Kontena::Cli::Master::Azure
     option "--password", "PASSWORD", "Password"
     option "--location", "LOCATION", "Location", default: 'West Europe'
     option "--ssl-cert", "SSL CERT", "SSL certificate file"
+    option "--vault-secret", "VAULT_SECRET", "Secret key for Vault"
+    option "--vault-iv", "VAULT_IV", "Initialization vector for Vault"
     option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
@@ -26,7 +30,9 @@ module Kontena::Cli::Master::Azure
           subnet: subnet,
           location: location,
           auth_server: auth_provider_url,
-          version: version
+          version: version,
+          vault_secret: vault_secret || SecureRandom.hex(24),
+          vault_iv: vault_iv || SecureRandom.hex(24)
       )
     end
   end

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

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Kontena::Cli::Master::DigitalOcean
   class CreateCommand < Clamp::Command
     include Kontena::Cli::Common
@@ -7,6 +9,8 @@ module Kontena::Cli::Master::DigitalOcean
     option "--ssl-cert", "SSL CERT", "SSL certificate file"
     option "--size", "SIZE", "Droplet size", default: '1gb'
     option "--region", "REGION", "Region", default: 'ams2'
+    option "--vault-secret", "VAULT_SECRET", "Secret key for Vault"
+    option "--vault-iv", "VAULT_IV", "Initialization vector for Vault"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
     option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url"
 
@@ -23,6 +27,8 @@ module Kontena::Cli::Master::DigitalOcean
           region: region,
           version: version,
           auth_server: auth_provider_url,
+          vault_secret: vault_secret || SecureRandom.hex(24),
+          vault_iv: vault_iv || SecureRandom.hex(24)
       )
     end
 

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

@@ -0,0 +1,18 @@
+module Kontena::Cli::Master
+  class ListCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    def execute
+      puts '%-24s %-30s' % ['Name', 'Url']
+      current_server = settings['current_server']
+      settings['servers'].each do |server|
+        if server['name'] == current_server
+          name = "* #{server['name']}"
+        else
+          name = server['name']
+        end
+        puts '%-24s %-30s' % [name, server['url']]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Kontena::Cli::Master
+  class UseCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "NAME", "Master name to use"
+
+    def execute
+      master = find_master_by_name(name)
+      if !master.nil?
+        self.current_master = master['name']
+        puts "Using master: #{master['name'].cyan}"
+        puts "URL: #{master['url'].cyan}"
+      else
+        abort "Could not resolve master by name [#{name}]. For a list of known masters please run: kontena master list".colorize(:red)
+      end
+    end
+
+    def find_master_by_name(name)
+      settings['servers'].each do |server|
+        return server if server['name'] == name
+      end
+    end
+
+  end
+
+end

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

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Kontena::Cli::Master::Vagrant
   class CreateCommand < Clamp::Command
     include Kontena::Cli::Common
@@ -5,6 +7,8 @@ module Kontena::Cli::Master::Vagrant
     option "--memory", "MEMORY", "How much memory node has", default: '512'
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
     option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url"
+    option "--vault-secret", "VAULT_SECRET", "Secret key for Vault"
+    option "--vault-iv", "VAULT_IV", "Initialization vector for Vault"
 
     def execute
       require 'kontena/machine/vagrant'
@@ -12,7 +16,9 @@ module Kontena::Cli::Master::Vagrant
       provisioner.run!(
         memory: memory,
         version: version,
-        auth_server: auth_provider_url
+        auth_server: auth_provider_url,
+        vault_secret: vault_secret || SecureRandom.hex(24),
+        vault_iv: vault_iv || SecureRandom.hex(24)
       )
     end
   end

data/lib/kontena/cli/master_command.rb

@@ -2,6 +2,8 @@ require_relative 'master/vagrant_command'
 require_relative 'master/aws_command'
 require_relative 'master/digital_ocean_command'
 require_relative 'master/azure_command'
+require_relative 'master/use_command'
+require_relative 'master/list_command'
 
 class Kontena::Cli::MasterCommand < Clamp::Command
 
@@ -9,6 +11,8 @@ class Kontena::Cli::MasterCommand < Clamp::Command
   subcommand "aws", "AWS specific commands", Kontena::Cli::Master::AwsCommand
   subcommand "digitalocean", "DigitalOcean specific commands", Kontena::Cli::Master::DigitalOceanCommand
   subcommand "azure", "Azure specific commands", Kontena::Cli::Master::AzureCommand
+  subcommand ["list", "ls"], "List masters where client has logged in", Kontena::Cli::Master::ListCommand
+  subcommand "use", "Switch to use selected master", Kontena::Cli::Master::UseCommand
 
   def execute
   end

data/lib/kontena/cli/node_command.rb

@@ -15,7 +15,7 @@ class Kontena::Cli::NodeCommand < Clamp::Command
   subcommand "show", "Show node", Kontena::Cli::Nodes::ShowCommand
   subcommand "ssh", "Ssh into node", Kontena::Cli::Nodes::SshCommand
   subcommand "update", "Update node", Kontena::Cli::Nodes::UpdateCommand
-  subcommand "remove", "Remove node", Kontena::Cli::Nodes::RemoveCommand
+  subcommand ["remove","rm"], "Remove node", Kontena::Cli::Nodes::RemoveCommand
 
   subcommand "vagrant", "Vagrant specific commands", Kontena::Cli::Nodes::VagrantCommand
   subcommand "digitalocean", "DigitalOcean specific commands", Kontena::Cli::Nodes::DigitalOceanCommand

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

@@ -2,26 +2,52 @@ module Kontena::Cli::Nodes
   class ListCommand < Clamp::Command
     include Kontena::Cli::Common
 
+    option ["--all"], :flag, "List nodes for all grids", default: false
+
     def execute
       require_api_url
       require_current_grid
       token = require_token
 
-      grids = client(token).get("grids/#{current_grid}/nodes")
-      puts "%-30s %-40s %-15s %-30s %-10s" % ['Name', 'OS', 'Driver', 'Labels', 'Status']
-      grids['nodes'].each do |node|
-        if node['connected']
-          status = 'online'
-        else
-          status = 'offline'
+      if all?
+        grids = client(token).get("grids")
+        puts "%-30s %-30s %-40s %-15s %-30s %-10s" % [ 'Grid', 'Name', 'OS', 'Driver', 'Labels', 'Status']
+
+        grids['grids'].each do |grid|
+          nodes = client(token).get("grids/#{grid['name']}/nodes")
+          nodes['nodes'].each do |node|
+            if node['connected']
+              status = 'online'
+            else
+              status = 'offline'
+            end
+            puts "%-30.30s %-30.30s %-40.40s %-15s %-30.30s %-10s" % [
+              grid['name'],
+              node['name'],
+              "#{node['os']} (#{node['kernel_version']})",
+              node['driver'],
+              (node['labels'] || ['-']).join(","),
+              status
+            ]
+          end
+        end
+      else
+        nodes = client(token).get("grids/#{current_grid}/nodes")
+        puts "%-30s %-40s %-15s %-30s %-10s" % ['Name', 'OS', 'Driver', 'Labels', 'Status']
+        nodes['nodes'].each do |node|
+          if node['connected']
+            status = 'online'
+          else
+            status = 'offline'
+          end
+          puts "%-30.30s %-40.40s %-15s %-30.30s %-10s" % [
+            node['name'],
+            "#{node['os']} (#{node['kernel_version']})",
+            node['driver'],
+            (node['labels'] || ['-']).join(","),
+            status
+          ]
         end
-        puts "%-30.30s %-40.40s %-15s %-30.30s %-10s" % [
-          node['name'],
-          "#{node['os']} (#{node['kernel_version']})",
-          node['driver'],
-          (node['labels'] || ['-']).join(","),
-          status
-        ]
       end
     end
   end

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

@@ -31,6 +31,7 @@ module Kontena::Cli::Services
     option "--deploy-wait-for-port", "PORT", "Wait for port to respond when deploying"
     option "--deploy-min-health", "FLOAT", "The minimum percentage (0.0 - 1.0) of healthy instances that do not sacrifice overall service availability while deploying"
     option "--pid", "PID", "Pid namespace to use"
+    option "--secret", "SECRET", "Import secret from Vault", multivalued: true
 
     def execute
       require_api_url
@@ -58,6 +59,7 @@ module Kontena::Cli::Services
       data[:cpu_shares] = cpu_shares if cpu_shares
       data[:affinity] = affinity_list unless affinity_list.empty?
       data[:env] = env_list unless env_list.empty?
+      data[:secrets] = parse_secrets(secret_list)
       data[:container_count] = instances if instances
       data[:cmd] = cmd.split(" ") if cmd
       data[:user] = user if user

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

@@ -1,5 +1,6 @@
 require 'kontena/client'
 require_relative '../common'
+require 'shell-spinner'
 
 module Kontena
   module Cli
@@ -78,6 +79,15 @@ module Kontena
             end
           end
 
+          if service['secrets'].to_a.size > 0
+            puts "  secrets: "
+            service['secrets'].to_a.each do |s|
+              puts "    - secret: #{s['secret']}"
+              puts "      secret: #{s['name']}"
+              puts "      type: #{s['type']}"
+            end
+          end
+
           if service['env'].to_a.size > 0
             puts "  env: "
             service['env'].to_a.each do |e|
@@ -175,6 +185,16 @@ module Kontena
           client(token).post("services/#{param}/deploy", data)
         end
 
+        # @param [String] token
+        # @param [String] name
+        def wait_for_deploy_to_finish(token, name)
+          ShellSpinner " " do
+            until client(token).get("services/#{name}")['state'] != 'deploying' do
+              sleep 1
+            end
+          end
+        end
+
         # @param [String] token
         # @param [String] service_id
         def start_service(token, service_id)
@@ -272,6 +292,17 @@ module Kontena
           end
           opts
         end
+
+        # @param [Array<String>] secret_opts
+        # @return [Array<Hash>]
+        def parse_secrets(secret_opts)
+          secrets = []
+          secret_opts.each do |s|
+            secret, name, type = s.split(':')
+            secrets << {secret: secret, name: name, type: type}
+          end
+          secrets
+        end
       end
     end
   end

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

@@ -28,7 +28,7 @@ module Kontena::Cli::Services
     option "--deploy-wait-for-port", "PORT", "Wait for port to respond when deploying"
     option "--deploy-min-health", "FLOAT", "The minimum percentage (0.0 - 1.0) of healthy instances that do not sacrifice overall service availability while deploying"
     option "--pid", "PID", "Pid namespace to use"
-
+    option "--secret", "SECRET", "Import secret from Vault", multivalued: true
 
     def execute
       require_api_url
@@ -51,6 +51,7 @@ module Kontena::Cli::Services
       data[:cpu_shares] = cpu_shares if cpu_shares
       data[:affinity] = affinity_list unless affinity_list.empty?
       data[:env] = env_list unless env_list.empty?
+      data[:secrets] = parse_secrets(secret_list)
       data[:container_count] = instances if instances
       data[:cmd] = cmd.split(" ") if cmd
       data[:user] = user if user

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

@@ -0,0 +1,15 @@
+module Kontena::Cli::Vault
+  class ListCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    def execute
+      require_api_url
+      token = require_token
+      result = client(token).get("grids/#{current_grid}/secrets")
+      puts '%-30.30s %-30.30s' % ['NAME', 'CREATED AT']
+      result['secrets'].each do |secret|
+        puts '%-30.30s %-30.30s' % [secret['name'], secret['created_at']]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Kontena::Cli::Vault
+  class ReadCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "NAME", "Secret name"
+
+    def execute
+      require_api_url
+      token = require_token
+      result = client(token).get("secrets/#{current_grid}/#{name}")
+      puts "#{result['name']}:"
+      puts "  created_at: #{result['created_at']}"
+      puts "  value: #{result['value']}"
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Kontena::Cli::Vault
+  class RemoveCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "NAME", "Secret name"
+
+    def execute
+      require_api_url
+      token = require_token
+      client(token).delete("secrets/#{current_grid}/#{name}")
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Kontena::Cli::Vault
+  class WriteCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter 'NAME', 'Secret name'
+    parameter '[VALUE]', 'Secret value'
+
+    def execute
+      require_api_url
+      token = require_token
+      secret = value
+      if secret.to_s == ''
+        secret = STDIN.read
+      end
+      abort('No value provided') if secret.to_s == ''
+      data = {
+          name: name,
+          value: secret
+      }
+      client(token).post("grids/#{current_grid}/secrets", data)
+    end
+  end
+end

data/lib/kontena/cli/vault_command.rb

@@ -0,0 +1,15 @@
+require_relative 'vault/write_command'
+require_relative 'vault/list_command'
+require_relative 'vault/read_command'
+require_relative 'vault/remove_command'
+
+class Kontena::Cli::VaultCommand < Clamp::Command
+
+  subcommand "write", "Write a secret", Kontena::Cli::Vault::WriteCommand
+  subcommand ["list", "ls"], "List secrets", Kontena::Cli::Vault::ListCommand
+  subcommand "read", "Read secret", Kontena::Cli::Vault::ReadCommand
+  subcommand ["remove", "rm"], "Remove secret", Kontena::Cli::Vault::RemoveCommand
+
+  def execute
+  end
+end

data/lib/kontena/cli/whoami_command.rb

@@ -10,10 +10,13 @@ class Kontena::Cli::WhoamiCommand < Clamp::Command
     end
 
     require_api_url
-    puts "Master: #{settings['server']['url']}"
+    puts "Master: #{self.current_master['name']}"
+    puts "URL: #{api_url}"
+    puts "Grid: #{current_grid}"
     token = require_token
-    response = client(token).get('user')
-    puts "User: #{response['email']}"
+    user = client(token).get('user')
+    puts "User: #{user['email']}"
+
   end
 
 end