kontena-cli 0.16.0.rc2 → 0.16.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 051696774831893f38af45c6790e320cf2a7da4e
-  data.tar.gz: 46e7cb09fdcb4b1c02706948d7f70591542904a5
+  metadata.gz: 639ee46ae3a2e35cd233618b89c463e8b66afec6
+  data.tar.gz: d1fa540a0a6f95deae41f8f89da60d07b62138dd
 SHA512:
-  metadata.gz: 87e2d9d32a07d852588178cf9044469c2651b88dc68e7611eeeb333e409b97717c0aa4cda9e80ba2bd36a64864dfc8518a346c57e3410894f7efd4d0ce94590b
-  data.tar.gz: 9e6974e85c570f104b444a0c6730d9bc471fdd41495b9d8254f1f769fa8a9057779c9c9b5289837ac6cad51dbcf07f7086f1966448dcb0d087eec2064795fdfe
+  metadata.gz: 6c181a8df5253b768c91afd964327bf9a5b940156bd453fdb0f5fc2e804e22470ad51ebe0cdaab1f0de6f491c76bb19fb7c7d48542b2a9ea58e840a8a1e3ee09
+  data.tar.gz: d096bbb4557f247a3e6345e32a6fb95dafb1e79b091bc2c702961975dfd78c75183a335ddd441267e1e6168ceda11ea47f47ad59fdee394e917ff0ddf6de1aa2

data/VERSION

@@ -1 +1 @@
-0.16.0.rc2
+0.16.0.rc3

data/lib/kontena/callbacks/master/deploy/05_before_deploy_configuration_wizard.rb

@@ -40,9 +40,13 @@ module Kontena
         puts "You don't seem to be logged in to Kontena Cloud"
         puts
         Kontena.run("cloud login --verbose")
+        config.reset_instance
+        reset_cloud_client
+        result = false
         Retriable.retriable do
-          cloud_client.authentication_ok?(kontena_account.userinfo_endpoint)
+          result = cloud_client.authentication_ok?(kontena_account.userinfo_endpoint)
         end
+        result
       end
 
       def before

data/lib/kontena/cli/cloud/login_command.rb

@@ -120,6 +120,8 @@ module Kontena::Cli::Cloud
         config.write
         display_logo
         display_login_info(only: :account)
+        config.reset_instance
+        reset_cloud_client
         exit 0
       else
         puts "Authentication failed".colorize(:red)

data/lib/kontena/cli/cloud/master/add_command.rb

@@ -112,6 +112,8 @@ module Kontena::Cli::Cloud::Master
     def execute
       unless cloud_client.authentication_ok?(kontena_account.userinfo_endpoint)
         Kontena.run('cloud login')
+        config.reset_instance
+        reset_cloud_client
       end
 
       return register_current if self.current?

data/lib/kontena/cli/common.rb

@@ -166,6 +166,10 @@ module Kontena
         @cloud_client ||= Kontena::Client.new(kontena_account.url, kontena_account.token, prefix: '/')
       end
 
+      def reset_cloud_client
+        @cloud_client = nil
+      end
+
       def client(token = nil, api_url = nil)
         if token.kind_of?(String)
           token = Kontena::Cli::Config::Token.new(access_token: token)

data/lib/kontena/cli/config.rb

@@ -511,6 +511,7 @@ module Kontena
 
         def account
           return @account if @account
+          return config.find_account('master') unless parent
           @account = 
             case parent_type
             when :master then config.find_account(parent.account)

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

@@ -108,7 +108,7 @@ module Kontena::Cli::Master
       if self.token
         # Use supplied token
         server.token = Kontena::Cli::Config::Token.new(access_token: self.token, parent_type: :master, parent_name: server.name)
-      elsif server.token.nil?
+      elsif server.token.nil? || self.force?
         # Create new empty token if the server does not have one yet
         server.token = Kontena::Cli::Config::Token.new(parent_type: :master, parent_name: server.name)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.16.0.rc2
+  version: 0.16.0.rc3
 platform: ruby
 authors:
 - Kontena, Inc