kontena-cli 0.13.4 → 0.14.0

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

@@ -0,0 +1,60 @@
+require 'yaml'
+
+module Kontena::Cli::Apps
+  module YAML
+    class ServiceExtender
+      attr_reader :service_config
+
+      # @param [Hash] service_config
+      def initialize(service_config)
+        @service_config = service_config
+      end
+
+      # @param [Hash] from
+      # @return [Hash]
+      def extend(from)
+        service_config['environment'] = extend_env_vars(
+          from['environment'],
+          service_config['environment']
+        )
+        service_config['secrets'] = extend_secrets(
+          from['secrets'],
+          service_config['secrets']
+        )
+        from.merge(service_config)
+      end
+
+      private
+
+      # @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
+      end
+
+      # @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
+        end
+        secrets
+      end
+    end
+  end
+end

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

@@ -0,0 +1,79 @@
+module Kontena::Cli::Apps::YAML
+ module Validations
+
+   def append_common_validations(base)
+     base.optional('image').maybe(:str?)
+     base.optional('extends').schema do
+       key('service').required(:str?)
+       optional('file') { str? }
+     end    
+     base.optional('stateful') { bool? }
+     base.optional('affinity') { array? { each { format?(/(?<=\!|\=)=/) } } }
+     base.optional('cap_add') { array? | none? }
+     base.optional('cap_drop') { array? | none? }
+     base.optional('command') { str? | none? }
+     base.optional('cpu_shares') { int? | none? }
+     base.optional('external_links') { array? }
+     base.optional('mem_limit') { int? | str? }
+     base.optional('memswap_limit') { int? | str? }
+     base.optional('environment') { array? | type?(Hash) }
+     base.optional('env_file') { str? | array? }
+     base.optional('instances') { int? }
+     base.optional('links') { array? | empty? }
+     base.optional('ports') { array? }
+     base.optional('volumes') { array? }
+     base.optional('volumes_from') { array? }
+     base.optional('deploy').schema do
+       optional('strategy') { inclusion?(%w(ha daemon random)) }
+       optional('wait_for_port') { int? }
+       optional('min_health') { float? }
+     end
+     base.optional('hooks').schema do
+       optional('post_start').each do
+         key('name').required
+         key('cmd').required
+         key('instances') { int? | eql?('*') }
+         optional('oneshot') { bool? }
+       end
+       optional('pre_build').each do
+         key('cmd').required
+       end
+     end
+     base.optional('secrets').each do
+       key('secret').required
+       key('name').required
+       key('type').required
+     end
+   end
+
+   ##
+   # @param [Hash] service_config
+   def validate_options(service_config)
+     @yaml_schema.call(service_config)
+   end
+
+   ##
+   # @param [Hash] service_config
+   # @return [Array<String>] errors
+   def validate_keys(service_config)
+     errors = {}
+     service_config.keys.each do |key|
+       error = validate_key(key)
+       errors[key] = error if error
+     end
+     errors
+   end
+
+   ##
+   # @param [String] key
+   def validate_key(key)
+     if self.class::UNSUPPORTED_KEYS.include?(key)
+       ['unsupported option']
+     elsif !self.class::VALID_KEYS.include?(key)
+       ['invalid option']
+     else
+       nil
+     end
+   end
+ end
+end

data/lib/kontena/cli/apps/yaml/validator.rb

@@ -0,0 +1,55 @@
+require 'dry-validation'
+module Kontena::Cli::Apps
+  module YAML
+    class Validator
+      require_relative 'validations'
+      include Validations
+      
+      VALID_KEYS = %w(
+      affinity build dockerfile cap_add cap_drop command deploy env_file environment extends external_links
+      image links log_driver log_opt net pid ports volumes volumes_from cpu_shares
+      mem_limit memswap_limit privileged stateful user instances hooks secrets
+      ).freeze
+
+      UNSUPPORTED_KEYS = %w(
+      cgroup_parent container_name devices depends_on dns dns_search tmpfs entrypoint
+      expose extra_hosts labels logging network_mode networks security_opt stop_signal ulimits volume_driver
+      cpu_quota cpuset domainname hostname ipc mac_address
+      read_only restart shm_size stdin_open tty working_dir
+      ).freeze
+
+      ##
+      # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+      def initialize(need_image=false)
+        base = self
+        @yaml_schema = Dry::Validation.Schema do
+          base.append_common_validations(self)
+          optional('build').maybe(:str?)
+          optional('dockerfile') { str? }
+          optional('net') { inclusion?(%w(host bridge)) }
+          optional('log_driver') { str? }
+          optional('log_opts') { type?(Hash) }
+
+        end
+      end
+
+      ##
+      # @param [Hash] yaml
+      # @return [Array] validation_errors
+      def validate(yaml)
+        result = {
+          errors: [],
+          notifications: []
+        }
+
+        yaml.each do |service, options|
+          key_errors = validate_keys(options)
+          option_errors = validate_options(options)
+          result[:errors] << { service => option_errors.messages } if option_errors.failure?
+          result[:notifications] << { service => key_errors } if key_errors.size > 0
+        end
+        result
+      end
+    end
+  end
+end

data/lib/kontena/cli/apps/yaml/validator_v2.rb

@@ -0,0 +1,74 @@
+require 'dry-validation'
+require_relative 'validator'
+
+module Kontena::Cli::Apps
+  module YAML
+    class ValidatorV2
+      require_relative 'validations'
+      include Validations
+
+      VALID_KEYS = %w(
+      affinity build cap_add cap_drop command deploy depends_on env_file environment extends external_links
+      image links logging network_mode pid ports volumes volumes_from cpu_shares
+      mem_limit memswap_limit privileged stateful user instances hooks secrets
+      ).freeze
+
+      UNSUPPORTED_KEYS = %w(
+      cgroup_parent container_name devices dns dns_search tmpfs entrypoint
+      expose extra_hosts labels log_driver log_opt net networks security_opt stop_signal ulimits volume_driver
+      cpu_quota cpuset domainname hostname ipc mac_address
+      read_only restart shm_size stdin_open tty working_dir
+      ).freeze
+
+      ##
+      # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+      def initialize
+        base = self
+        @yaml_schema = Dry::Validation.Schema do
+          base.append_common_validations(self)
+          optional('build') { str? | type?(Hash) }
+
+          rule(build_hash: ['build']) do |build|
+            build.type?(Hash) > build.schema do
+              key('context').required
+              optional('dockerfile') { str? }
+            end
+          end
+          optional('depends_on') { array? }
+          optional('network_mode') { inclusion?(%w(host bridge)) }
+          optional('logging').schema do
+            optional('driver') { str? }
+            optional('options') { type?(Hash) }
+          end
+        end
+      end
+
+      ##
+      # @param [Hash] yaml
+      # @return [Array] validation_errors
+      def validate(yaml)
+        result = {
+          errors: [],
+          notifications: []
+        }
+        if yaml.key?('services')
+          yaml['services'].each do |service, options|
+            key_errors = validate_keys(options)
+            option_errors = validate_options(options)
+            result[:errors] << { service => option_errors.messages } if option_errors.failure?
+            result[:notifications] << { service => key_errors } if key_errors.size > 0
+          end
+        else
+          result[:errors] << { 'file' => 'services missing' }
+        end
+        if yaml.key?('volumes')
+          result[:notifications] << { 'volumes' => 'Kontena does not support volumes yet. To persist data just define service as stateful (stateful: true)' }
+        end
+        if yaml.key?('networks')
+          result[:notifications] << { 'networks' => 'Kontena does not support multiple networks yet. You can reference services with Kontena\'s internal DNS (service_name.kontena.local)' }
+        end
+        result
+      end
+    end
+  end
+end

data/lib/kontena/cli/common.rb

@@ -122,6 +122,29 @@ module Kontena
         save_settings
       end
 
+      def error(message = nil)
+        $stderr.puts(message) if message
+        exit(1)
+      end
+
+      def prompt(prefix = '> ')
+        require 'highline/import'
+        ask(prefix)
+      end
+
+      def confirm_command(name, message = nil)
+        puts message if message
+        puts "Destructive command. To proceed, type \"#{name}\" or re-run this command with --force option."
+
+        prompt == name || error("Confirmation did not match #{name}. Aborted command.")
+      end
+
+      def confirm(message = 'Destructive command. Are you sure? (y/n) or re-run this command with --force option.')
+        puts message
+
+        ['y', 'yes'].include?(prompt) || error("Aborted command.")
+      end
+
       def api_url=(api_url)
         settings['servers'][current_master_index]['url'] = api_url
         save_settings

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

@@ -9,11 +9,13 @@ module Kontena::Cli::Etcd
     parameter "KEY", "Etcd key"
 
     option "--recursive", :flag, "Remove keys recursively"
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
       require_api_url
       token = require_token
       validate_key
+      confirm unless forced?
 
       data = {}
       data[:recursive] = true if recursive?

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

@@ -6,10 +6,12 @@ module Kontena::Cli::Grids
     include Common
 
     parameter "NAME", "Grid name"
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
       require_api_url
       token = require_token
+      confirm_command(name) unless forced?
       grid = find_grid_by_name(name)
 
       if !grid.nil?

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

@@ -7,10 +7,13 @@ module Kontena::Cli::Grids::Users
     include Kontena::Cli::Grids::Common
 
     parameter "EMAIL", "Email address"
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
       require_api_url
       token = require_token
+      confirm_command(email) unless forced?
+
       result = client(token).delete("grids/#{current_grid}/users/#{email}")
     end
   end

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

@@ -10,7 +10,6 @@ module Kontena::Cli::Master::Azure
     option "--network", "NETWORK", "Virtual Network name"
     option "--subnet", "SUBNET", "Subnet name"
     option "--ssh-key", "SSH KEY", "SSH private key file", required: true
-    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"
@@ -22,7 +21,6 @@ module Kontena::Cli::Master::Azure
       require 'kontena/machine/azure'
       provisioner = Kontena::Machine::Azure::MasterProvisioner.new(subscription_id, certificate)
       provisioner.run!(
-          password: password,
           ssh_key: ssh_key,
           ssl_cert: ssl_cert,
           size: size,

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

@@ -0,0 +1,42 @@
+require 'securerandom'
+
+module Kontena::Cli::Master::Packet
+  class CreateCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    option "--token", "TOKEN", "Packet API token", required: true
+    option "--project", "PROJECT ID", "Packet project id", required: true
+    option "--ssl-cert", "PATH", "SSL certificate file (optional)"
+    option "--type", "TYPE", "Server type (baremetal_0, baremetal_1, ..)", default: 'baremetal_0', attribute_name: :plan
+    option "--facility", "FACILITY CODE", "Facility", default: 'ams1'
+    option "--billing", "BILLING", "Billing cycle", default: 'hourly'
+    option "--ssh-key", "PATH", "Path to ssh public key (optional)"
+    option "--vault-secret", "VAULT_SECRET", "Secret key for Vault (optional)"
+    option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (optional)"
+    option "--mongodb-uri", "URI", "External MongoDB uri (optional)"
+    option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
+    option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url"
+
+    def execute
+
+      require 'kontena/machine/packet'
+
+      provisioner = Kontena::Machine::Packet::MasterProvisioner.new(token)
+      provisioner.run!(
+          project: project,
+          billing: billing,
+          ssh_key: ssh_key,
+          ssl_cert: ssl_cert,
+          plan: plan,
+          facility: facility,
+          version: version,
+          auth_server: auth_provider_url,
+          vault_secret: vault_secret || SecureRandom.hex(24),
+          vault_iv: vault_iv || SecureRandom.hex(24),
+          mongodb_uri: mongodb_uri
+      )
+    end
+
+  end
+end
+

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

@@ -0,0 +1,14 @@
+
+module Kontena::Cli::Master
+
+  require_relative 'packet/create_command'
+
+  class PacketCommand < Clamp::Command
+
+    subcommand "create", "Create a new Packet master", Packet::CreateCommand
+
+    def execute
+    end
+  end
+end
+

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

@@ -0,0 +1,39 @@
+require 'securerandom'
+
+module Kontena::Cli::Master::Upcloud
+  class CreateCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    option "--username", "USER", "Upcloud username", required: true
+    option "--password", "PASS", "Upcloud password", required: true
+    option "--ssh-key", "SSH_KEY", "Path to ssh public key", required: true
+    option "--ssl-cert", "SSL CERT", "SSL certificate file (optional)"
+    option "--plan", "PLAN", "Server plan", default: '1xCPU-1GB'
+    option "--zone", "ZONE", "Zone", default: 'fi-hel1'
+    option "--vault-secret", "VAULT_SECRET", "Secret key for Vault (optional)"
+    option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (optional)"
+    option "--mongodb-uri", "URI", "External MongoDB uri (optional)"
+    option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
+    option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url"
+
+
+    def execute
+
+      require 'kontena/machine/upcloud'
+
+      provisioner = Kontena::Machine::Upcloud::MasterProvisioner.new(username, password)
+      provisioner.run!(
+          ssh_key: ssh_key,
+          ssl_cert: ssl_cert,
+          plan: plan,
+          zone: zone,
+          version: version,
+          auth_server: auth_provider_url,
+          vault_secret: vault_secret || SecureRandom.hex(24),
+          vault_iv: vault_iv || SecureRandom.hex(24),
+          mongodb_uri: mongodb_uri
+      )
+    end
+
+  end
+end