train 1.4.25 → 1.4.29

data/test/unit/file_test.rb

@@ -18,32 +18,6 @@ describe Train::File do
     new_cls.type.must_equal :unknown
   end
 
-  it 'calculates md5sum from content' do
-    content = 'hello world'
-    new_cls.stub :content, content do |i|
-      i.md5sum.must_equal '5eb63bbbe01eeed093cb22bb8f5acdc3'
-    end
-  end
-
-  it 'sets md5sum of nil content to nil' do
-    new_cls.stub :content, nil do |i|
-      i.md5sum.must_be_nil
-    end
-  end
-
-  it 'calculates sha256sum from content' do
-    content = 'hello world'
-    new_cls.stub :content, content do |i|
-      i.sha256sum.must_equal 'b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9'
-    end
-  end
-
-  it 'sets sha256sum of nil content to nil' do
-    new_cls.stub :content, nil do |i|
-      i.sha256sum.must_be_nil
-    end
-  end
-
   it 'throws Not implemented error for exist?' do
     # proc { Train.validate_backend({ host: rand }) }.must_raise Train::UserError
     proc { new_cls.exist?}.must_raise NotImplementedError
@@ -91,13 +65,12 @@ describe Train::File do
 
   it 'set product_version to nil' do
     new_cls.product_version.must_be_nil
-  end  
+  end
 
   it 'set product_version to nil' do
     new_cls.file_version.must_be_nil
   end
 
-
   describe 'type' do
     it 'recognized type == file' do
       fc = mockup(type: :file)
@@ -153,4 +126,4 @@ describe Train::File do
       fc.version?(x).must_equal true
     end
   end
-end  
+end

data/test/unit/transports/azure_test.rb

@@ -122,59 +122,4 @@ describe 'azure transport' do
       connection.unique_identifier.must_equal 'test_tenant_id'
     end
   end
-
-  describe 'parse_credentials_file' do
-    let(:cred_file) do
-      require 'tempfile'
-      file = Tempfile.new('cred_file')
-      info = <<-INFO
-        [my_subscription_id]
-        client_id = "my_client_id"
-        client_secret = "my_client_secret"
-        tenant_id = "my_tenant_id"
-
-        [my_subscription_id2]
-        client_id = "my_client_id2"
-        client_secret = "my_client_secret2"
-        tenant_id = "my_tenant_id2"
-      INFO
-      file.write(info)
-      file.close
-      file
-    end
-
-    it 'validate credentials from file' do
-      options[:credentials_file] = cred_file.path
-      options[:subscription_id] = 'my_subscription_id'
-      connection.send(:parse_credentials_file)
-
-      options[:tenant_id].must_equal 'my_tenant_id'
-      options[:client_id].must_equal 'my_client_id'
-      options[:client_secret].must_equal 'my_client_secret'
-      options[:subscription_id].must_equal 'my_subscription_id'
-    end
-
-    it 'validate credentials from file subscription override' do
-      options[:credentials_file] = cred_file.path
-      options[:subscription_id] = 'my_subscription_id2'
-      connection.send(:parse_credentials_file)
-
-      options[:tenant_id].must_equal 'my_tenant_id2'
-      options[:client_id].must_equal 'my_client_id2'
-      options[:client_secret].must_equal 'my_client_secret2'
-      options[:subscription_id].must_equal 'my_subscription_id2'
-    end
-
-    it 'validate credentials from file subscription index' do
-      options[:credentials_file] = cred_file.path
-      options[:subscription_id] = nil
-      ENV['AZURE_SUBSCRIPTION_NUMBER'] = '2'
-      connection.send(:parse_credentials_file)
-
-      options[:tenant_id].must_equal 'my_tenant_id2'
-      options[:client_id].must_equal 'my_client_id2'
-      options[:client_secret].must_equal 'my_client_secret2'
-      options[:subscription_id].must_equal 'my_subscription_id2'
-    end
-  end
 end

data/test/unit/transports/helpers/azure/file_credentials_test.rb

@@ -0,0 +1,121 @@
+# encoding: utf-8
+
+require 'helper'
+require 'tempfile'
+require 'train/transports/helpers/azure/file_credentials'
+
+describe 'parse_credentials_file' do
+  let(:cred_file_single_entry) do
+    file = Tempfile.new('cred_file')
+    info = <<-INFO
+      [my_subscription_id]
+      client_id = "my_client_id"
+      client_secret = "my_client_secret"
+      tenant_id = "my_tenant_id"
+    INFO
+    file.write(info)
+    file.close
+    file
+  end
+
+  let(:cred_file_multiple_entries) do
+    file = Tempfile.new('cred_file')
+    info = <<-INFO
+      [my_subscription_id]
+      client_id = "my_client_id"
+      client_secret = "my_client_secret"
+      tenant_id = "my_tenant_id"
+
+      [my_subscription_id2]
+      client_id = "my_client_id2"
+      client_secret = "my_client_secret2"
+      tenant_id = "my_tenant_id2"
+    INFO
+    file.write(info)
+    file.close
+    file
+  end
+
+  let(:options) { { credentials_file: cred_file_multiple_entries.path } }
+
+  it 'returns empty hash when no credentials file detected' do
+    result = Train::Transports::Helpers::Azure::FileCredentials.parse({})
+
+    assert_empty(result)
+  end
+
+  it 'loads only entry from file when no subscription id given' do
+    options[:credentials_file] = cred_file_single_entry.path
+
+    result = Train::Transports::Helpers::Azure::FileCredentials.parse(options)
+
+    assert_equal('my_tenant_id',       result[:tenant_id])
+    assert_equal('my_client_id',       result[:client_id])
+    assert_equal('my_client_secret',   result[:client_secret])
+    assert_equal('my_subscription_id', result[:subscription_id])
+  end
+
+  it 'raises an error when no subscription id given and multiple entries' do
+    error = assert_raises RuntimeError do
+      Train::Transports::Helpers::Azure::FileCredentials.parse(options)
+    end
+
+    assert_equal('Credentials file must have one entry. Check your credentials file. If you have more than one entry set AZURE_SUBSCRIPTION_ID environment variable.', error.message)
+  end
+
+  it 'loads entry when subscription id is given' do
+    options[:subscription_id] = 'my_subscription_id'
+
+    result = Train::Transports::Helpers::Azure::FileCredentials.parse(options)
+
+    assert_equal('my_tenant_id',       result[:tenant_id])
+    assert_equal('my_client_id',       result[:client_id])
+    assert_equal('my_client_secret',   result[:client_secret])
+    assert_equal('my_subscription_id', result[:subscription_id])
+  end
+
+  it 'raises an error when subscription id not found' do
+    options[:subscription_id] = 'missing_subscription_id'
+
+    error = assert_raises RuntimeError do
+      Train::Transports::Helpers::Azure::FileCredentials.parse(options)
+    end
+
+    assert_equal('No credentials found for subscription number missing_subscription_id', error.message)
+  end
+
+  it 'loads entry based on index' do
+    ENV['AZURE_SUBSCRIPTION_NUMBER'] = '2'
+
+    result = Train::Transports::Helpers::Azure::FileCredentials.parse(options)
+
+    ENV.delete('AZURE_SUBSCRIPTION_NUMBER')
+
+    assert_equal('my_tenant_id2',       result[:tenant_id])
+    assert_equal('my_client_id2',       result[:client_id])
+    assert_equal('my_client_secret2',   result[:client_secret])
+    assert_equal('my_subscription_id2', result[:subscription_id])
+  end
+
+  it 'raises an error when index is out of bounds' do
+    ENV['AZURE_SUBSCRIPTION_NUMBER'] = '3'
+
+    error = assert_raises RuntimeError do
+      Train::Transports::Helpers::Azure::FileCredentials.parse(options)
+    end
+    ENV.delete('AZURE_SUBSCRIPTION_NUMBER')
+
+    assert_equal('Your credentials file only contains 2 subscriptions. You specified number 3.', error.message)
+  end
+
+  it 'raises an error when index 0 is given' do
+    ENV['AZURE_SUBSCRIPTION_NUMBER'] = '0'
+
+    error = assert_raises RuntimeError do
+      Train::Transports::Helpers::Azure::FileCredentials.parse(options)
+    end
+    ENV.delete('AZURE_SUBSCRIPTION_NUMBER')
+
+    assert_equal('Index must be greater than 0.', error.message)
+  end
+end

data/test/unit/transports/ssh_test.rb

@@ -55,6 +55,18 @@ describe 'ssh transport' do
     end
   end
 
+  describe 'ssh options' do
+    let(:ssh) { cls.new(conf) }
+    let(:connection) { ssh.connection }
+    it 'includes BatchMode when :non_interactive is set' do
+      conf[:non_interactive] = true
+      connection.ssh_opts.include?("BatchMode=yes").must_equal true
+    end
+    it 'excludes BatchMode when :non_interactive is not set' do
+      connection.ssh_opts.include?("BatchMode=yes").must_equal false
+    end
+  end
+
   describe 'opening a connection' do
     let(:ssh) { cls.new(conf) }
     let(:connection) { ssh.connection }

data/test/windows/winrm_test.rb

@@ -84,12 +84,22 @@ describe 'windows winrm command' do
       file.mode.must_be_nil
     end
 
-    it 'has an md5sum' do
-      file.md5sum.wont_be_nil
-    end
-
-    it 'has an sha256sum' do
-      file.sha256sum.wont_be_nil
+    it 'has the correct md5sum' do
+      # Must create unique file to prevent `ERROR_SHARING_VIOLATION`
+      tempfile = Tempfile.new('tempfile')
+      tempfile.write('easy to hash')
+      tempfile.close
+      conn.file(tempfile.path).md5sum.must_equal 'c15b41ade1221a532a38d89671ffaa20'
+      tempfile.unlink
+    end
+
+    it 'has the correct sha256sum' do
+      # Must create unique file to prevent `ERROR_SHARING_VIOLATION`
+      tempfile = Tempfile.new('tempfile')
+      tempfile.write('easy to hash')
+      tempfile.close
+      conn.file(tempfile.path).sha256sum.must_equal '24ae25354d5f697566e715cd46e1df2f490d0b8367c21447962dbf03bf7225ba'
+      tempfile.unlink
     end
 
     it 'has no modified time' do

data/train.gemspec

@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.0'
+
   spec.add_dependency 'json', '>= 1.8', '< 3.0'
   # chef-client < 12.4.1 require mixlib-shellout-2.0.1
   spec.add_dependency 'mixlib-shellout', '~> 2.0'
-  # net-ssh 3.x drops Ruby 1.9 support, so this constraint could be raised when
-  # 1.9 support is no longer needed here or for Inspec
-  spec.add_dependency 'net-ssh', '>= 2.9', '< 5.0'
+  spec.add_dependency 'net-ssh', '>= 2.9', '< 6.0'
   spec.add_dependency 'net-scp', '~> 1.2'
   spec.add_dependency 'winrm', '~> 2.0'
   spec.add_dependency 'winrm-fs', '~> 1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 1.4.25
+  version: 1.4.29
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -53,7 +53,7 @@ dependencies:
         version: '2.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '2.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -253,6 +253,10 @@ files:
 - lib/train/transports/cisco_ios_connection.rb
 - lib/train/transports/docker.rb
 - lib/train/transports/gcp.rb
+- lib/train/transports/helpers/azure/file_credentials.rb
+- lib/train/transports/helpers/azure/file_parser.rb
+- lib/train/transports/helpers/azure/subscription_id_file_parser.rb
+- lib/train/transports/helpers/azure/subscription_number_file_parser.rb
 - lib/train/transports/local.rb
 - lib/train/transports/mock.rb
 - lib/train/transports/ssh.rb
@@ -301,6 +305,7 @@ files:
 - test/unit/file/remote/linux_test.rb
 - test/unit/file/remote/qnx_test.rb
 - test/unit/file/remote/unix_test.rb
+- test/unit/file/remote/windows_test.rb
 - test/unit/file/remote_test.rb
 - test/unit/file_test.rb
 - test/unit/helper.rb
@@ -321,6 +326,7 @@ files:
 - test/unit/transports/azure_test.rb
 - test/unit/transports/cisco_ios_connection.rb
 - test/unit/transports/gcp_test.rb
+- test/unit/transports/helpers/azure/file_credentials_test.rb
 - test/unit/transports/local_test.rb
 - test/unit/transports/mock_test.rb
 - test/unit/transports/ssh_test.rb
@@ -341,7 +347,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -394,6 +400,7 @@ test_files:
 - test/unit/file/remote/linux_test.rb
 - test/unit/file/remote/qnx_test.rb
 - test/unit/file/remote/unix_test.rb
+- test/unit/file/remote/windows_test.rb
 - test/unit/file/remote_test.rb
 - test/unit/file_test.rb
 - test/unit/helper.rb
@@ -414,6 +421,7 @@ test_files:
 - test/unit/transports/azure_test.rb
 - test/unit/transports/cisco_ios_connection.rb
 - test/unit/transports/gcp_test.rb
+- test/unit/transports/helpers/azure/file_credentials_test.rb
 - test/unit/transports/local_test.rb
 - test/unit/transports/mock_test.rb
 - test/unit/transports/ssh_test.rb