kontena-cli 1.1.0.pre1 → 1.1.0.rc1

data/spec/fixtures/kontena_build_v3.yml

@@ -4,7 +4,7 @@ services:
   mysql:
     stateful: true
     environment:
-      - MYSQL_ROOT_PASSWORD=${project}_secret
+      - MYSQL_ROOT_PASSWORD=${STACK}_secret
 
   webapp:
     image: webapp

data/spec/fixtures/stack-with-invalid-liquid.yml

@@ -0,0 +1,22 @@
+stack: user/stackname
+version: 0.1.1
+variables:
+  grid_name:
+    type: string
+    required: true
+    min_length: 10
+    empty_is_nil: true
+    value: "{{ GRID }} ${STACK}"
+  copies:
+    type: integer
+    value: 5
+
+services:
+  # {% forx copy in (1..copies) %}
+  service-{{copy}}:
+    image: foo:{{copy}}
+    environment:
+      - TEST_VAR="{{ grid_name }}"
+  # {% endfor %}
+
+

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

@@ -0,0 +1,21 @@
+stack: user/stackname
+version: 0.1.1
+variables:
+  grid_name:
+    type: string
+    required: true
+    min_length: 10
+    empty_is_nil: true
+    value: "{{ GRID }} ${STACK}"
+  copies:
+    type: integer
+    value: 5
+
+services:
+  # {% for copy in (1..copies) %}
+  service-{{copy}}:
+    image: foo:{{copy}}
+    environment:
+      - TEST_VAR="{{ grid_name }}"
+  # {% endfor %}
+

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

@@ -3,7 +3,7 @@ version: 0.1.1
 variables:
   enum_test:
     type: enum
-    options: 
+    options:
       - Foo
       - Bar
       - Baz
@@ -13,7 +13,7 @@ variables:
     required: true
     min_length: 10
     empty_is_nil: true
-    from: 
+    from:
       env: WORDPRESS_DB_PASSWORD # first try from local env
       prompt: Enter a password for the wordpress instance  # then try from prompt
       random_string: # if prompt returned nil, generate a random string
@@ -31,16 +31,21 @@ variables:
       env: test_var
   TEST_ENV_VAR:      # the default from/to is to set/read env of the option name
     type: :string
+  TAG:
+    type: string
+  MYSQL_IMAGE:
+    type: string
+    empty_is_nil: false
 services:
   wordpress:
     extends:
       file: docker-compose_v2.yml
       service: wordpress
-    image: wordpress:$TAG
+    image: "wordpress:$TAG"
     stateful: true
     environment:
       - WORDPRESS_DB_PASSWORD=${STACK}_secret
-    secrets: 
+    secrets:
       - secret: WP_ADMIN_PASSWORD
         name: WORDPRESS_PASSWORD
         type: env
@@ -56,7 +61,7 @@ services:
       service: mysql
     image: ${MYSQL_IMAGE}
     stateful: true
-    secrets: 
+    secrets:
       - secret: WP_MYSQL_ROOT_PW
         name: MYSQL_PASSWORD
         type: env

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

@@ -23,13 +23,18 @@ variables:
       env: test_var
   TEST_ENV_VAR:      # the default from/to is to set/read env of the option name
     type: string
+  TAG:
+    type: string
+  MYSQL_IMAGE:
+    type: string
+    empty_is_nil: false
 
 services:
   wordpress:
     extends:
       file: docker-compose_v2.yml
       service: wordpress
-    image: wordpress:$TAG
+    image: "wordpress:$TAG"
     stateful: true
     environment:
       - WORDPRESS_DB_PASSWORD=${STACK}_secret

data/spec/kontena/cli/cloud/master/add_command_spec.rb

@@ -64,7 +64,7 @@ describe Kontena::Cli::Cloud::Master::AddCommand do
     let(:success_response) {
         {
           'data' => {
-            'attributes' => { 
+            'attributes' => {
               'client-id' => '123',
               'client-secret' => '345',
               'provider' => 'foo',
@@ -90,7 +90,7 @@ describe Kontena::Cli::Cloud::Master::AddCommand do
         expect(url).to eq current_master.url
         expect(provider).to eq 'provider'
         expect(version).to eq '10.10.10'
-        expect(redirect_uri).to be_nil
+        expect(redirect_uri).to eq (current_master.url + "/cb")
       end.and_return(success_response)
 
       subject.provider = 'provider'

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

@@ -31,7 +31,7 @@ describe Kontena::Cli::Services::ContainersCommand do
       })
       expect {
         subject.run(['service-a'])
-      }.to_not raise_error(NoMethodError)
+      }.to_not raise_error
     end
 
     it 'to not throw on nil "overlay_cidr" property' do
@@ -42,7 +42,7 @@ describe Kontena::Cli::Services::ContainersCommand do
       })
       expect {
         subject.run(['service-a'])
-      }.to_not raise_error(NoMethodError)
+      }.to_not raise_error
     end
   end
 end

data/spec/kontena/cli/stacks/build_command_spec.rb

@@ -3,6 +3,10 @@ require "kontena/cli/stacks/build_command"
 
 describe Kontena::Cli::Stacks::BuildCommand do
 
+  include RequirementsHelper
+
+  mock_current_master
+
   let(:subject) do
     described_class.new(File.basename($0))
   end
@@ -29,32 +33,39 @@ describe Kontena::Cli::Stacks::BuildCommand do
       }
     end
 
-    describe '#execute' do
-      before(:each) do
-        allow(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
-        allow(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
-        allow(subject).to receive(:system).and_return(true)
-      end
-
-      it 'requires config file' do
-        expect(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
-        subject.run([])
-      end
-
-      it 'reads stack file' do
-        expect(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
-        subject.run([])
-      end
-
-      it 'builds docker image' do
-        expect(subject).to receive(:system).with('docker', 'build', '-t', 'registry.kontena.local/test:latest', '--pull', File.expand_path('.'))
-        subject.run([])
-      end
-
-      it 'pushes docker image' do
-        expect(subject).to receive(:system).with('docker', 'push', 'registry.kontena.local/test:latest')
-        subject.run([])
-      end
+    before(:each) do
+      allow(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
+      allow(subject).to receive(:stack_from_yaml).with('kontena.yml', hash_including(:name, :values)).and_return(stack)
+      allow(subject).to receive(:system).and_return(true)
+    end
+
+    expect_to_require_current_master
+    expect_to_require_current_master_token
+
+    it 'requires config file' do
+      expect(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
+      subject.run([])
+    end
+
+    it 'reads stack file' do
+      expect(subject).to receive(:stack_from_yaml).with('kontena.yml', hash_including(:name, :values)).and_return(stack)
+      subject.run([])
+    end
+
+    it 'builds docker image' do
+      expect(subject).to receive(:system).with('docker', 'build', '-t', 'registry.kontena.local/test:latest', '--pull', File.expand_path('.'))
+      subject.run([])
+    end
+
+    it 'pushes docker image' do
+      expect(subject).to receive(:system).with('docker', 'push', 'registry.kontena.local/test:latest')
+      subject.run([])
+    end
+
+    it 'uses sudo when --sudo given' do
+      expect(subject).to receive(:system).with('sudo', 'docker', 'build', '-t', 'registry.kontena.local/test:latest', '--pull', File.expand_path('.')).and_return(true)
+      expect(subject).to receive(:system).with('sudo', 'docker', 'push', 'registry.kontena.local/test:latest').and_return(true)
+      subject.run(['--sudo'])
     end
   end
 end

data/spec/kontena/cli/stacks/install_command_spec.rb

@@ -4,6 +4,8 @@ require "kontena/cli/stacks/install_command"
 describe Kontena::Cli::Stacks::InstallCommand do
 
   include ClientHelpers
+  include RequirementsHelper
+  mock_current_master
 
   describe '#execute' do
     let(:stack) do
@@ -17,6 +19,9 @@ describe Kontena::Cli::Stacks::InstallCommand do
       }
     end
 
+    expect_to_require_current_master
+    expect_to_require_current_master_token
+
     before(:each) do
       allow(subject).to receive(:yaml_content).and_return("YAML content")
     end
@@ -59,7 +64,7 @@ describe Kontena::Cli::Stacks::InstallCommand do
 
     it 'accepts a stack name as filename' do
       expect(File).to receive(:exist?).with('user/stack:1.0.0').and_return(false)
-      expect(subject).to receive(:stack_from_yaml).with('user/stack:1.0.0', from_registry: true, name: nil).and_return(stack)
+      expect(subject).to receive(:stack_from_yaml).with('user/stack:1.0.0', from_registry: true, name: nil, values: nil).and_return(stack)
       expect(client).to receive(:post).with(
         'grids/test-grid/stacks', stack
       )

data/spec/kontena/cli/stacks/upgrade_command_spec.rb

@@ -4,6 +4,9 @@ require "kontena/cli/stacks/upgrade_command"
 describe Kontena::Cli::Stacks::UpgradeCommand do
 
   include ClientHelpers
+  include RequirementsHelper
+
+  mock_current_master
 
   describe '#execute' do
 
@@ -14,35 +17,28 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
       }
     end
 
-    it 'requires api url' do
-      allow(subject).to receive(:require_config_file).and_return(true)
-      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-name').and_return(stack)
-      expect(described_class.requires_current_master?).to be_truthy
-      subject.run(['stack-name', './path/to/kontena.yml'])
+    before(:each) do
+      allow(File).to receive(:exist?).with('./path/to/kontena.yml').and_return(true)
     end
 
-    it 'requires token' do
-      allow(subject).to receive(:require_config_file).and_return(true)
-      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-name').and_return(stack)
-      expect(described_class.requires_current_master_token?).to be_truthy
-      subject.run(['stack-name', './path/to/kontena.yml'])
-    end
+    expect_to_require_current_master
+    expect_to_require_current_master_token
 
     it 'requires stack file' do
-      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-name').and_return(stack)
-      expect(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
+      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-name', values: nil, from_registry: false).and_return(stack)
+      expect(subject).to receive(:require_config_file).with('./path/to/kontena.yml').at_least(:once).and_return(true)
       subject.run(['stack-name', './path/to/kontena.yml'])
     end
 
     it 'uses kontena.yml as default stack file' do
       expect(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
-      expect(subject).to receive(:stack_from_yaml).with('kontena.yml', name: 'stack-name').and_return(stack)
+      expect(subject).to receive(:stack_from_yaml).with('kontena.yml', name: 'stack-name', values: nil, from_registry: nil).and_return(stack)
       subject.run(['stack-name'])
     end
 
     it 'sends stack to master' do
       allow(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
-      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-a').and_return(stack)
+      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-a', values: nil, from_registry: false).and_return(stack)
       expect(client).to receive(:put).with(
         'stacks/test-grid/stack-a', anything
       )
@@ -51,7 +47,7 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
 
     it 'allows to override stack name' do
       allow(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
-      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-b').and_return(stack)
+      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-b', values: nil, from_registry: false).and_return(stack)
       stack_b = stack
       stack_b[:name] = 'stack-b'
       expect(client).to receive(:put).with(
@@ -64,7 +60,7 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
       context 'when given' do
         it 'triggers deploy' do
           allow(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
-          allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-a').and_return(stack)
+          allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-a', values: nil, from_registry: false).and_return(stack)
           allow(client).to receive(:put).with(
             'stacks/test-grid/stack-a', anything
           ).and_return({})
@@ -75,7 +71,7 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
       context 'when not given' do
         it 'does not trigger deploy' do
           allow(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
-          allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-a').and_return(stack)
+          allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml', name: 'stack-a', values: nil, from_registry: false).and_return(stack)
           allow(client).to receive(:put).with(
             'stacks/test-grid/stack-a', anything
           ).and_return({})

data/spec/kontena/cli/stacks/yaml/reader_spec.rb

@@ -1,5 +1,6 @@
 require_relative '../../../../spec_helper'
 require 'kontena/cli/stacks/yaml/reader'
+require 'liquid'
 
 describe Kontena::Cli::Stacks::YAML::Reader do
   include FixturesHelpers
@@ -54,6 +55,8 @@ describe Kontena::Cli::Stacks::YAML::Reader do
     allow(File).to receive(:read)
       .with(absolute_yaml_path('kontena_v3.yml'))
       .and_return(fixture('kontena_v3.yml'))
+    allow_any_instance_of(described_class).to receive(:env)
+      .and_return( { 'STACK' => 'test', 'GRID' => 'test-grid' } )
   end
 
   describe '#initialize' do
@@ -88,11 +91,6 @@ describe Kontena::Cli::Stacks::YAML::Reader do
   end
 
   describe '#execute' do
-    before(:each) do
-      allow(ENV).to receive(:[]).with('STACK').and_return('test')
-      allow(ENV).to receive(:[]).with('GRID').and_return('test-grid')
-    end
-
     context 'when extending services' do
       it 'extends services from external file' do
         docker_compose_yml = YAML.load(fixture('docker-compose_v2.yml'))
@@ -129,7 +127,7 @@ describe Kontena::Cli::Stacks::YAML::Reader do
       end
 
       it 'extends services from the same file' do
-        allow(File).to receive(:read)
+        expect(File).to receive(:read)
           .with(absolute_yaml_path('kontena_v3.yml'))
           .and_return(fixture('stack-internal-extend.yml'))
         kontena_yml = YAML.load(fixture('stack-internal-extend.yml'))
@@ -162,20 +160,23 @@ describe Kontena::Cli::Stacks::YAML::Reader do
 
     context 'variable interpolation' do
       before(:each) do
-        allow(ENV).to receive(:key?).and_return(true)
-        allow(ENV).to receive(:[]).with('TAG').and_return('4.1')
-        allow(ENV).to receive(:[]).with('STACK').and_return('test')
-        allow(ENV).to receive(:[]).with('GRID').and_return('test-grid')
-        allow(ENV).to receive(:[]).with('MYSQL_IMAGE').and_return('mariadb:latest')
+        allow_any_instance_of(described_class).to receive(:env).and_return(
+          {
+            'STACK' => 'test',
+            'GRID' => 'test-grid',
+            'TAG' => '4.1'
+          }
+        )
         allow(ENV).to receive(:[]).with('TEST_ENV_VAR').and_return('foo')
+        allow(ENV).to receive(:[]).with('MYSQL_IMAGE').and_return('mariadb:latest')
       end
 
       it 'interpolates $VAR variables' do
         allow(File).to receive(:read)
           .with(absolute_yaml_path)
           .and_return(fixture('stack-with-variables.yml'))
-        subject.execute
-        services = subject.yaml['services']
+        result = subject.execute
+        services = result[:services]
         expect(services['wordpress']['image']).to eq('wordpress:4.1')
       end
 
@@ -183,8 +184,8 @@ describe Kontena::Cli::Stacks::YAML::Reader do
         allow(File).to receive(:read)
           .with(absolute_yaml_path)
           .and_return(fixture('stack-with-variables.yml'))
-        subject.execute
-        services = subject.yaml['services']
+        result = subject.execute
+        services = result[:services]
         expect(services['mysql']['image']).to eq('mariadb:latest')
       end
 
@@ -194,7 +195,10 @@ describe Kontena::Cli::Stacks::YAML::Reader do
           .and_return(fixture('stack-with-variables.yml'))
         allow(ENV).to receive(:[])
           .with('MYSQL_IMAGE')
-          .and_return(nil)
+          .and_return('')
+        allow(ENV).to receive(:[])
+          .with('TAG')
+          .and_return('4.1')
 
         expect {
           subject.execute
@@ -203,12 +207,15 @@ describe Kontena::Cli::Stacks::YAML::Reader do
     end
 
     it 'replaces $$VAR variables to $VAR format' do
-      allow(ENV).to receive(:key?).and_return(true)
-      allow(ENV).to receive(:[]).with('TEST_ENV_VAR').and_return('foo')
+      allow_any_instance_of(described_class).to receive(:env).and_return(
+        {
+          'STACK' => 'test',
+          'GRID' => 'test-grid'
+        }
+      )
       allow(ENV).to receive(:[]).with('TAG').and_return('4.1')
-      allow(ENV).to receive(:[]).with('MYSQL_IMAGE').and_return('mariadb:latest')
-      allow(ENV).to receive(:[]).with('STACK').and_return('test')
-      allow(ENV).to receive(:[]).with('GRID').and_return('test-grid')
+      allow(ENV).to receive(:[]).with('TEST_ENV_VAR').and_return('foo')
+      allow(ENV).to receive(:[]).with('MYSQL_IMAGE').and_return('foo')
       allow(File).to receive(:read)
         .with(absolute_yaml_path)
         .and_return(fixture('stack-with-variables.yml'))
@@ -384,4 +391,52 @@ describe Kontena::Cli::Stacks::YAML::Reader do
       expect(name).to eq('stackname')
     end
   end
+
+  context 'liquid' do
+    context 'valid' do
+      before(:each) do
+        allow(File).to receive(:read)
+          .with(absolute_yaml_path('kontena_v3.yml'))
+          .and_return(fixture('stack-with-liquid.yml'))
+        allow_any_instance_of(described_class).to receive(:env).and_return(
+          {
+            'STACK' => 'test',
+            'GRID' => 'test-grid',
+            'TAG' => '4.1',
+            'MYSQL_IMAGE' => 'mariadb:latest'
+          }
+        )
+        allow(ENV).to receive(:[]).with('TEST_ENV_VAR').and_return('foo')
+      end
+
+      it 'does not interpolate liquid into variables' do
+        expect(subject.variables.value_of('grid_name')).to eq '{{ GRID }} test'
+      end
+
+      it 'interpolates variables into services' do
+        expect(subject.execute[:services].size).to eq 5
+      end
+    end
+
+    context 'invalid' do
+      before(:each) do
+        allow(File).to receive(:read)
+          .with(absolute_yaml_path('kontena_v3.yml'))
+          .and_return(fixture('stack-with-invalid-liquid.yml'))
+        allow_any_instance_of(described_class).to receive(:env).and_return(
+          {
+            'STACK' => 'test',
+            'GRID' => 'test-grid',
+            'TAG' => '4.1',
+            'MYSQL_IMAGE' => 'mariadb:latest'
+          }
+        )
+        allow(ENV).to receive(:[]).with('TEST_ENV_VAR').and_return('foo')
+      end
+
+      it 'raises' do
+        expect{subject.execute}.to raise_error(Liquid::SyntaxError)
+      end
+    end
+  end
 end