kontena-plugin-cloud 1.0.0.pre1 → 1.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59e599cd1a6b5a74ff9854efbffc34bc2faba4fc
-  data.tar.gz: 114cbd20de9d08e733c9790e113473dfabbda920
+  metadata.gz: 4ba51db007412d9c1f0cc5153e7972712627866d
+  data.tar.gz: dfb686674f831a540a732277ed44bdd824a2d3b1
 SHA512:
-  metadata.gz: 6c59729a771e4d39e6a6a84a7e1db59803c7779e14dd907f4fa82e77413b971227c10a1f2dce3dec558c9b1a1940a986a26e16077618cbba652c2b6f0c0d1f6d
-  data.tar.gz: 41c156dad9f34cfd32990ccbde6655fc6c1708113350be06c7c4981859ad50a84c3aacb92f17c11344c86f3e5e0fa5799f09ba177887d16b42b35cf22117c64c
+  metadata.gz: 37d98e085cf4ca833fb93152d9be9e178c54c04c743093b2233c247f5b1debef5c6b3cef310c1d789aefe9d9387f2c2cf80a149bb33af49a3fc62ec65d7cf6a9
+  data.tar.gz: 949e677350a6b488bd7c7984f757733acb70e9b570baf55400d886539b82da49218465a5747a70eabb5cd6c897c5496d5e1b091dc233683456cc026a1fc0de11

data/Gemfile

@@ -5,5 +5,4 @@ gemspec
 
 group :development do
   gem 'rspec'
-  gem 'kontena-plugin-digitalocean'
 end

data/lib/kontena/cli/models/cloud_api_model.rb

@@ -0,0 +1,26 @@
+module Kontena::Cli::Models
+  module CloudApiModel
+
+    attr_reader :api_data
+
+    def initialize(api_data)
+      @api_data = api_data || {}
+    end
+
+    def id
+      api_data['id']
+    end
+
+    def method_missing(method, *args, &block)
+      key = method.to_s.gsub('_', '-')
+
+      return api_data['attributes'].has_key?(key) && api_data['attributes'][key] if key.end_with?('?'.freeze)
+
+      if api_data['attributes'].has_key?(key)
+        api_data['attributes'][key]
+      else
+        raise ArgumentError.new("Method `#{m}` doesn't exist.")
+      end
+    end
+  end
+end

data/lib/kontena/cli/models/grid.rb

@@ -0,0 +1,33 @@
+require_relative 'master_api_model'
+
+module Kontena::Cli::Models
+  class Grid
+    include MasterApiModel
+
+    class Stats
+      include MasterApiModel
+
+      Statsd = Struct.new(:server, :port)
+
+      def statsd
+        @statsd ||= Statsd.new(@api_data.dig('statsd', 'server'), @api_data.dig('statsd', 'port'))
+      end
+    end
+
+    class Logs
+      include MasterApiModel
+    end
+
+    def id
+      api_data['id']
+    end
+
+    def logs
+      @logs ||= Logs.new(api_data['logs'])
+    end
+
+    def stats
+      @stats ||= Stats.new(api_data['stats'])
+    end
+  end
+end

data/lib/kontena/cli/models/master_api_model.rb

@@ -0,0 +1,22 @@
+module Kontena::Cli::Models
+  module MasterApiModel
+
+    attr_reader :api_data
+
+    def initialize(api_data)
+      @api_data = api_data || {}
+    end
+
+    def method_missing(method, *args, &block)
+      key = method.to_s
+
+      return @api_data.has_key?(key) && @api_data[key] if key.end_with?('?'.freeze)
+
+      if @api_data.has_key?(key)
+        @api_data[key]
+      else
+        raise ArgumentError.new("Method `#{m}` doesn't exist.")
+      end
+    end
+  end
+end

data/lib/kontena/cli/models/platform.rb

@@ -1,16 +1,11 @@
+require_relative 'cloud_api_model'
+
 module Kontena::Cli::Models
   class Platform
-
-    def initialize(api_data)
-      @api_data = api_data
-    end
-
-    def id
-      @api_data['id']
-    end
+    include CloudApiModel
 
     def region
-      @api_data.dig('relationships', 'datacenter', 'data', 'id')
+      @api_data.dig('relationships', 'region', 'data', 'id')
     end
 
     def online?
@@ -20,14 +15,5 @@ module Kontena::Cli::Models
     def organization
       @api_data.dig('relationships', 'organization', 'data', 'id')
     end
-
-    def method_missing(method, *args, &block)
-      key = method.to_s.gsub('_', '-')
-      if @api_data['attributes'].has_key?(key)
-        @api_data['attributes'][key]
-      else
-        raise ArgumentError.new("Method `#{m}` doesn't exist.")
-      end
-    end
   end
 end

data/lib/kontena/plugin/cloud/organization/user/add_command.rb

@@ -10,18 +10,6 @@ class Kontena::Plugin::Cloud::Organization::User::AddCommand < Kontena::Command
 
   def execute
     members = []
-    spinner "Resolving organization #{pastel.cyan(name)} current members" do
-      members = cloud_client.get("/organizations/#{name}/members")['data']
-      members = members.map { |m|
-        {
-          type: 'users',
-          id: m.dig('attributes', 'username'),
-          meta: {
-            role: m.dig('attributes', 'role')
-          }
-        }
-      }
-    end
     username_list.each do |u|
       members << {
         type: 'users',
@@ -31,7 +19,7 @@ class Kontena::Plugin::Cloud::Organization::User::AddCommand < Kontena::Command
     end
     spinner "Adding #{pastel.cyan(username_list.join(', '))} to organization #{pastel.cyan(name)} with role #{pastel.cyan(role)}" do
       data = {data: members}
-      cloud_client.put("/organizations/#{name}/relationships/members", data)
+      cloud_client.post("/organizations/#{name}/relationships/members", data)
     end
   end
 end

data/lib/kontena/plugin/cloud/organization/user/remove_command.rb

@@ -12,22 +12,15 @@ class Kontena::Plugin::Cloud::Organization::User::RemoveCommand < Kontena::Comma
     confirm_command(username_list.join(',')) unless forced?
 
     members = []
-    spinner "Resolving organization #{pastel.cyan(name)} current members" do
-      members = cloud_client.get("/organizations/#{name}/members")['data']
-      members = members.map { |m|
-        {
-          type: 'users',
-          id: m.dig('attributes', 'username'),
-          meta: {
-            role: m.dig('attributes', 'role')
-          }
-        }
+    username_list.each do |u|
+      members << {
+        type: 'users',
+        id: u
       }
     end
-    members.delete_if { |m| username_list.include?(m[:id]) }
     spinner "Removing #{pastel.cyan(username_list.join(', '))} from organization #{pastel.cyan(name)}" do
       data = {data: members}
-      cloud_client.put("/organizations/#{name}/relationships/members", data)
+      cloud_client.delete("/organizations/#{name}/relationships/members", data)
     end
   end
 end

data/lib/kontena/plugin/cloud/region/list_command.rb

@@ -5,8 +5,8 @@ class Kontena::Plugin::Cloud::Region::ListCommand < Kontena::Command
   requires_current_account_token
 
   def execute
-    datacenters = cloud_client.get('/datacenters')['data']
-    print_table(datacenters) do |row|
+    regions = cloud_client.get('/regions')['data']
+    print_table(regions) do |row|
       row.merge!(row['attributes'])
     end
   end

data/lib/kontena/plugin/cloud.rb

@@ -1,18 +1,16 @@
 module Kontena
   module Plugin
     module Cloud
-      VERSION = "1.0.0.pre1"
+      VERSION = "1.0.0.pre2"
 
       module Organization
-        module User
-        end
-      end
-
-      module Region
+        module User; end
       end
+      module Region; end
     end
 
     module Platform
+      module TrustedSubnet; end
     end
 
     module Grid

data/lib/kontena/plugin/platform/common.rb

@@ -31,12 +31,7 @@ module Kontena::Plugin::Platform::Common
 
   # @param [String] name
   def require_platform(name)
-    unless name.include?('/')
-      name = "#{current_organization}/#{name}"
-    end
-    org, platform = name.split('/')
-
-    raise ArgumentError, "Organization missing" unless org
+    org, platform = parse_platform_name(name)
 
     @current_organization = org
 
@@ -50,6 +45,19 @@ module Kontena::Plugin::Platform::Common
     self.current_grid = platform
   end
 
+  # @param [String] name
+  # @return [Array<String>] organization, platform
+  def parse_platform_name(name)
+    unless name.include?('/')
+      name = "#{current_organization}/#{name}"
+    end
+    org, platform = name.split('/')
+
+    raise ArgumentError, "Organization missing" unless org
+
+    [org, platform]
+  end
+
   def platform_config_exists?(name)
     !self.config.find_server_by(name: name).nil?
   end

data/lib/kontena/plugin/platform/create_command.rb

@@ -54,9 +54,9 @@ class Kontena::Plugin::Platform::CreateCommand < Kontena::Command
   end
 
   def prompt_region
-    datacenters = cloud_client.get('/datacenters')['data']
+    regions = cloud_client.get('/regions')['data']
     prompt.select("Choose region:") do |menu|
-      datacenters.each do |d|
+      regions.each do |d|
         menu.choice d.dig('attributes', 'name'), d['id']
       end
     end
@@ -74,8 +74,8 @@ class Kontena::Plugin::Platform::CreateCommand < Kontena::Command
     data = {
       attributes: { "name": name, "initial-size": initial_size },
       relationships: {
-        datacenter: {
-          "data": { "type": "datacenters", "id": region }
+        region: {
+          "data": { "type": "region", "id": region }
         }
       }
     }

data/lib/kontena/plugin/platform/list_command.rb

@@ -7,21 +7,21 @@ class Kontena::Plugin::Platform::ListCommand < Kontena::Command
 
   requires_current_account_token
 
-  parameter "[ORG]", "Organization name", environment_variable: "KONTENA_ORGANIZATION"
+  option ["--organization", "--org"], "ORG", "Organization", environment_variable: "KONTENA_ORGANIZATION"
 
   def execute
-    platforms = cloud_client.get("/organizations/#{org}/platforms")['data']
+    platforms = cloud_client.get("/organizations/#{organization}/platforms")['data']
 
     print_table(platforms) do |p|
       platform = Kontena::Cli::Models::Platform.new(p)
-      p['name'] = "#{state_icon(platform.state)} #{org}/#{platform.name}"
+      p['name'] = "#{state_icon(platform.state)} #{organization}/#{platform.name}"
       p['organization'] = platform.organization
       p['url'] = platform.url
       p['region'] = platform.region
     end
   end
 
-  def default_org
+  def default_organization
     current_account.username
   end
 

data/lib/kontena/plugin/platform/remove_command.rb

@@ -11,7 +11,7 @@ class Kontena::Plugin::Platform::RemoveCommand < Kontena::Command
 
   def execute
     require_platform(name)
-    platform = find_platform_by_name(name)
+    platform = find_platform_by_name(current_platform, current_organization)
 
     confirm_command(name) unless forced?
 

data/lib/kontena/plugin/platform/show_command.rb

@@ -1,8 +1,11 @@
+require 'kontena/cli/grids/common'
 require_relative 'common'
+require_relative '../../cli/models/grid'
 
 class Kontena::Plugin::Platform::ShowCommand < Kontena::Command
   include Kontena::Cli::Common
   include Kontena::Plugin::Platform::Common
+  include Kontena::Cli::Grids::Common
 
   requires_current_account_token
 
@@ -14,12 +17,42 @@ class Kontena::Plugin::Platform::ShowCommand < Kontena::Command
     platform = find_platform_by_name(current_platform, current_organization)
 
     puts "#{name}:"
-    puts "  id: #{platform.id}"
     puts "  name: #{platform.name}"
     puts "  organization: #{current_organization}"
     puts "  state: #{platform.state}"
     puts "  region: #{platform.region || '-'}"
     puts "  initial_size: #{platform.initial_size}"
     puts "  master: #{platform.url}"
+
+    grid = nil
+    begin
+      data = client.get("grids/#{platform.grid_id}")
+      grid = Kontena::Cli::Models::Grid.new(data)
+    rescue Kontena::Errors::StandardError
+      exit_with_error "Cannot fetch grid information"
+    end
+
+    if grid.default_affinity?
+      puts "  default_affinity: "
+      grid.default_affinity.to_a.each do |a|
+        puts "    - #{a}"
+      end
+    else
+      puts "  default_affinity: -"
+    end
+    puts "  subnet: #{grid.subnet}"
+    puts "  supernet: #{grid.supernet}"
+    if grid.stats.statsd?
+      statsd = grid.stats.statsd
+      puts "  exports:"
+      puts "    statsd: #{statsd.server}:#{statsd.port}"
+    end
+    if grid.logs.forwarder?
+      puts "logs:"
+      puts "  forwarder: #{grid.logs.forwarder}"
+      grid.logs.opts.each do |k,v|
+        puts "  #{k}: #{v}"
+      end
+    end
   end
 end

data/lib/kontena/plugin/platform/trusted_subnet/add_command.rb

@@ -0,0 +1,20 @@
+require_relative '../../../cli/models/grid'
+require_relative '../common'
+
+class Kontena::Plugin::Platform::TrustedSubnet::AddCommand < Kontena::Command
+  include Kontena::Cli::Common
+  include Kontena::Plugin::Platform::Common
+
+  parameter "NAME", "Platform name"
+  parameter "SUBNET", "Subnet"
+
+  def execute
+    require_platform(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 #{current_grid.colorize(:cyan)} platform " do
+      client.put("grids/#{current_grid}", data)
+    end
+  end
+end

data/lib/kontena/plugin/platform/trusted_subnet/list_command.rb

@@ -0,0 +1,51 @@
+require_relative '../../../cli/models/grid'
+require_relative '../common'
+require 'ipaddr'
+
+class Kontena::Plugin::Platform::TrustedSubnet::ListCommand < Kontena::Command
+  include Kontena::Cli::Common
+  include Kontena::Plugin::Platform::Common
+  include Kontena::Cli::TableGenerator::Helper
+
+  parameter "NAME", "Platform name"
+
+  def execute
+    require_platform(name)
+    grid = Kontena::Cli::Models::Grid.new(client.get("grids/#{current_grid}"))
+    if grid.trusted_subnets.size > 0
+      nodes = client.get("grids/#{current_grid}/nodes")['nodes']
+    else
+      nodes = []
+    end
+    items = grid.trusted_subnets.map { |s|
+      item = {
+        'subnet' => s
+      }
+      subnet = IPAddr.new(s)
+      item['nodes'] = trusted_nodes(subnet, nodes).map { |n| n['name'] }.join(',')
+
+      item
+    }
+
+    print_table(items)
+  end
+
+  # @param [IPAddr] subnet
+  # @param [Array<Hash>] nodes
+  def trusted_nodes(subnet, nodes)
+    nodes.select { |n|
+      begin
+        n['private_ip'] && subnet.include?( IPAddr.new(n['private_ip']) )
+      rescue => exc
+        STDERR.puts "Failed to parse #{n['private_ip']} (#{n['name']}): #{exc.message}"
+      end
+    }
+  end
+
+  def fields
+    {
+      subnet: 'subnet',
+      nodes: 'nodes'
+    }
+  end
+end

data/lib/kontena/plugin/platform/trusted_subnet/remove_command.rb

@@ -0,0 +1,27 @@
+require_relative '../../../cli/models/grid'
+require_relative '../common'
+
+class Kontena::Plugin::Platform::TrustedSubnet::RemoveCommand < Kontena::Command
+  include Kontena::Cli::Common
+  include Kontena::Plugin::Platform::Common
+
+  parameter "NAME", "Platform name"
+  parameter "SUBNET", "Subnet"
+
+  option "--force", :flag, "Force remove", default: false, attribute_name: :forced
+
+  def execute
+    require_platform(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("Platform #{name.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)} platform " do
+      client.put("grids/#{current_grid}", data)
+    end
+  end
+end

data/lib/kontena/plugin/platform/trusted_subnet_command.rb

@@ -0,0 +1,11 @@
+require_relative 'common'
+
+class Kontena::Plugin::Platform::TrustedSubnetCommand < Kontena::Command
+
+  subcommand ["list", "ls"], "List trusted subnets", load_subcommand('kontena/plugin/platform/trusted_subnet/list_command')
+  subcommand ["add"], "Add trusted subnet", load_subcommand('kontena/plugin/platform/trusted_subnet/add_command')
+  subcommand ["remove", "rm"], "Remove trusted subnet", load_subcommand('kontena/plugin/platform/trusted_subnet/remove_command')
+
+  def execute
+  end
+end

data/lib/kontena/plugin/platform_command.rb

@@ -7,6 +7,7 @@ class Kontena::Plugin::PlatformCommand < Kontena::Command
   subcommand ['remove', 'rm'], 'Remove platform', load_subcommand('kontena/plugin/platform/remove_command')
   subcommand 'audit-log', 'Show platform audit logs', load_subcommand('kontena/plugin/platform/audit_log_command')
   subcommand 'health', 'Show platform health', load_subcommand('kontena/plugin/platform/health_command')
+  subcommand 'trusted-subnet', 'Trusted subnet specific commands', load_subcommand('kontena/plugin/platform/trusted_subnet_command')
   subcommand 'import-grid', 'Import grid as Kontena Platform', load_subcommand('kontena/plugin/platform/import_grid_command')
 
   def execute

data/lib/kontena_cli_plugin.rb

@@ -48,4 +48,26 @@ module Kontena
   class Command < Clamp::Command
     prepend CloudCommand
   end
+
+  module CloudClient
+    def parse_response(response)
+      data = super(response)
+      if data.is_a?(Hash) && data['errors']
+        data['error'] = {}
+        errors = data.delete('errors')
+        if errors.size == 1
+          data['error'] = errors[0]['title']
+        else
+          errors.each do |e|
+            data['error'][e['id']] = e['title']
+          end
+        end
+      end
+      data
+    end
+  end
+
+  class Client
+    prepend CloudClient
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre1
+  version: 1.0.0.pre2
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -67,6 +67,9 @@ files:
 - Rakefile
 - kontena-plugin-cloud.gemspec
 - lib/kontena/cli/master_code_exchanger.rb
+- lib/kontena/cli/models/cloud_api_model.rb
+- lib/kontena/cli/models/grid.rb
+- lib/kontena/cli/models/master_api_model.rb
 - lib/kontena/cli/models/platform.rb
 - lib/kontena/plugin/cloud.rb
 - lib/kontena/plugin/cloud/organization/list_command.rb
@@ -87,6 +90,10 @@ files:
 - lib/kontena/plugin/platform/list_command.rb
 - lib/kontena/plugin/platform/remove_command.rb
 - lib/kontena/plugin/platform/show_command.rb
+- lib/kontena/plugin/platform/trusted_subnet/add_command.rb
+- lib/kontena/plugin/platform/trusted_subnet/list_command.rb
+- lib/kontena/plugin/platform/trusted_subnet/remove_command.rb
+- lib/kontena/plugin/platform/trusted_subnet_command.rb
 - lib/kontena/plugin/platform/use_command.rb
 - lib/kontena/plugin/platform_command.rb
 - lib/kontena_cli_plugin.rb