kontena-cli 0.16.0 → 0.16.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7adc70aca15e0272bcc9ffaab5edc2e6812b269
-  data.tar.gz: 64cb766905a1f2d2a05fb60b8685a781d4378d14
+  metadata.gz: a140696639e10214728770220b852bd2c1278bb0
+  data.tar.gz: 4493f5eda8a877cde4e939041982b5f902df3b45
 SHA512:
-  metadata.gz: 685cb7768a10b892c75eab794f8d95f9dfd71df1475dd1caf0f7f31c0900cab523c26a942c97823ef6412341e5d40b227ddbbb6940f19b115879450872564e45
-  data.tar.gz: 9fc24afd8037fca5e60689dede5d49cf1ff17fb71fdc735469709b91807a627b2c51170f6420a53bb744a6167b53a7c4518942be98486f5b6c652e120a091826
+  metadata.gz: 35927d1ad63168a93767327ecb4a781c9367b06d5649e68986f89bc454bd4f011ec6151d82bfd4cf1d7a706508ab7ba0d7a6d7c70cd96f1e04a8863a00058efc
+  data.tar.gz: 9f403db6a2463f36ed270c49ce1867b4de8e77f4b8ed75e3abe3d8e10422f0a41e719ae5f641b9f1606d20eba4e0e6c042dd631fc276fe536c77b7eb8ef707d0

data/VERSION

@@ -1 +1 @@
-0.16.0
+0.16.1.rc1

data/lib/kontena/callbacks/master/deploy/60_configure_auth_provider_after_deploy.rb

@@ -6,12 +6,17 @@ module Kontena
 
       matches_commands 'master create'
 
-      def configure_auth_provider_using_id(cloud_id)
-        Kontena.run("master init-cloud --force --cloud-master-id #{cloud_id.shellescape}")
+      def init_cloud_args
+        args = []
+        args << '--force' 
+        args << "--cloud-master-id #{command.cloud_master_id}" if command.cloud_master_id
+        args << "--provider #{command.result[:provider]}" if command.result[:provider]
+        args << "--version #{command.result[:version]}" if command.result[:version]
+        args.join(' ')
       end
 
       def configure_auth_provider
-        Kontena.run("master init-cloud --force")
+        Kontena.run("master init-cloud #{init_cloud_args}")
       end
 
       def after
@@ -24,11 +29,7 @@ module Kontena
           return
         end
 
-        if command.respond_to?(:cloud_master_id) && command.cloud_master_id
-          configure_auth_provider_using_id(command.cloud_master_id)
-        else
-          configure_auth_provider
-        end
+        configure_auth_provider
       end
     end
   end

data/lib/kontena/cli/apps/service_generator.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'shellwords'
 require_relative '../services/services_helper'
 
 module Kontena::Cli::Apps
@@ -36,7 +37,7 @@ module Kontena::Cli::Apps
       data['cpu_shares'] = options['cpu_shares'] if options['cpu_shares']
       data['volumes'] = options['volumes'] || []
       data['volumes_from'] = options['volumes_from'] || []
-      data['cmd'] = options['command'].split(" ") if options['command']
+      data['cmd'] = Shellwords.split(options['command']) if options['command']
       data['affinity'] = options['affinity'] || []
       data['user'] = options['user'] if options['user']
       data['stateful'] = options['stateful'] == true

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

@@ -94,6 +94,16 @@ module Kontena::Cli::Cloud::Master
         response = spinner "Retrieving Master information from Kontena Cloud using id" do
           get_existing(self.cloud_master_id)
         end
+        if response && response.kind_of?(Hash) && response.has_key?('data') && response['data']['attributes']
+          if (self.provider && response['data']['attributes']['provider'] != self.provider) || (self.version && response['data']['attributes']['version'] != self.version)
+            spinner "Updating provider and version attributes to Kontena Cloud master" do
+              args = []
+              args << "--provider #{self.provider.shellescape}" if self.provider
+              args << "--version #{self.version.shellescape}" if self.version
+              Kontena.run("cloud master update #{args.join(' ')}")
+            end
+          end
+        end
       else
         response = spinner "Registering current Kontena Master '#{current_master.name}' #{" as '#{new_name}' " unless new_name == current_master.name}to Kontena Cloud" do
           register(new_name, current_master.url)

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

@@ -38,13 +38,7 @@ module Kontena::Cli::Cloud::Master
 
       response = cloud_client.put(
         "master",
-        { data: { attributes: attrs.reject{ |k, _| ['client-id', 'client-secret'].include?(k) } } },
-        {},
-        cloud_client.basic_auth_header(
-          attrs["client-id"],
-          attrs["client-secret"]
-        ),
-        false
+        { data: { attributes: attrs.reject{ |k, _| ['client-id', 'client-secret'].include?(k) } } }
       )
 
       if response

data/lib/kontena/cli/common.rb

@@ -359,7 +359,7 @@ module Kontena
               pastel.green('at'),
               pastel.yellow(server.url),
               pastel.green('as'),
-              pastel.yellow(server.username)
+              pastel.yellow(server.token.username || server.username)
             ].join(' ')
           else
             puts pastel.cyan("Not authenticated to current master #{server.name}")

data/lib/kontena/cli/config.rb

@@ -81,6 +81,11 @@ module Kontena
             server = Server.new(server_data)
           end
           server.account ||= 'master'
+          if servers.find { |s| s['name'] == server.name}
+            server.name = "#{server.name}-2"
+            server.name.succ! until servers.find { |s| s['name'] == server.name }.nil?
+            logger.debug "Renamed server to #{server.name} because a duplicate was found in config"
+          end
           servers << server
         end
 

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

@@ -5,17 +5,22 @@ module Kontena::Cli::Master
 
     banner "Configures the current Kontena Master to use Kontena Cloud services and authentication"
 
-    option '--force',           :flag,  "Don't ask questions"
-    option '--cloud-master-id', '[ID]', "Use existing cloud master ID"
+    option '--force',           :flag,       "Don't ask questions"
+    option '--cloud-master-id', '[ID]',      "Use existing cloud master ID"
+    option '--provider',        '[NAME]',    "Set master provider name"
+    option '--version',         '[VERSION]', "Set master version"
 
     requires_current_master
+    requires_current_master_token
     requires_current_account_token
 
     def execute
       args = ["--current"]
       args << "--force" if self.force?
-      args << "--cloud-master-id #{self.cloud_master_id}" if self.cloud_master_id
-      Kontena.run("cloud master add #{args.map(&:shellescape).join(' ')}")
+      args += ["--cloud-master-id", self.cloud_master_id.shellescape] if self.cloud_master_id
+      args += ["--provider", self.provider.shellescape] if self.provider
+      args += ["--version", self.version.shellescape] if self.version
+      Kontena.run("cloud master add #{args.join(' ')}")
     end
   end
 end

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

@@ -39,6 +39,7 @@ module Kontena::Cli::Master
       unless self.join || self.force?
         if auth_works?(server)
           config.write
+          config.reset_instance
           display_login_info(only: :master) unless self.no_login_info?
           exit 0
         end
@@ -117,23 +118,26 @@ module Kontena::Cli::Master
     def use_authorization_code(server, code)
       vspinner "Exchanging authorization code for an access token from Kontena Master" do
         client = Kontena::Client.new(server.url, server.token)
-        response = client.exchange_code(code) rescue nil
-
-        if response && response.kind_of?(Hash) && !response.has_key?('error')
-          if response['server'] && response['server']['name']
-            server.name ||= response['server']['name']
-            server.username = response['user']['name'] || response['user']['email']
-            config.current_server = server.name
-          end
-
-          server.token = Kontena::Cli::Config::Token.new(
-            access_token: response['access_token'],
-            refresh_token: response['refresh_token'],
-            expires_at: response['expires_in'].to_i > 0 ? Time.now.utc.to_i + response['expires_in'].to_i : nil,
-          )
+        begin
+          response = client.exchange_code(code)
+        rescue StandardError => ex
+          ENV["DEBUG"] && puts("#{ex}\n#{ex.backtrace.join("  \n")}")
+          exit_with_error "Code exchange failed: #{ex}"
+        end
+
+        if response['server'] && response['server']['name']
+          server.name ||= response['server']['name']
+          server.username = response['user']['name'] || response['user']['email']
+          config.current_server = server.name
         else
-          raise Kontena::Errors::StandardError.new(500, 'Code exchange failed')
+          raise Kontena::Errors::StandardError.new(500, 'Code exchange invalid response')
         end
+
+        server.token = Kontena::Cli::Config::Token.new(
+          access_token: response['access_token'],
+          refresh_token: response['refresh_token'],
+          expires_at: response['expires_in'].to_i > 0 ? Time.now.utc.to_i + response['expires_in'].to_i : nil,
+        )
       end
       true
     end
@@ -166,17 +170,20 @@ module Kontena::Cli::Master
 
     def get_authorization_url(web_server_port = nil)
       authorization_url = nil
+
+      http_client = Kontena::Client.new(self.url)
+
       vspinner "Sending authentication request to receive an authorization URL" do
-        client.request(
+        http_client.request(
           http_method: :get,
           path: build_auth_url_path(web_server_port),
           expects: [501, 400, 302, 403],
           auth: false
         )
 
-        case client.last_response.status
+        case http_client.last_response.status
         when 302
-          authorization_url = client.last_response.headers['Location']
+          authorization_url = http_client.last_response.headers['Location']
         when 501
           exit_with_error "Authentication provider not configured"
         when 403

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

@@ -1,4 +1,5 @@
 require_relative 'services_helper'
+require 'shellwords'
 
 module Kontena::Cli::Services
   class CreateCommand < Kontena::Command
@@ -71,7 +72,7 @@ module Kontena::Cli::Services
       data[:env] = env_list unless env_list.empty?
       data[:secrets] = parse_secrets(secret_list)
       data[:container_count] = instances if instances
-      data[:cmd] = cmd.split(" ") if cmd
+      data[:cmd] = Shellwords.split(cmd) if cmd
       data[:user] = user if user
       data[:image] = parse_image(image) if image
       data[:privileged] = privileged?

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

@@ -1,4 +1,5 @@
 require_relative 'services_helper'
+require 'shellwords'
 
 module Kontena::Cli::Services
   class UpdateCommand < Kontena::Command
@@ -63,7 +64,7 @@ module Kontena::Cli::Services
       data[:env] = env_list unless env_list.empty?
       data[:secrets] = parse_secrets(secret_list) unless secret_list.empty?
       data[:container_count] = instances if instances
-      data[:cmd] = cmd.split(" ") if cmd
+      data[:cmd] = Shellwords.split(cmd) if cmd
       data[:user] = user if user
       data[:image] = parse_image(image) if image
       data[:privileged] = privileged?

data/lib/kontena/cli/vpn/config_command.rb

@@ -10,6 +10,7 @@ module Kontena::Cli::Vpn
       stdout, stderr = client(require_token).post("containers/#{current_grid}/vpn/vpn-1/exec", payload)
       if linux?
         stdout << "\n"
+        stdout << "script-security 2 system\n"
         stdout << "up /etc/openvpn/update-resolv-conf\n"
         stdout << "down /etc/openvpn/update-resolv-conf\n"
       end

data/lib/kontena/client.rb

@@ -56,9 +56,9 @@ module Kontena
       @http_client = Excon.new(
         api_url,
         omit_default_port: true,
-        connect_timeout: ENV["EXCON_CONNECT_TIMEOUT"] || 5,
-        read_timeout:    ENV["EXCON_READ_TIMEOUT"]    || 30,
-        write_timeout:   ENV["EXCON_WRITE_TIMEOUT"]   || 5
+        connect_timeout: ENV["EXCON_CONNECT_TIMEOUT"] ? ENV["EXCON_CONNECT_TIMEOUT"].to_i : 5,
+        read_timeout:    ENV["EXCON_READ_TIMEOUT"]    ? ENV["EXCON_READ_TIMEOUT"].to_i    : 30,
+        write_timeout:   ENV["EXCON_WRITE_TIMEOUT"]   ? ENV["EXCON_WRITE_TIMEOUT"].to_i   : 5
       )
 
       @default_headers = {

data/spec/kontena/config_spec.rb

@@ -3,9 +3,9 @@ require_relative '../spec_helper'
 # Lots of coverage already in Common spec
 describe Kontena::Cli::Config do
 
-  context 'base' do
-    let(:subject) { described_class.instance }
+  let(:subject) { described_class.instance }
 
+  context 'base' do
     before(:each) do
       allow(File).to receive(:exist?).and_return(false)
       allow(File).to receive(:write).and_return(true)
@@ -52,6 +52,37 @@ describe Kontena::Cli::Config do
     end
   end
 
+  context 'duplicates' do
+    before(:each) do
+      allow(File).to receive(:exist?).and_return(true)
+      allow(File).to receive(:readable?).and_return(true)
+      allow(File).to receive(:write).and_return(true)
+      allow(File).to receive(:read).and_return <<-EOB
+        {"current_server": "test123",
+          "servers" : [
+            { 
+              "name": "test123",
+              "url": "https://foo.example.com"
+            },
+            { 
+              "name": "test123",
+              "url": "https://foo2.example.com"
+            }
+          ]
+        }
+      EOB
+
+      subject.class.reset_instance
+    end
+
+    it 'renames duplicate entries on load' do
+      puts subject.servers.inspect
+      expect(subject.servers.size).to eq 2
+      expect(subject.servers.first.name).not_to eq subject.servers.last.name
+      expect(subject.servers.last.name).to eq "test123-2"
+    end
+  end
+
   describe 'Token' do
     let(:subject) { Kontena::Cli::Config::Token.new(access_token: 'abcd', expires_at: Time.now.utc - 100) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -466,9 +466,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1