kontena-cli 1.4.0.pre5 → 1.4.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9521c63986952c3d6e770bf225fe6a30400eb2d6
-  data.tar.gz: f1a7355bcf1c4597cca0a213dccb1b20dbe63eb2
+  metadata.gz: 750f17967025517060b46f32a63528d34aa6c578
+  data.tar.gz: bd34c1c6c26e981984e15ce74cf0a03f9e96425e
 SHA512:
-  metadata.gz: facae60dda263da930a28095b812fdd2093fb4fe833b83a95b992f77708c775f28cb6d527577817020a37fe7e966cf4a9535faf39fa6ffa700101692a819a4fa
-  data.tar.gz: 4e61b9b417159744787827cd0ecac452bf2803977ba588bfe270ea89fa02cd02d8f797e131b890bc09e0b9f38f5e0bb164c5213736e5762bee06fa82c58b433f
+  metadata.gz: 7e3574f15562be1bb53e0fa6c8c0f7db14a7925760174b9d794d411c976cbe08f49aa0f80d0a106de24c8b9495110811b4e611bc4d6ad521009b5a0f71a74fc3
+  data.tar.gz: 77e86e97a2691c16e210589d3d60ef41dfcd07087f9743b215a03628a65f2b804f9390e815fa2d179d9d74be3596ab8dec732d842d8a49694941996b3280696e

data/Dockerfile

@@ -7,9 +7,12 @@ ARG CLI_VERSION
 RUN apk update && \
   apk --update add ruby ruby-json ruby-bigdecimal ruby-io-console \
   ca-certificates libssl1.0 openssl libstdc++ && \
-  gem install kontena-cli --no-rdoc --no-ri -v ${CLI_VERSION} && \
   chmod +x /usr/local/bin/docker
 
+RUN apk --update add --virtual build-dependencies ruby-dev build-base openssl-dev && \
+  gem install kontena-cli --no-rdoc --no-ri -v ${CLI_VERSION} && \
+  apk del build-dependencies
+
 VOLUME ["/root"]
 WORKDIR /root
 ENTRYPOINT ["/usr/bin/kontena"]

data/VERSION

@@ -1 +1 @@
-1.4.0.pre5
+1.4.0.pre6

data/lib/kontena/cli/nodes/env_command.rb

@@ -14,10 +14,15 @@ module Kontena::Cli::Nodes
       grid_uri = self.current_master['url'].sub('http', 'ws')
     end
 
-    def execute
-      token_node = client.get("nodes/#{current_grid}/#{name}/token")
+    def get_node_token
+      return client.get("nodes/#{current_grid}/#{name}/token")
+    rescue Kontena::Errors::StandardError => exc
+      raise unless exc.status == 404
+      return nil
+    end
 
-      unless token_node['token']
+    def execute
+      unless token_node = get_node_token()
         exit_with_error "Node #{name} was not created with a node token. Use `kontena grid env` instead"
       end
 

data/lib/kontena/cli/nodes/reset_token_command.rb

@@ -17,14 +17,17 @@ module Kontena::Cli::Nodes
     def execute
       confirm("Resetting the node token will disconnect the agent (unless using --no-reset-connection), and require you to reconfigure the kontena-agent using the new `kontena node env` values before it will be able to reconnect. Are you sure?")
 
-      data = {}
-
-      data[:token] = self.token
-      data[:token] = '' if self.clear_token?
-      data[:reset_connection] = self.reset_connection?
-
       spinner "Resetting node #{self.node.colorize(:cyan)} websocket connection token" do
-        client.put("nodes/#{current_grid}/#{self.node}/token", data)
+        if self.clear_token?
+          client.delete("nodes/#{current_grid}/#{self.node}/token",
+            reset_connection: self.reset_connection?,
+          )
+        else
+          client.put("nodes/#{current_grid}/#{self.node}/token",
+            token: self.token,
+            reset_connection: self.reset_connection?,
+          )
+        end
       end
     end
   end

data/spec/kontena/cli/nodes/env_command_spec.rb

@@ -31,15 +31,8 @@ describe Kontena::Cli::Nodes::EnvCommand do
   end
 
   context 'for a node without any token' do
-    let :node_token do
-      {
-        "id" => nil,
-        "token" => nil,
-      }
-    end
-
     before do
-      expect(client).to receive(:get).with('nodes/test-grid/node-1/token').and_return(node_token)
+      expect(client).to receive(:get).with('nodes/test-grid/node-1/token').and_raise(Kontena::Errors::StandardError.new(404, "Host node does not have a node token"))
     end
 
     it 'uses the grid token' do

data/spec/kontena/cli/nodes/reset_token_command_spec.rb

@@ -30,9 +30,15 @@ describe Kontena::Cli::Nodes::ResetTokenCommand do
     subject.run(['--force', '--no-reset-connection', 'test-node'])
   end
 
-  it 'PUTs to clear token without reset_connection' do
-    expect(client).to receive(:put).with('nodes/test-grid/test-node/token', {token: '', reset_connection: false})
+  it 'DELETEs to clear token without reset_connection' do
+    expect(client).to receive(:delete).with('nodes/test-grid/test-node/token', {reset_connection: false})
 
     subject.run(['--force', '--no-reset-connection', '--clear-token', 'test-node'])
   end
+
+  it 'DELETEs to clear token with reset_connection' do
+    expect(client).to receive(:delete).with('nodes/test-grid/test-node/token', {reset_connection: true})
+
+    subject.run(['--force', '--clear-token', 'test-node'])
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre5
+  version: 1.4.0.pre6
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler