kontena-cli 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 271ff6357fc144663ce26127000670ee955591f9
-  data.tar.gz: 3c649adbd8e51c377d91f2ccff9e1cddaf83d198
+  metadata.gz: f71c08239bc2780793aa394f980332a5b497d8c0
+  data.tar.gz: 932ba40653c1709ad494e21d8eb863a0269307f4
 SHA512:
-  metadata.gz: a324873b2090e75da968425299e6d15581d5d0632be85e53f1664501b212c8c0aca79f11a7f42c0e1a10cb90f4cf2c325452d0a32047f849d9d87ef0ed50b867
-  data.tar.gz: 3b60be978cfbb2a686f02e9e1353a62627ea11fd4bc71854018b65d1d542da2ac0a303197b10b0712dfc05531564f041899ea657d96976f213125e3d3b44f41b
+  metadata.gz: a6169ec0c9621c1c3ab5ed29bffa0e1714e37bfccb80e1ba19d2093a7cbd1c166ffe870b635418163ea285be928593ccab0eccec430bbf187d5a29780b109685
+  data.tar.gz: 9d1affd436e49874e937671d8bdfc11c1547916c2cb0444a9adeb4c6097b65c5ed141f1667a6f6a7ad463f552ef6e8da2f5bc53f81eed6e058a94bfae72d5dd8

data/VERSION

@@ -1 +1 @@
-0.14.1
+0.14.2

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

@@ -56,7 +56,7 @@ module Kontena::Cli::Apps
 
     def project_name_from_yaml(file)
       reader = YAML::Reader.new(file, true)
-      outcome = reader.execute      
+      outcome = reader.execute
       if outcome[:version] == '2'
         outcome[:name]
       else
@@ -100,10 +100,8 @@ module Kontena::Cli::Apps
     def app_json
       if !@app_json && File.exist?('app.json')
         @app_json = JSON.parse(File.read('app.json'))
-      else
-        @app_json = {}
       end
-      @app_json
+      @app_json ||= {}
     end
 
     def display_notifications(messages, color = :yellow)

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

@@ -14,36 +14,48 @@ module Kontena::Cli::Apps
     def generate(procfile, addons, env_file)
       if procfile.keys.size > 0
         # generate services found in Procfile
-        docker_compose = {}
-        procfile.keys.each do |service|
-          docker_compose[service] = {'build' => '.' }
+        docker_compose = {
+          'version' => '2'
+        }
+        services = {}
+        procfile.each do |service, command|
+          services[service] = {'build' => '.' }
           if app_json && service == 'web' # Heroku generates PORT env variable so should we do too
-            docker_compose[service]['environment'] = ['PORT=5000']
-            docker_compose[service]['ports'] = ['5000:5000']
+            services[service]['environment'] = ['PORT=5000']
+            services[service]['ports'] = ['5000:5000']
           end
-          docker_compose[service]['command'] = "/start #{service}" if service != 'web'
-          docker_compose[service]['env_file'] = env_file if env_file
+          services[service]['command'] =  "/start #{service}" if service != 'web'
+          services[service]['env_file'] = env_file if env_file
 
           # generate addon services
           addons.each do |addon|
             addon_service = addon.split(":")[0]
             addon_service.slice!('heroku-')
             if valid_addons.has_key?(addon_service)
-              docker_compose[service]['links'] = [] unless docker_compose[service]['links']
-              docker_compose[service]['links'] << "#{addon_service}:#{addon_service}"
-              docker_compose[service]['environment'] = [] unless docker_compose[service]['environment']
-              docker_compose[service]['environment'] += valid_addons[addon_service]['environment']
-              docker_compose[addon_service] = {'image' => valid_addons[addon_service]['image']}
+              services[service]['links'] = [] unless services[service]['links']
+              services[service]['links'] << "#{addon_service}:#{addon_service}"
+              services[service]['environment'] = [] unless services[service]['environment']
+              services[service]['environment'] += valid_addons[addon_service]['environment']
+              services[addon_service] = {'image' => valid_addons[addon_service]['image']}
             end
           end
         end
+        docker_compose['services'] = services
       else
         # no Procfile found, create dummy web service
-        docker_compose = {'web' => { 'build' => '.'}}
-        docker_compose['web']['env_file'] = env_file if env_file
+        docker_compose = {
+          'version' => '2',
+          'services' => {
+            'web' => {
+              'build' => '.'
+            }
+          }
+        }
+
+        docker_compose['services']['web']['env_file'] = env_file if env_file
       end
       # create docker-compose.yml file
       create_yml(docker_compose, docker_compose_file)
     end
   end
-end
+end

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

@@ -27,12 +27,12 @@ module Kontena::Cli::Apps
       end
 
       if File.exist?('Procfile')
-        procfile = YAML.load(File.read('Procfile'))
+        procfile = ::YAML.load(File.read('Procfile'))
       else
         procfile = {}
       end
 
-      app_env = create_env_file(app_json)
+      app_env = create_env_file(app_json['env']) if app_json['env'] 
       addons = app_json['addons'] || []
 
       if File.exist?(docker_compose_file)
@@ -62,26 +62,26 @@ module Kontena::Cli::Apps
 
     protected
 
+    def service_prefix
+      @service_prefix ||= project_name || current_dir
+    end
+
     def create_dockerfile?
       ['', 'y', 'yes'].include? ask('Dockerfile not found. Do you want to create it? [Yn]: ').downcase
     end
 
-    def create_env_file(app_json)
-
-      if app_json['env']
-        app_env = File.new('.env', 'w')
-        app_json['env'].each do |key, env|
-          if env['generator'] == 'secret'
-            value = SecureRandom.hex(64)
-          else
-            value = env['value']
-          end
-          app_env.puts "#{key}=#{value}"
+    def create_env_file(env)
+      app_env = File.new('.env', 'w')
+      app_json['env'].each do |key, env|
+        if env['generator'] == 'secret'
+          value = SecureRandom.hex(64)
+        else
+          value = env['value']
         end
-        app_env.close
-        return '.env'
+        app_env.puts "#{key}=#{value}"
       end
-      nil
+      app_env.close
+      '.env'
     end
 
     def create_docker_compose_yml?

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

@@ -16,8 +16,8 @@ module Kontena::Cli::Apps
       services = {}
       # extend services from docker-compose.yml
       file = File.read(docker_compose_file)
-      compose_services = YAML.load(file)
-      compose_services.each do |name, options|
+
+      yml_services(file).each do |name, options|
         services[name] = {'extends' => { 'file' => 'docker-compose.yml', 'service' => name }}
         if options.has_key?('build')
           image = image_name || "registry.kontena.local/#{File.basename(Dir.getwd)}:latest"
@@ -42,7 +42,15 @@ module Kontena::Cli::Apps
         end
       end
       create_yml(services, 'kontena.yml')
+    end
 
+    def yml_services(file)
+      yml = ::YAML.load(file)
+      if yml['version'] == '2'
+        yml['services']
+      else
+        yml
+      end
     end
 
     def generate(procfile, addons, env_file)
@@ -79,17 +87,20 @@ module Kontena::Cli::Apps
     end
 
     def create_yml(services, filename)
-      if File.exist?(filename)
-        kontena_services = YAML.load(File.read(filename))
+      if File.exist?(filename) && !File.zero?(filename)
+        kontena_services = yml_services(File.read(filename))
         services.each do |name, options|
           if kontena_services[name]
             services[name].merge!(kontena_services[name])
           end
         end
       end
-      super(services, filename)
+      kontena_services = {
+        'version' => '2',
+        'name' => service_prefix,
+        'services' => services
+      }
+      super(kontena_services, filename)
     end
-
-
   end
-end
+end

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

@@ -12,6 +12,7 @@ module Kontena::Cli::Registry
     option '--s3-region', 'S3_REGION', 'S3 region', default: 'eu-west-1'
     option '--s3-encrypt', :flag, 'Encrypt S3 objects', default: false
     option '--s3-secure', :flag, 'Use secure connection in S3', default: true
+    option '--s3-v4auth', :flag, 'Use v4auth on S3', default: false
     option '--azure-account-name', 'AZURE_ACCOUNT_NAME', 'Azure account name'
     option '--azure-container-name', 'AZURE_CONTAINER_NAME', 'Azure container name'
 
@@ -38,7 +39,8 @@ module Kontena::Cli::Registry
             "REGISTRY_STORAGE_S3_REGION=#{s3_region}",
             "REGISTRY_STORAGE_S3_BUCKET=#{s3_bucket}",
             "REGISTRY_STORAGE_S3_ENCRYPT=#{s3_encrypt?}",
-            "REGISTRY_STORAGE_S3_SECURE=#{s3_secure?}"
+            "REGISTRY_STORAGE_S3_SECURE=#{s3_secure?}",
+            "REGISTRY_STORAGE_S3_V4AUTH=#{s3_v4auth?}"
         ]
         secrets = [
           {secret: 'REGISTRY_STORAGE_S3_ACCESSKEY', name: 'REGISTRY_STORAGE_S3_ACCESSKEY', type: 'env'},

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

@@ -6,24 +6,17 @@ module Kontena::Cli::Vpn
     include Kontena::Cli::GridOptions
 
     option '--node', 'NODE', 'Node name where VPN is deployed'
-    option '--ip', 'IP', 'Node ip-address'
+    option '--ip', 'IP', 'Node ip-address to use in VPN service configuration'
 
     def execute
       require_api_url
       token = require_token
       preferred_node = node
-
+      
       vpn = client(token).get("services/#{current_grid}/vpn") rescue nil
       abort('Vpn already exists') if vpn
 
-      nodes = client(token).get("grids/#{current_grid}/nodes")
-      if preferred_node.nil?
-        node = nodes['nodes'].find{|n| n['connected']}
-        abort('Cannot find any online nodes') if node.nil?
-      else
-        node = nodes['nodes'].find{|n| n['connected'] && n['name'] == preferred_node }
-        abort('Node not found') if node.nil?
-      end
+      node = find_node(token, preferred_node)
 
       vpn_ip = node_vpn_ip(node)
       data = {
@@ -50,16 +43,30 @@ module Kontena::Cli::Vpn
       puts "Use 'kontena vpn config' to fetch OpenVPN client config to your machine (it takes a while until config is ready)."
     end
 
+
+    def find_node(token, preferred_node = nil)
+      nodes = client(token).get("grids/#{current_grid}/nodes")
+
+      if preferred_node.nil?
+        node = nodes['nodes'].find{|n| n['connected'] && !n['public_ip'].to_s.empty?}
+        abort('Cannot find any online nodes with public ip. If you want to connect with private address, please use --node and/or --ip options.') if node.nil?
+      else
+        node = nodes['nodes'].find{|n| n['connected'] && n['name'] == preferred_node }
+        abort('Node not found') if node.nil?
+      end
+      node
+    end
+
     # @param [Hash] node
     # @return [String]
     def node_vpn_ip(node)
       return ip unless ip.nil?
-
+      
       # vagrant
-      if api_url == 'http://192.168.66.100:8080'
-        node['private_ip']
+      if node['labels'] && node['labels'].include?('provider=vagrant')
+        node['private_ip'].to_s 
       else
-        node['public_ip']
+        node['public_ip'].to_s.empty? ? node['private_ip'].to_s : node['public_ip'].to_s
       end
     end
   end

data/spec/fixtures/app.json

@@ -0,0 +1,42 @@
+{
+  "name": "Small Sharp Tool",
+  "description": "This app does one little thing, and does it well.",
+  "keywords": [
+    "productivity",
+    "HTML5",
+    "scalpel"
+  ],
+  "website": "https://small-sharp-tool.com/",
+  "repository": "https://github.com/jane-doe/small-sharp-tool",
+  "logo": "https://small-sharp-tool.com/logo.svg",
+  "success_url": "/welcome",
+  "scripts": {
+    "postdeploy": "bundle exec rake bootstrap"
+  },
+  "env": {
+    "SECRET_TOKEN": {
+      "description": "A secret key for verifying the integrity of signed cookies.",
+      "generator": "secret"
+    },
+    "WEB_CONCURRENCY": {
+      "description": "The number of processes to run.",
+      "value": "5"
+    }
+  },
+  "formation": {
+    "web": {
+      "quantity": 2,
+      "size": "Performance-M"
+    }
+  },
+  "image": "heroku/ruby",
+  "addons": [
+    "openredis",
+    "mongolab:shared-single-small"
+  ],
+  "buildpacks": [
+    {
+      "url": "https://github.com/stomita/heroku-buildpack-phantomjs"
+    }
+  ]
+}

data/spec/kontena/cli/app/init_command_spec.rb

@@ -0,0 +1,110 @@
+require_relative "../../../spec_helper"
+require 'kontena/cli/apps/init_command'
+
+describe Kontena::Cli::Apps::InitCommand do
+  include FixturesHelpers
+
+  let(:subject) do
+    described_class.new(File.basename($0))
+  end
+
+  let(:app_json) do
+    fixture('app.json')
+  end
+
+  before(:each) do
+    allow(File).to receive(:exist?).and_return false
+    allow(subject).to receive(:create_yml).and_return nil
+    allow(subject).to receive(:create_dockerfile?).and_return false
+    allow(subject).to receive(:create_env_file).and_return nil
+    allow(subject).to receive(:create_docker_compose_yml?).and_return false
+    allow(Kontena::Cli::Apps::KontenaYmlGenerator).to receive(:new).and_return spy
+  end
+
+  describe '#execute' do
+    it 'detects Dockerfile' do
+      expect(File).to receive(:exist?).with('Dockerfile').once.and_return true
+      subject.run([])
+    end
+
+    it 'reads Procfile' do
+      allow(File).to receive(:exist?).with('Procfile').once.and_return true
+      expect(File).to receive(:read).with('Procfile').once.and_return 'web: bundle exec rails s'
+      subject.run([])
+    end
+
+    it 'reads app.json file' do
+      allow(File).to receive(:exist?).with('app.json').once.and_return true
+      expect(File).to receive(:read).with('app.json').once.and_return '{}'
+      subject.run([])
+    end
+
+    it 'asks creation of docker-compose.yml' do
+      expect(subject).to receive(:create_docker_compose_yml?).and_return false
+      subject.run([])
+    end
+
+    it 'creates docker-compose.yml if accepted' do
+      allow(subject).to receive(:create_docker_compose_yml?).and_return true
+      generator = spy
+      generator_klass = Kontena::Cli::Apps::DockerComposeGenerator
+      expect(generator_klass).to receive(:new).with('docker-compose.yml').and_return(generator)
+      expect(generator).to receive(:generate).with({}, [], nil)
+      subject.run([])
+    end
+
+    it 'passes Procfile services to docker-compose.yml creation' do
+      allow(File).to receive(:exist?).with('Procfile').once.and_return true
+      allow(File).to receive(:read).with('Procfile').once.and_return 'web: bundle exec rails s'
+      allow(subject).to receive(:create_docker_compose_yml?).and_return true
+      generator = spy
+      generator_klass = Kontena::Cli::Apps::DockerComposeGenerator
+      expect(generator_klass).to receive(:new).with('docker-compose.yml').and_return(generator)
+      expect(generator).to receive(:generate).with({ 'web' => 'bundle exec rails s' }, [], nil)
+      subject.run([])
+    end
+
+    it 'passes app.json options to docker-compose.yml creation' do
+      expect(File).to receive(:exist?).with('app.json').and_return true
+      expect(File).to receive(:read).with('app.json').and_return app_json
+      allow(subject).to receive(:create_docker_compose_yml?).and_return true
+      generator = spy
+      generator_klass = Kontena::Cli::Apps::DockerComposeGenerator
+      expect(generator_klass).to receive(:new).with('docker-compose.yml').and_return(generator)
+      expect(generator).to receive(:generate).with({}, ["openredis","mongolab:shared-single-small"], nil)
+      subject.run([])
+    end
+
+    it 'creates .env file' do
+      allow(File).to receive(:exist?).with('app.json').and_return true
+      allow(File).to receive(:read).with('app.json').and_return app_json
+      allow(subject).to receive(:create_docker_compose_yml?).and_return true
+      generator = spy
+      generator_klass = Kontena::Cli::Apps::DockerComposeGenerator
+      allow(generator_klass).to receive(:new).with('docker-compose.yml').and_return(generator)
+      app_env = JSON.parse(app_json)['env']
+      expect(subject).to receive(:create_env_file).with(app_env).and_return nil
+      subject.run([])
+    end
+
+    it 'creates kontena.yml from docker-compose.yml' do
+      allow(File).to receive(:exist?).with('docker-compose.yml').and_return true
+      generator = spy
+      generator_klass = Kontena::Cli::Apps::KontenaYmlGenerator
+      expect(generator_klass).to receive(:new).with(nil, 'cli').and_return(generator)
+      expect(generator).to receive(:generate_from_compose_file).with('docker-compose.yml')
+      subject.run([])
+    end
+
+    context 'when docker-compose.yml not created' do
+      it 'creates dummy kontena.yml' do
+        allow(File).to receive(:exist?).with('docker-compose.yml').and_return false
+        generator = spy
+        generator_klass = Kontena::Cli::Apps::KontenaYmlGenerator
+        expect(generator_klass).to receive(:new).with(nil, 'cli').and_return(generator)
+        expect(generator).to receive(:generate).with({}, [], nil)
+        subject.run([])
+      end
+    end
+  end
+end

data/spec/kontena/cli/vpn/create_command_spec.rb

@@ -0,0 +1,116 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/vpn/create_command"
+
+describe Kontena::Cli::Vpn::CreateCommand do
+  
+  include ClientHelpers
+
+  let(:subject) { described_class.new(File.basename($0)) }
+
+  describe '#execute' do
+    it 'should abort if vpn already exists' do
+      expect(client).to receive(:get).with("services/test-grid/vpn").and_return({vpn: true})
+
+      expect {
+        subject.execute
+      }.to raise_error SystemExit
+    end
+
+    
+  end
+
+  describe '#find_node' do
+
+    it 'should abort if no online nodes exists' do
+      expect(client).to receive(:get).with("grids/test-grid/nodes").and_return(
+        { 
+          'nodes' => [
+            {'connected' => false}, 
+            {'connected' => false, 'public_ip' => '1.2.3.4'}
+          ]
+        })
+
+      expect {
+        subject.find_node(token, nil)
+      }.to raise_error SystemExit
+    end
+
+    it 'should return first online node with public ip' do
+      expect(client).to receive(:get).with("grids/test-grid/nodes").and_return(
+        { 
+          'nodes' => [
+            {'connected' => true}, 
+            {'connected' => true, 'public_ip' => '1.2.3.4'}
+          ]
+        })
+
+      node = subject.find_node(token, nil)
+      expect(node['public_ip']).to eq('1.2.3.4')
+    end
+
+    it 'should return preferred node' do
+      expect(client).to receive(:get).with("grids/test-grid/nodes").and_return(
+        { 
+          'nodes' => [
+            {'connected' => true}, 
+            {'name' => 'preferred', 'connected' => true, 'public_ip' => '1.2.3.4'}
+          ]
+        })
+
+      node = subject.find_node(token, 'preferred')
+      expect(node['name']).to eq('preferred')
+    end
+
+    it 'should abort if no online nodes exists' do
+      expect(client).to receive(:get).with("grids/test-grid/nodes").and_return(
+        { 
+          'nodes' => [
+            {'connected' => true}, 
+            {'name' => 'preferred', 'connected' => true, 'public_ip' => '1.2.3.4'}
+          ]
+        })
+
+      expect {
+        subject.find_node(token, 'foobar')
+      }.to raise_error SystemExit
+    end
+
+  end
+
+  describe '#node_vpn_ip' do
+
+    it 'return ip when set' do
+      allow(subject).to receive(:ip).and_return('1.2.3.4')
+
+      expect(subject.node_vpn_ip(nil)).to eq('1.2.3.4')
+    end
+
+    it 'return public ip when set on node' do
+      allow(subject).to receive(:ip).and_return(nil)
+      node = {
+        'public_ip' => '8.8.8.8',
+        'private_ip' => '10.1.1.2'
+      }
+      expect(subject.node_vpn_ip(node)).to eq('8.8.8.8')
+    end
+
+    it 'return private ip when public not set on node' do
+      allow(subject).to receive(:ip).and_return(nil)
+      node = {
+        'private_ip' => '10.1.1.2'
+      }
+      expect(subject.node_vpn_ip(node)).to eq('10.1.1.2')
+    end
+
+    it 'return private on vagrant nodes' do
+      allow(subject).to receive(:ip).and_return(nil)
+      node = {
+        'public_ip' => '8.8.8.8',
+        'private_ip' => '10.1.1.2',
+        'labels' => ['provider=vagrant']
+      }
+      expect(subject.node_vpn_ip(node)).to eq('10.1.1.2')
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@
 
 require 'clamp'
 require 'kontena/cli/common'
+require 'kontena/cli/grid_options'
 require 'kontena/client'
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -402,6 +402,7 @@ files:
 - lib/kontena/machine/vagrant/node_provisioner.rb
 - lib/kontena/scripts/completer
 - lib/kontena/scripts/init
+- spec/fixtures/app.json
 - spec/fixtures/docker-compose.yml
 - spec/fixtures/docker-compose_v2.yml
 - spec/fixtures/kontena-invalid.yml
@@ -416,6 +417,7 @@ files:
 - spec/kontena/cli/app/config_command_spec.rb
 - spec/kontena/cli/app/deploy_command_spec.rb
 - spec/kontena/cli/app/docker_helper_spec.rb
+- spec/kontena/cli/app/init_command_spec.rb
 - spec/kontena/cli/app/scale_spec.rb
 - spec/kontena/cli/app/service_generator_spec.rb
 - spec/kontena/cli/app/service_generator_v2_spec.rb
@@ -444,6 +446,7 @@ files:
 - spec/kontena/cli/services/unlink_command_spec.rb
 - spec/kontena/cli/services/update_command_spec.rb
 - spec/kontena/cli/version_command_spec.rb
+- spec/kontena/cli/vpn/create_command_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb
 - spec/support/fixtures_helpers.rb
@@ -473,6 +476,7 @@ signing_key:
 specification_version: 4
 summary: Kontena command line tool
 test_files:
+- spec/fixtures/app.json
 - spec/fixtures/docker-compose.yml
 - spec/fixtures/docker-compose_v2.yml
 - spec/fixtures/kontena-invalid.yml
@@ -487,6 +491,7 @@ test_files:
 - spec/kontena/cli/app/config_command_spec.rb
 - spec/kontena/cli/app/deploy_command_spec.rb
 - spec/kontena/cli/app/docker_helper_spec.rb
+- spec/kontena/cli/app/init_command_spec.rb
 - spec/kontena/cli/app/scale_spec.rb
 - spec/kontena/cli/app/service_generator_spec.rb
 - spec/kontena/cli/app/service_generator_v2_spec.rb
@@ -515,6 +520,7 @@ test_files:
 - spec/kontena/cli/services/unlink_command_spec.rb
 - spec/kontena/cli/services/update_command_spec.rb
 - spec/kontena/cli/version_command_spec.rb
+- spec/kontena/cli/vpn/create_command_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb
 - spec/support/fixtures_helpers.rb