kontena-plugin-cloud 1.2.0.pre3 → 1.2.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a0321e44435bc55fe3feb110f4e3d473763f5b96b9c79563bbd0036f85ffa2c
-  data.tar.gz: 4b0c16f46bfcff2ead931dbfe7ad97a07fa491ce926fc398fe8c595e0c98c0ea
+  metadata.gz: f9e4eba676152d47b5effc551728bc8d79fa77351e935a0c54ed672695853164
+  data.tar.gz: 64d1898e5115c26d06058f1ae20787a81e10b7ffa81a819887daa678d5ef8050
 SHA512:
-  metadata.gz: 608f083d9c1a2ef98ce84031c0e5ca684080d2d41ca25acc38fe5c7dbc0e76f446a2ec6f0f350aa88b4c0386550526f9f7130d0177e14df79a2cbc3b346e0b3f
-  data.tar.gz: 8f70c145db6aa4e9003b644a786eabd2b17249680d3fedb9d83fd9df0f29a57d19aed4f55dc963e65330b506d06938957961a85986033d32ad5619537118c9c9
+  metadata.gz: c701b5421f14192706e66f45e7841e333ad82bd0ed2d347abad402fca4cee0a2c34773fbdb6da72aa1b338a90e352d07f8633b18f32a497dfd4e307f5f77a0ea
+  data.tar.gz: beeca426616465e23e6996483b5d04c927edf9f589817f214bcb80bf6917bd924338632860123e71afc9f496fcfa78612db2a8ae72eb1da1b54c5487fffcf3ec

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

@@ -1,5 +1,6 @@
 require_relative '../../../cli/master_code_exchanger'
 require_relative '../../../cli/models/platform'
+require 'kontena/cli/master/login_command'
 
 module Kontena::Plugin::Cloud::Platform::Common
 
@@ -99,11 +100,13 @@ module Kontena::Plugin::Cloud::Platform::Common
     authorization = cloud_client.post("/organizations/#{organization}/masters/#{platform.master_id}/authorize", {})
     exchanger = Kontena::Cli::MasterCodeExchanger.new(platform.url)
     code = exchanger.exchange_code(authorization['code'])
+
+    login = Kontena::Cli::Master::LoginCommand.new('kontena')
     cmd = [
-      'master', 'login', '--silent', '--no-login-info', '--skip-grid-auto-select',
+      '--silent', '--no-login-info', '--skip-grid-auto-select',
       '--name', name, '--code', code, url
     ]
-    Kontena.run!(cmd)
+    login.run(cmd)
   rescue => e
     error e.message
   end

data/lib/kontena/plugin/cloud.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Cloud
-      VERSION = "1.2.0.pre3"
+      VERSION = "1.2.0.pre4"
 
       module Organization
         module User; end

data/lib/kontena_cli_plugin.rb

@@ -17,6 +17,44 @@ module Kontena
         end
       end
     end
+
+    class Config
+
+      # patch broken cli
+      unless self.instance_methods.include?(:load_cloud_settings_from_env)
+
+        def load_settings_from_env
+          load_cloud_settings_from_env
+          load_master_settings_from_env
+        end
+
+        def load_master_settings_from_env
+          return nil unless ENV['KONTENA_URL']
+
+          debug { 'Loading master configuration from ENV' }
+          servers << Server.new(
+            url: ENV['KONTENA_URL'],
+            name: 'default',
+            token: Token.new(access_token: ENV['KONTENA_TOKEN'], parent_type: :master, parent_name: 'default'),
+            grid: ENV['KONTENA_GRID'],
+            parent_type: :master,
+            parent_name: 'default'
+          )
+
+          self.current_master  = 'default'
+          self.current_account = 'kontena'
+        end
+
+        def load_cloud_settings_from_env
+          return unless ENV['KONTENA_CLOUD_TOKEN']
+
+          debug { 'Loading cloud configuration from ENV' }
+          accounts << Account.new(kontena_account_data.merge(
+            token: Token.new(access_token: ENV['KONTENA_CLOUD_TOKEN'], parent_type: :account, parent_name: 'default')
+          ))
+        end
+      end
+    end
   end
 
   module CloudCommand

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-cloud
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre3
+  version: 1.2.0.pre4
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli