kontena-cli 0.17.0.pre3 → 0.17.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 091d78ecbf785c27a358a6df073988d29127d73d
-  data.tar.gz: e74870ae94379be1bd36a1cd06cbc23a6a56279f
+  metadata.gz: 2cd10a782d72e14c697891b6de5aa825f6d25ee3
+  data.tar.gz: 4a00e35a86fed8fa9f41dd194a81577e921a26d1
 SHA512:
-  metadata.gz: dcef3ab01f20279b7bcfd13430fe069bc5d9763f437ffb77015a59066c1bcc48968554c0f959ce896464525dfbbcbb526227f5e79393ddaebd28bc2fe6af42f8
-  data.tar.gz: f14436a2b06fab14df0d72fa506067dbda2a3b8e566e1e6040b1563625b95d3fae10472c9a4694122d1bccd2af139fe7ae26fcde188cbf2210d132bffdd4581e
+  metadata.gz: 73c71530dac6cd22b3781754cd6302cca76e4b3421edf58ea7e929d2dff00e077a507b80e81bd759e8abdc9625faf5247c724852ad9bf17074afc7634678a1c0
+  data.tar.gz: 68493feaf35cbb9e0c0a2611d1ca52b7f7ed4aafde767565d73e799e873c05f9ff83a5b99c50279696b6f3ba604a76899d6485effb595b3e9221332816447c3c

data/VERSION

@@ -1 +1 @@
-0.17.0.pre3
+0.17.0.pre4

data/lib/kontena/cli/services/list_command.rb

@@ -37,9 +37,14 @@ module Kontena::Cli::Services
         "#{p['ip']}:#{p['node_port']}->#{p['container_port']}/#{p['protocol']}"
       }.join(", ")
       health = health_status(service)
+      if service.dig('stack', 'name').to_s == 'null'.freeze
+        name = service['name']
+      else
+        name = "#{service.dig('stack', 'name')}/#{service['name']}"
+      end
       vars = [
         health_status_icon(health),
-        "#{service.dig('stack', 'name')}/#{service['name']}",
+        name,
         instances,
         stateful,
         service['state'],

data/lib/kontena/cli/services/logs_command.rb

@@ -17,7 +17,7 @@ module Kontena::Cli::Services
       query_params = {}
       query_params[:container] = "#{name}-#{instance}" if instance
 
-      show_logs("services/#{current_grid}/#{name}/container_logs", query_params) do |log|
+      show_logs("services/#{parse_service_id(name)}/container_logs", query_params) do |log|
         show_log(log)
       end
     end

data/lib/kontena/cli/services/monitor_command.rb

@@ -15,8 +15,8 @@ module Kontena::Cli::Services
 
       loop do
         nodes = {}
-        service = client(token).get("services/#{current_grid}/#{name}")
-        result = client(token).get("services/#{current_grid}/#{name}/containers")
+        service = client(token).get("services/#{parse_service_id(name)}")
+        result = client(token).get("services/#{parse_service_id(name)}/containers")
         result['containers'].each do |container|
           nodes[container['node']['name']] ||= []
           nodes[container['node']['name']] << container

data/lib/kontena/cli/services/services_helper.rb

@@ -279,7 +279,7 @@ module Kontena
           elsif count == 1
             param = "#{current_grid}/#{service_id}"
           else
-            param = "#{current_grid}/default/#{service_id}"
+            param = "#{current_grid}/null/#{service_id}"
           end
         end
 

data/lib/kontena/cli/services/stats_command.rb

@@ -30,7 +30,7 @@ module Kontena::Cli::Services
     private
 
     def fetch_stats(token, service_id, follow)
-      result = client(token).get("services/#{current_grid}/#{service_id}/stats")
+      result = client(token).get("services/#{parse_service_id(service_id)}/stats")
       system('clear') if follow
       render_header
       result['stats'].each do |stat|

data/spec/kontena/cli/services/link_command_spec.rb

@@ -35,7 +35,7 @@ describe Kontena::Cli::Services::LinkCommand do
 
     it 'sends link to master' do
       expect(client).to receive(:put).with(
-        'services/test-grid/default/service-a', {links: [{name: 'service-b', alias: 'service-b'}]}
+        'services/test-grid/null/service-a', {links: [{name: 'service-b', alias: 'service-b'}]}
       )
       subject.run(['service-a', 'service-b'])
     end

data/spec/kontena/cli/services/secrets/link_command_spec.rb

@@ -35,10 +35,10 @@ describe Kontena::Cli::Services::Secrets::LinkCommand do
           {secret: 'MY_PASSWORD', name: 'PASSWORD', type: 'env'}
         ]
       }
-      allow(client).to receive(:get).with("services/test-grid/default/foo").and_return({
+      allow(client).to receive(:get).with("services/test-grid/null/foo").and_return({
         'secrets' => []
       })
-      expect(client).to receive(:put).with("services/test-grid/default/foo", data)
+      expect(client).to receive(:put).with("services/test-grid/null/foo", data)
       subject.run(['foo', 'MY_PASSWORD:PASSWORD:env'])
     end
 
@@ -54,8 +54,8 @@ describe Kontena::Cli::Services::Secrets::LinkCommand do
           {secret: 'MY_PASSWORD', name: 'PASSWORD', type: 'env'}
         ]
       }
-      allow(client).to receive(:get).with("services/test-grid/default/foo").and_return(original)
-      expect(client).to receive(:put).with("services/test-grid/default/foo", data)
+      allow(client).to receive(:get).with("services/test-grid/null/foo").and_return(original)
+      expect(client).to receive(:put).with("services/test-grid/null/foo", data)
       subject.run(['foo', 'MY_PASSWORD:PASSWORD:env'])
     end
   end

data/spec/kontena/cli/services/secrets/unlink_command_spec.rb

@@ -41,8 +41,8 @@ describe Kontena::Cli::Services::Secrets::UnlinkCommand do
           {'secret' => 'BAR', 'name' => 'BAZ', 'type' => 'env'}
         ]
       }
-      allow(client).to receive(:get).with("services/test-grid/default/mymy").and_return(original)
-      expect(client).to receive(:put).with("services/test-grid/default/mymy", data)
+      allow(client).to receive(:get).with("services/test-grid/null/mymy").and_return(original)
+      expect(client).to receive(:put).with("services/test-grid/null/mymy", data)
       subject.run(['mymy', 'FOO:BAR:env'])
     end
   end

data/spec/kontena/cli/services/services_helper_spec.rb

@@ -29,43 +29,43 @@ module Kontena::Cli::Services
 
     describe '#update_service' do
       it 'creates PUT services/:id request to Kontena Server' do
-        expect(client).to receive(:put).with('services/test-grid/default/1', {'name' => 'test-service'})
+        expect(client).to receive(:put).with('services/test-grid/null/1', {'name' => 'test-service'})
         subject.update_service(token, '1', {'name' => 'test-service'})
       end
     end
 
     describe '#get_service' do
       it 'creates GET services/:id request to Kontena Server' do
-        expect(client).to receive(:get).with('services/test-grid/default/test-service')
+        expect(client).to receive(:get).with('services/test-grid/null/test-service')
         subject.get_service(token, 'test-service')
       end
     end
 
     describe '#stop_service' do
       it 'creates POST services/:id/stop request to Kontena Server' do
-        expect(client).to receive(:post).with('services/test-grid/default/test-service/stop', {})
+        expect(client).to receive(:post).with('services/test-grid/null/test-service/stop', {})
         subject.stop_service(token, 'test-service')
       end
     end
 
     describe '#start_service' do
       it 'creates POST services/:id/start request to Kontena Server' do
-        expect(client).to receive(:post).with('services/test-grid/default/test-service/start', {})
+        expect(client).to receive(:post).with('services/test-grid/null/test-service/start', {})
         subject.start_service(token, 'test-service')
       end
     end
 
     describe '#restart_service' do
       it 'creates POST services/:id/restart request to Kontena Server' do
-        expect(client).to receive(:post).with('services/test-grid/default/test-service/restart', {})
+        expect(client).to receive(:post).with('services/test-grid/null/test-service/restart', {})
         subject.restart_service(token, 'test-service')
       end
     end
 
     describe '#deploy_service' do
       it 'creates POST services/:id/deploy request to Kontena Server' do
-        allow(client).to receive(:get).with('services/test-grid/default/1').and_return({'state' => 'running'})
-        expect(client).to receive(:post).with('services/test-grid/default/1/deploy', {'strategy' => 'ha'})
+        allow(client).to receive(:get).with('services/test-grid/null/1').and_return({'state' => 'running'})
+        expect(client).to receive(:post).with('services/test-grid/null/1/deploy', {'strategy' => 'ha'})
         subject.deploy_service(token, '1', {'strategy' => 'ha'})
       end
     end
@@ -147,7 +147,7 @@ module Kontena::Cli::Services
 
     describe '#parse_service_id' do
       it 'adds current_grid & stack if service_id is missing prefix' do
-        expect(subject.parse_service_id('mysql')).to eq('test-grid/default/mysql')
+        expect(subject.parse_service_id('mysql')).to eq('test-grid/null/mysql')
       end
 
       it 'adds current grid if service_id has stack & service' do

data/spec/kontena/cli/services/unlink_command_spec.rb

@@ -35,7 +35,7 @@ describe Kontena::Cli::Services::UnlinkCommand do
 
     it 'sends link to master' do
       expect(client).to receive(:put).with(
-        'services/test-grid/default/service-a', {links: []}
+        'services/test-grid/null/service-a', {links: []}
       )
       subject.run(['service-a', 'service-b'])
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.17.0.pre3
+  version: 0.17.0.pre4
 platform: ruby
 authors:
 - Kontena, Inc