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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf7c44e18f0d2ff2e277810974bf39f749257e3c
-  data.tar.gz: 2e2f5ba2d90c7a520af0841a5cafe24f64ac149e
+  metadata.gz: af9decdc6b9827d74da53fb8039b726ba270138f
+  data.tar.gz: b3353bfcb5b6d8100afbcd0b9bb39635110a468b
 SHA512:
-  metadata.gz: 95f186f517ada7984687d566dca28a211e3afdb834485c774ea9bc801ea06896a86abb1893e5c384360a8b85dedf81631baabc7d40d5e560b4d3caa3131ee344
-  data.tar.gz: 1fad2520e64dd6082a03357012fad9696b9b95e8aefe4630e8389903fd5454fb887c787879aad0b0e1eb32549fa252ee48b18b7b24a839f41fe83ce980f7315c
+  metadata.gz: d424c65f38efea82051a7a2fb19b600d14ac80db0fb688aa052a9d37b70140840ac78348483804597ed7da4af9708b67e014337b3d356051e190e23e339c31ff
+  data.tar.gz: 4a8ec649931f6bc6ed58fee238832f1947d0991a26b9bad4a26ec49c3701d959da815ceb5c67db28903adb4dc073210391a8ef18a2a57789049edb01ffb45aad

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+rvm:
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.1
+env:
+  - secure: "lGCbWI8Tmi8rjXkMe4ogIBKvRt4IQ/aNGclP/X7ZzCHwlIobSZTqYw5m3SUSsthPUIhApfmQRxET/3/w4QrGO5GXbNr31G8anT7tMh/+ZLNjZ8R22ZN/JGyT4iR8B0wyyBMsw7VXVmkyRO6uMODDqF2ctAlwppWksMfAy4Fhi7zECwRtyhEwK4il7vx+A+Sk3bG520xNoTHYmPhteTjP7ANKy7SpvNvlXIMIqAOUEyLbGCZzMWsUsPEwVZLI1qjrPCDFAI5ez1yzDJ9023PYgfSJ2jiOUQE1X9uDuhFEswumYWjDEOfpVQ8a6eqNzha6NK6VpG1n0WxHzEnDW2Ea7M9ZrwXqgBNhc/vuM9SOjot3EmrK2lwYaTKyXQVIIJGFkU9/PLLDXqfoHHz0sXyIYsCNORFLclbKZmznx0dVrAlR4LtGP64OoFwE5b8yJCSlcwl7Cd0qqdccuJyTeccwo3+P73jwxvvg9DsN2xgbZFMzdidLSXWYOkf+Vib4okWGiEEsmG1gNtRQzwvNaoWqQ3Svqr90OEtY7jrdm8kMcqq+SmjBJn5ZNP8xUGOh187tx/FHff/YufrlbgNFASffbOOWCNmnYC1isWp95rBOfjS3PZLAFhgvdQVyl3CqSV0UKpZV7y6Ujq8JcnZh2VO0f1FZfIcRWRG94StFN+XJ4lE="
+cache: bundler
+script: bundle install && bundle exec rspec spec/
+deploy:
+  provider: rubygems
+  api_key: $GEM_TOKEN
+  gem: kontena-plugin-cloud
+  on:
+    tags: true
+    rvm: 2.4.1

data/lib/kontena/cli/master_code_exchanger.rb

@@ -64,9 +64,8 @@ class Kontena::Cli::MasterCodeExchanger
     response = @api_client.request(method: method, body: body, path: path, headers: headers)
     content_type = response.headers.dig('Content-Type') || ''
     content_length = response.headers.dig('Content-Length').to_i
-
     body = if content_type.include?('json') && content_length > 0
-      JSON.parse(response.body)
+      JSON.parse(response.body) rescue response.body
     else
       response.body
     end

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

@@ -0,0 +1,8 @@
+require_relative 'cloud_api_model'
+
+module Kontena::Cli::Models
+  class Organization
+    include CloudApiModel
+
+  end
+end

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

@@ -9,11 +9,15 @@ module Kontena::Cli::Models
     end
 
     def online?
-      state.to_s == 'online'.freeze
+      state.to_s == 'running'.freeze
     end
 
     def organization
       @api_data.dig('relationships', 'organization', 'data', 'id')
     end
+
+    def to_path
+      "#{self.organization}/#{self.name}"
+    end
   end
 end

data/lib/kontena/plugin/cloud/organization/common.rb

@@ -0,0 +1,21 @@
+require_relative '../../../cli/models/organization'
+
+module Kontena::Plugin::Cloud::Organization::Common
+
+  def fetch_organizations
+    organizations = cloud_client.get("/organizations/")['data']
+    organizations.map do |o|
+      Kontena::Cli::Models::Organization.new(o)
+    end
+  end
+
+  def prompt_organization
+    organizations = fetch_organizations
+    prompt.select("Choose organization") do |menu|
+      organizations.each do |o|
+        menu.choice o.name, o.name
+      end
+    end
+  end
+
+end

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

@@ -1,12 +1,14 @@
+require_relative 'common'
 class Kontena::Plugin::Cloud::Organization::ListCommand < Kontena::Command
   include Kontena::Cli::Common
+  include Kontena::Plugin::Cloud::Organization::Common
   include Kontena::Cli::TableGenerator::Helper
 
   requires_current_account_token
 
   def execute
-    organizations = cloud_client.get('/organizations')['data']
-    print_table(organizations) do |row|
+    organizations = fetch_organizations
+    print_table(organizations.map{|o| o.api_data}) do |row|
       row.merge!(row['attributes'])
       row['name'] = row['name']
       row['account-status'] = row['account-status'] == 'active' ? pastel.green(row['account-status']) : row['account-status']

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

@@ -3,6 +3,10 @@ require_relative '../../../cli/models/platform'
 
 module Kontena::Plugin::Cloud::Platform::Common
 
+  def cached_platforms
+    @cached_platforms ||= []
+  end
+
   def fetch_platforms
     all = []
     organizations = cloud_client.get('/organizations')['data']
@@ -17,13 +21,24 @@ module Kontena::Plugin::Cloud::Platform::Common
   def fetch_platforms_for_org(org_id)
     platforms = cloud_client.get("/organizations/#{org_id}/platforms")['data']
     platforms.map do |p|
-      Kontena::Cli::Models::Platform.new(p)
+      platform = Kontena::Cli::Models::Platform.new(p)
+      cached_platforms << platform if cached_platforms.none?{|cached| platform.id == cached.id }
+      platform
+    end
+  end
+
+  def prompt_platform
+    platforms = fetch_platforms_for_org(current_organization)
+    prompt.select("Choose platform") do |menu|
+      platforms.each do |p|
+        menu.choice p.name, p
+      end
     end
   end
 
   # @return [String, NilClass]
   def current_organization
-    @current_organization || ENV['KONTENA_ORGANIZATION'] || (current_account && current_account.username)
+    @current_organization || ENV['KONTENA_ORGANIZATION']
   end
 
   def current_platform
@@ -33,17 +48,17 @@ module Kontena::Plugin::Cloud::Platform::Common
   # @param [String] name
   def require_platform(name)
     org, platform = parse_platform_name(name)
-
     @current_organization = org
-
-    unless platform_config_exists?(name)
-      p = find_platform_by_name(platform, org)
-      exit_with_error("Platform not found") unless p
-
-      login_to_platform(name, p.url)
+    p = find_platform_by_name(platform, org)
+    exit_with_error("Platform not found") unless p
+    unless platform_config_exists?(p.to_path)
+      spinner "Generating platform token" do
+        login_to_platform("#{current_organization}/#{platform}", p.url)
+      end
     end
-    self.current_master = name
-    self.current_grid = platform
+    self.current_master = "#{current_organization}/#{platform}"
+    self.current_grid = p.grid_id
+    p
   end
 
   # @param [String] name
@@ -64,22 +79,30 @@ module Kontena::Plugin::Cloud::Platform::Common
   end
 
   def find_platform_by_name(name, org)
-    data = cloud_client.get("/organizations/#{org}/platforms/#{name}")['data']
-    if data
-      Kontena::Cli::Models::Platform.new(data)
+    if platform = cached_platforms.find{|p| p.name == name && p.organization == org }
+      platform
+    else
+      data = cloud_client.get("/organizations/#{org}/platforms/#{name}")['data']
+      if data
+        platform = Kontena::Cli::Models::Platform.new(data)
+        cached_platforms << platform
+        platform
+      end
     end
   end
 
   def login_to_platform(name, url)
     organization, platform = name.split('/')
-    platform = cloud_client.get("/organizations/#{organization}/platforms/#{platform}")['data']
-    authorization = cloud_client.post("/organizations/#{organization}/masters/#{platform.dig('attributes', 'master-id')}/authorize", {})
-    exchanger = Kontena::Cli::MasterCodeExchanger.new(platform.dig('attributes', 'url'))
+    platform = find_platform_by_name(platform, organization)
+    authorization = cloud_client.post("/organizations/#{organization}/masters/#{platform.master_id}/authorize", {})
+    exchanger = Kontena::Cli::MasterCodeExchanger.new(platform.url)
     code = exchanger.exchange_code(authorization['code'])
     cmd = [
       'master', 'login', '--silent', '--no-login-info', '--skip-grid-auto-select',
       '--name', name, '--code', code, url
     ]
     Kontena.run!(cmd)
+  rescue => e
+    error e.message
   end
 end

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

@@ -47,7 +47,6 @@ class Kontena::Plugin::Cloud::Platform::CreateCommand < Kontena::Command
   def prompt_organization
     organizations = cloud_client.get('/organizations')['data']
     prompt.select("Choose organization:") do |menu|
-      menu.choice "#{config.current_account.username} (you)", config.current_account.username
       organizations.each do |o|
         menu.choice o.dig('attributes', 'name')
       end

data/lib/kontena/plugin/cloud/platform/env_command.rb

@@ -0,0 +1,9 @@
+require_relative 'common'
+
+class Kontena::Plugin::Cloud::Platform::EnvCommand < Kontena::Command
+  include Kontena::Cli::Common
+
+  def execute
+    Kontena.run!(['grid','env'])
+  end
+end

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

@@ -1,9 +1,11 @@
 require_relative 'common'
+require_relative '../organization/common'
 
 class Kontena::Plugin::Cloud::Platform::ListCommand < Kontena::Command
   include Kontena::Cli::Common
   include Kontena::Cli::TableGenerator::Helper
   include Kontena::Plugin::Cloud::Platform::Common
+  include Kontena::Plugin::Cloud::Organization::Common
 
   requires_current_account_token
 
@@ -22,13 +24,12 @@ class Kontena::Plugin::Cloud::Platform::ListCommand < Kontena::Command
   end
 
   def default_organization
-    current_account.username
+    prompt_organization
   end
 
   def fields
     {
       name: 'name',
-      organization: 'organization',
       region: 'region'
     }
   end
@@ -37,7 +38,7 @@ class Kontena::Plugin::Cloud::Platform::ListCommand < Kontena::Command
     case health
     when nil
       " ".freeze
-    when 'online'.freeze
+    when 'running'.freeze
       pastel.green('⊛'.freeze)
     else
       pastel.dark('⊝'.freeze)

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

@@ -20,6 +20,7 @@ class Kontena::Plugin::Cloud::Platform::ShowCommand < Kontena::Command
     puts "  organization: #{current_organization}"
     puts "  version: #{platform.version}"
     puts "  state: #{platform.state}"
+    puts "  online: #{platform.online}"
     puts "  region: #{platform.region || '-'}"
     puts "  initial_size: #{platform.initial_size}"
     puts "  master: #{platform.url}"

data/lib/kontena/plugin/cloud/platform/use_command.rb

@@ -1,41 +1,28 @@
 require_relative 'common'
+require_relative '../organization/common'
 
 class Kontena::Plugin::Cloud::Platform::UseCommand < Kontena::Command
   include Kontena::Cli::Common
   include Kontena::Plugin::Cloud::Platform::Common
+  include Kontena::Plugin::Cloud::Organization::Common
 
   requires_current_account_token
 
   parameter "[NAME]", "Platform name"
 
   def execute
-    if name
-      require_platform(name)
-      platform = find_platform_by_name(current_grid, current_organization)
+    if name && name.include?('/')
+      platform = require_platform(name)
     else
+      @current_organization = prompt_organization
       platform = prompt_platform
+      require_platform(platform.to_path)
     end
 
-    platform_name = "#{current_organization}/#{platform.name}"
-    unless platform_config_exists?(platform_name)
-      spinner "Generating platform token" do
-        login_to_platform(platform_name, platform.url)
-      end
-    else
-      config.current_master = platform_name
-      config.current_master.grid = platform.grid_id
-      config.write
-    end
-
-    puts "Using platform: #{pastel.cyan(platform_name)}"
+    config.current_master = platform.to_path
+    config.current_master.grid = platform.grid_id
+    config.write
+    puts "Using platform: #{pastel.cyan(platform.to_path)}"
   end
 
-  def prompt_platform
-    platforms = fetch_platforms_for_org(current_organization)
-    prompt.select("Choose platform") do |menu|
-      platforms.each do |p|
-        menu.choice p.name, p
-      end
-    end
-  end
 end

data/lib/kontena/plugin/cloud/platform_command.rb

@@ -7,6 +7,7 @@ class Kontena::Plugin::Cloud::PlatformCommand < Kontena::Command
   subcommand ['join', 'byo'], 'Join grid as Kontena Platform', load_subcommand('kontena/plugin/cloud/platform/import_grid_command')
   subcommand 'user', 'User management commands', load_subcommand('kontena/plugin/cloud/platform/user_command')
   subcommand 'upgrade', 'Upgrade platform version', load_subcommand('kontena/plugin/cloud/platform/upgrade_command')
+  subcommand 'env', 'Show the current grid environment details', load_subcommand('kontena/plugin/cloud/platform/env_command')
 
   def execute
   end

data/lib/kontena/plugin/cloud.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Cloud
-      VERSION = "1.1.0.pre1"
+      VERSION = "1.1.0.pre2"
 
       module Organization
         module User; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-cloud
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre1
+  version: 1.1.0.pre2
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -61,6 +61,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -70,8 +71,10 @@ files:
 - 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/organization.rb
 - lib/kontena/cli/models/platform.rb
 - lib/kontena/plugin/cloud.rb
+- lib/kontena/plugin/cloud/organization/common.rb
 - lib/kontena/plugin/cloud/organization/list_command.rb
 - lib/kontena/plugin/cloud/organization/remove_command.rb
 - lib/kontena/plugin/cloud/organization/show_command.rb
@@ -82,6 +85,7 @@ files:
 - lib/kontena/plugin/cloud/organization_command.rb
 - lib/kontena/plugin/cloud/platform/common.rb
 - lib/kontena/plugin/cloud/platform/create_command.rb
+- lib/kontena/plugin/cloud/platform/env_command.rb
 - lib/kontena/plugin/cloud/platform/import_grid_command.rb
 - lib/kontena/plugin/cloud/platform/list_command.rb
 - lib/kontena/plugin/cloud/platform/remove_command.rb
@@ -117,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Kontena Cloud management for Kontena CLI