kontena-cli 1.4.0.pre6 → 1.4.0.pre7

data/omnibus/config/software/{kontena.rb → kontena-cli.rb}

@@ -1,4 +1,5 @@
 name "kontena-cli"
+license "Apache 2.0"
 default_version File.read('../VERSION').strip
 source path: "./wrappers"
 dependency "ruby"
@@ -10,5 +11,6 @@ build do
   gem "install rb-readline -v 0.5.4 --no-ri --no-doc"
   gem "install nokogiri -v 1.6.8 --no-ri --no-doc"
   gem "install kontena-cli -v #{default_version} --no-ri --no-doc"
+  gem "install kontena-plugin-cloud --no-ri --no-doc"
   copy "sh/kontena", "#{install_dir}/bin/kontena"
 end

data/spec/fixtures/api/node.json

@@ -89,5 +89,6 @@
       "initial_size" : 1
    },
    "mem_total" : 1045032960,
-   "connected" : true
+   "connected" : true,
+   "availability": "active"
 }

data/spec/fixtures/stack-internal-extend.yml

@@ -4,8 +4,13 @@ services:
   base:
     stateful: true
     instances: 2
+    image: base
     deploy:
       strategy: ha
+    environment:
+      - "TEST1=test1"
+      - "TEST2=test2"
   app:
     extends: base
-    stateful: true
+    environment:
+      - "TEST2=changed"

data/spec/fixtures/stack-with-dependencies-dep-1-1.yml

@@ -0,0 +1,8 @@
+stack: user/depstack1child1child1
+version: 0.0.1
+variables:
+  dep_var:
+    type: integer
+services:
+  monitor:
+    image: "image:${dep_var}"

data/spec/fixtures/stack-with-dependencies-dep-1.yml

@@ -0,0 +1,17 @@
+stack: user/depstack1child1
+version: 0.0.1
+variables:
+  test_var:
+    type: string
+    from:
+      random_string:
+        length: 16
+        charset: hex
+depends:
+  dep_1:
+    stack: stack-with-dependencies-dep-1-1.yml
+    variables:
+      dep_var: 2
+services:
+  db:
+    image: "$test_var"

data/spec/fixtures/stack-with-dependencies-dep-2.yml

@@ -0,0 +1,8 @@
+stack: user/depstack1child2
+version: 0.0.1
+variables:
+  dep_var:
+    type: integer
+services:
+  cache:
+    image: "image:$dep_var"

data/spec/fixtures/stack-with-dependencies-dep-3.yml

@@ -0,0 +1,5 @@
+stack: user/depstack1child3
+version: 0.0.1
+services:
+  logger:
+    image: logger

data/spec/fixtures/stack-with-dependencies-dep_2-removed.yml

@@ -0,0 +1,17 @@
+stack: user/depstack1
+version: 0.0.1
+variables:
+  test_var:
+    type: string
+    from:
+      random_string:
+        length: 16
+        charset: hex
+depends:
+  dep_1:
+    stack: stack-with-dependencies-dep-1.yml
+services:
+  app:
+    image: "${test_var}"
+    environment:
+      - "TEST=${dep_1}"

data/spec/fixtures/stack-with-dependencies-dep_3-added.yml

@@ -0,0 +1,25 @@
+stack: user/depstack1
+version: 0.0.1
+variables:
+  test_var:
+    type: string
+    from:
+      random_string:
+        length: 16
+        charset: hex
+depends:
+  dep_1:
+    stack: stack-with-dependencies-dep-1.yml
+  dep_2:
+    stack: stack-with-dependencies-dep-2.yml
+    variables:
+      dep_var: 1
+  dep_3:
+    stack: stack-with-dependencies-dep-3.yml
+services:
+  app:
+    image: "${test_var}"
+    environment:
+      - "TEST=${dep_1}"
+      - "TEST2=${dep_2}"
+

data/spec/fixtures/stack-with-dependencies.yml

@@ -0,0 +1,22 @@
+stack: user/depstack1
+version: 0.0.1
+variables:
+  test_var:
+    type: string
+    from:
+      random_string:
+        length: 16
+        charset: hex
+depends:
+  dep_1:
+    stack: stack-with-dependencies-dep-1.yml
+  dep_2:
+    stack: stack-with-dependencies-dep-2.yml
+    variables:
+      dep_var: 1
+services:
+  app:
+    image: "${test_var}"
+    environment:
+      - "TEST=${dep_1}"
+      - "TEST2=${dep_2}"

data/spec/fixtures/stack-with-variables.yml

@@ -42,6 +42,9 @@ services:
     stateful: true
     environment:
       - WORDPRESS_DB_PASSWORD=${STACK}_secret
+      - STACK=${STACK}
+      - GRID=${GRID}
+      - PLATFORM=${PLATFORM}
     secrets:
       - secret: WP_ADMIN_PASSWORD
         name: WORDPRESS_PASSWORD

data/spec/kontena/cli/etcd/health_command_spec.rb

@@ -8,26 +8,14 @@ describe Kontena::Cli::Etcd::HealthCommand do
     allow(subject).to receive(:health_icon) {|health| health.inspect }
   end
 
-  let :node1_health do
+  let :node1_errors do
     {
-      "id" => 'test-grid/node-1',
-      "connected" => false,
-      "name" => "node-1",
-      'etcd_health' => {
-        'health' => nil,
-        'error' => nil,
-      },
+      'connection' => "Websocket disconnected at 2017-08-16 14:50:46 UTC with code 1006: ",
     }
   end
-  let :node2_health do
+  let :node2_errors do
     {
-      "id" => 'test-grid/node-2',
-      "name" => "node-2",
-      "connected" => true,
-      'etcd_health' => {
-        'health' => nil,
-        'error' => "timeout",
-      },
+      'etcd_health' => "RPC timeout",
     }
   end
   let :node3_health do
@@ -46,6 +34,17 @@ describe Kontena::Cli::Etcd::HealthCommand do
       "id" => 'test-grid/node-4',
       "name" => "node-4",
       "connected" => true,
+      'etcd_health' => {
+        'health' => nil,
+        'error' => "proxy: zero endpoints currently available",
+      },
+    }
+  end
+  let :node5_health do
+    {
+      "id" => 'test-grid/node-5',
+      "name" => "node-5",
+      "connected" => true,
       'etcd_health' => {
         'health' => true,
         'error' => nil,
@@ -54,24 +53,25 @@ describe Kontena::Cli::Etcd::HealthCommand do
   end
 
   before do
-    allow(client).to receive(:get).with('nodes/test-grid/node-1/health').and_return(node1_health)
-    allow(client).to receive(:get).with('nodes/test-grid/node-2/health').and_return(node2_health)
+    allow(client).to receive(:get).with('nodes/test-grid/node-1/health').and_raise(Kontena::Errors::StandardErrorHash.new(422, "", node1_errors))
+    allow(client).to receive(:get).with('nodes/test-grid/node-2/health').and_raise(Kontena::Errors::StandardErrorHash.new(422, "", node2_errors))
     allow(client).to receive(:get).with('nodes/test-grid/node-3/health').and_return(node3_health)
     allow(client).to receive(:get).with('nodes/test-grid/node-4/health').and_return(node4_health)
+    allow(client).to receive(:get).with('nodes/test-grid/node-5/health').and_return(node5_health)
   end
 
   context "For an offline node-1" do
     it "shows offline and returns false" do
       expect{subject.run(['node-1'])}.to exit_with_error.and output_lines [
-        ":offline Node node-1 is offline",
+        ":offline Node test-grid/node-1 connection error: Websocket disconnected at 2017-08-16 14:50:46 UTC with code 1006: ",
       ]
     end
   end
 
-  context "For a node-2 with health errors" do
+  context "For a node-2 with RPC errors" do
     it "shows errored and returns false" do
       expect{subject.run(['node-2'])}.to exit_with_error.and output_lines [
-        ":error Node node-2 is unhealthy: timeout",
+        ":offline Node test-grid/node-2 etcd_health error: RPC timeout",
       ]
     end
   end
@@ -79,15 +79,23 @@ describe Kontena::Cli::Etcd::HealthCommand do
   context "For a node-3 that returns health=false" do
     it "shows unhealthy and returns false" do
       expect{subject.run(['node-3'])}.to exit_with_error.and output_lines [
-        ":error Node node-3 is unhealthy",
+        ":error Node node-3 etcd is unhealthy",
+      ]
+    end
+  end
+
+  context "For an unhealthy node-4" do
+    it "shows unhealthy and returns false" do
+      expect{subject.run(['node-4'])}.to exit_with_error.and output_lines [
+        ":error Node node-4 etcd is unhealthy: proxy: zero endpoints currently available",
       ]
     end
   end
 
-  context "For a healthy node-4" do
+  context "For a healthy node-5" do
     it "shows healthy and returns true" do
-      expect{subject.run(['node-4'])}.to output_lines [
-        ":ok Node node-4 is healthy",
+      expect{subject.run(['node-5'])}.to output_lines [
+        ":ok Node node-5 etcd is healthy",
       ]
     end
   end
@@ -107,6 +115,9 @@ describe Kontena::Cli::Etcd::HealthCommand do
         {
           'id' => 'test-grid/node-4',
         },
+        {
+          'id' => 'test-grid/node-5',
+        },
       ]
     end
 
@@ -118,10 +129,11 @@ describe Kontena::Cli::Etcd::HealthCommand do
 
     it 'shows all nodes and exits with an error' do
       expect{subject.run([])}.to exit_with_error.and output_lines [
-        ":offline Node node-1 is offline",
-        ":error Node node-2 is unhealthy: timeout",
-        ":error Node node-3 is unhealthy",
-        ":ok Node node-4 is healthy",
+        ":offline Node test-grid/node-1 connection error: Websocket disconnected at 2017-08-16 14:50:46 UTC with code 1006: ",
+        ":offline Node test-grid/node-2 etcd_health error: RPC timeout",
+        ":error Node node-3 etcd is unhealthy",
+        ":error Node node-4 etcd is unhealthy: proxy: zero endpoints currently available",
+        ":ok Node node-5 etcd is healthy",
       ]
     end
   end
@@ -130,10 +142,10 @@ describe Kontena::Cli::Etcd::HealthCommand do
     let :grid_nodes do
       [
         {
-          'id' => 'test-grid/node-4',
+          'id' => 'test-grid/node-5',
         },
         {
-          'id' => 'test-grid/node-4',
+          'id' => 'test-grid/node-5',
         },
       ]
     end
@@ -146,8 +158,8 @@ describe Kontena::Cli::Etcd::HealthCommand do
 
     it 'shows nodes as healthy anddoes not and exit with an error' do
       expect{subject.run([])}.to output_lines [
-        ":ok Node node-4 is healthy",
-        ":ok Node node-4 is healthy",
+        ":ok Node node-5 etcd is healthy",
+        ":ok Node node-5 etcd is healthy",
       ]
     end
   end

data/spec/kontena/cli/helpers/exec_helper_spec.rb

@@ -235,7 +235,8 @@ describe Kontena::Cli::Helpers::ExecHelper do
 
       it 'connects and sends messages from stdin' do
         stdin_eol = false
-
+        allow(IO.console).to receive(:winsize).and_return([100, 100])
+        expect(websocket_client).to receive(:send).once.with('{"tty_size":{"width":100,"height":100}}')
         expect(websocket_client).to receive(:send).once.with('{"cmd":["test-tty"]}')
 
         expect(subject).to receive(:read_stdin).once.with(tty: true) do |&block|

data/spec/kontena/cli/master/init_cloud_command_spec.rb

@@ -20,8 +20,22 @@ describe Kontena::Cli::Master::InitCloudCommand do
   end
 
   it 'runs the invite self after deploy callback' do
+    allow(subject).to receive(:already_cloud_enabled?).and_return(false)
     expect(Kontena).to receive(:run!).with(%w(cloud master add --current --force)).and_return(true)
     expect_any_instance_of(Kontena::Callbacks::InviteSelfAfterDeploy).to receive(:after).and_return(true)
     subject.run(['--force'])
   end
+
+  it 'exits with error if master is already registered to use cloud' do
+    expect(subject.cloud_client).to receive(:get).with('user/masters').and_return(
+      'data' => [
+        { 'attributes' => { 'client-id' => 'abc123', 'name' => 'testmaster' } },
+        { 'attributes' => { 'client-id' => 'def234', 'name' => 'foo' } },
+      ]
+    )
+    expect(subject.client).to receive(:get).with('config').and_return(
+      'oauth2.client_id' => 'abc123'
+    )
+    expect{subject.run(['--force'])}.to exit_with_error.and output(/already registered.+?testmaster/).to_stderr
+  end
 end

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

@@ -8,40 +8,104 @@ describe Kontena::Cli::Nodes::HealthCommand do
     allow(subject).to receive(:health_icon) {|health| health.inspect }
   end
 
-  before do
-    allow(client).to receive(:get).with('nodes/test-grid/node').and_return(node)
-  end
-
   context "for an online node" do
-    let :node do
+    let :node_health do
       {
         "name" => "node",
         "node_number" => 4,
         "initial_member" => false,
+        'status' => 'online',
+        'connected_at' => (Time.now - 50.0).to_s,
         "connected" => true,
+        'etcd_health' => {
+          'health' => true,
+          'error' => nil,
+        },
       }
     end
 
+    before do
+      allow(client).to receive(:get).with('nodes/test-grid/node/health').and_return(node_health)
+    end
+
     it "outputs ok" do
       expect{subject.run(['node'])}.to output_lines [
-        ":ok Node is online",
+        ":ok Node is online for 50s",
+        ":ok Node node etcd is healthy",
       ]
     end
   end
 
   context "for an offline node" do
-    let :node do
+    let :node_errors do
+      {
+        'connection' => "Websocket disconnected at 2017-07-12 12:28:10 UTC with code 4030: ping timeout after 5.00s",
+      }
+    end
+
+    before do
+      allow(client).to receive(:get).with('nodes/test-grid/node/health').and_raise(Kontena::Errors::StandardErrorHash.new(422, "", node_errors))
+    end
+
+    it "fails as error" do
+      expect{subject.run(['node'])}.to exit_with_error.and output_lines [
+        ":offline Node test-grid/node connection error: Websocket disconnected at 2017-07-12 12:28:10 UTC with code 4030: ping timeout after 5.00s",
+      ]
+    end
+  end
+
+  context "for an online initial node in an ok grid" do
+    let :node_health do
+      {
+        "name" => "node",
+        "node_number" => 1,
+        "initial_member" => true,
+        'status' => 'online',
+        'connected_at' => (Time.now - 50.0).to_s,
+        "connected" => true,
+        'etcd_health' => {
+          'health' => true,
+          'error' => nil,
+        },
+      }
+    end
+
+    before do
+      allow(client).to receive(:get).with('nodes/test-grid/node/health').and_return(node_health)
+    end
+
+    it "outputs ok" do
+      expect{subject.run(['node'])}.to output_lines [
+        ":ok Node is online for 50s",
+        ":ok Node node etcd is healthy",
+      ]
+    end
+  end
+
+  context "for an online node in an grid with broken etcd" do
+    let :node_health do
       {
         "name" => "node",
         "node_number" => 4,
         "initial_member" => false,
-        "connected" => false,
+        'status' => 'online',
+        'connected_at' => (Time.now - 50.0).to_s,
+        "connected" => true,
+        'etcd_health' => {
+          'health' => false,
+          'error' => "no peers reachable",
+        },
       }
     end
 
-    it "fails as error" do
+    before do
+      allow(client).to receive(:get).with('nodes/test-grid/node/health').and_return(node_health)
+    end
+
+    it "fails with etcd errro" do
       expect{subject.run(['node'])}.to exit_with_error.and output_lines [
-        ":offline Node is offline",
+        ":ok Node is online for 50s",
+        ":error Node node etcd is unhealthy: no peers reachable",
       ]
     end
   end