train 1.5.6 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce0372a342eb1702aac1255a5cfaadfdd5af73bd46a87e8a5b34f8723a4bfc5e
-  data.tar.gz: 56157c304c959c95cb162fb71c6d2f9f431bf08bea2e6d893c56076d856380f0
+  metadata.gz: 4053a5448990953c02982f884a3af8d00166920843713ffea3e126848db9f04e
+  data.tar.gz: 468e054659adf76575bc32bb56b3b31e615ba3eae84601573689bcfd1881abd6
 SHA512:
-  metadata.gz: d9f4a5d1598844f73eff994fee266ab5757e62cd1c2c9e3b69245d7f9db5fa3db6361151df7d1720762919644cf24c15248c18b85701c25153ee4e6d2cfd2da7
-  data.tar.gz: e2605fe51549fe888f22e6a16c186b1945a9630a399642eee951dc34446ae1cc461ae264db0979737fb0cd5f060b2cb03e845d7108d2c7a5cf57bcc5a3161565
+  metadata.gz: 0c6921286cd8ae8779452e28cc9f0d0ad2e97223e2b39cad4593a2774e92c2580eae78f24f664136948c9746e76076a72f51ed55e11fdeacbc569f8c49335ca2
+  data.tar.gz: '06485051796b00ec02e7325f211f61de842008e386a8b855eef52166fe7160975a9745a68305dd669aa8341bcfdafafbae2e3cb6a47ca6803371621cfc5554d5'

data/CHANGELOG.md

@@ -1,19 +1,29 @@
-<!-- latest_release 1.5.6 -->
-## [v1.5.6](https://github.com/inspec/train/tree/v1.5.6) (2018-11-01)
+<!-- latest_release 1.5.11 -->
+## [v1.5.11](https://github.com/inspec/train/tree/v1.5.11) (2018-12-10)
 
 #### Merged Pull Requests
-- Adds cached_client method in BaseConnection [#371](https://github.com/inspec/train/pull/371) ([dmccown](https://github.com/dmccown))
+- Pass logger to Cisco IOS transport [#381](https://github.com/inspec/train/pull/381) ([btm](https://github.com/btm))
 <!-- latest_release -->
 
-<!-- release_rollup since=1.5.4 -->
-### Changes since 1.5.4 release
+<!-- release_rollup since=1.5.6 -->
+### Changes since 1.5.6 release
 
 #### Merged Pull Requests
-- Adds cached_client method in BaseConnection [#371](https://github.com/inspec/train/pull/371) ([dmccown](https://github.com/dmccown)) <!-- 1.5.6 -->
-- Fix Cisco IOS detection when banners lack a `\r\n` [#372](https://github.com/inspec/train/pull/372) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 1.5.5 -->
+- Pass logger to Cisco IOS transport [#381](https://github.com/inspec/train/pull/381) ([btm](https://github.com/btm)) <!-- 1.5.11 -->
+- Added a new matcher for amazon linux 2 [#380](https://github.com/inspec/train/pull/380) ([artyomtkachenko](https://github.com/artyomtkachenko)) <!-- 1.5.10 -->
+- Remove `#local?` [#365](https://github.com/inspec/train/pull/365) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 1.5.9 -->
+- Fix shallow_link_path on remote unix [#373](https://github.com/inspec/train/pull/373) ([mheiges](https://github.com/mheiges)) <!-- 1.5.8 -->
+- Add Google API application info [#378](https://github.com/inspec/train/pull/378) ([nathenharvey](https://github.com/nathenharvey)) <!-- 1.5.7 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v1.5.6](https://github.com/inspec/train/tree/v1.5.6) (2018-11-01)
+
+#### Merged Pull Requests
+- Fix Cisco IOS detection when banners lack a `\r\n` [#372](https://github.com/inspec/train/pull/372) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+- Adds cached_client method in BaseConnection [#371](https://github.com/inspec/train/pull/371) ([dmccown](https://github.com/dmccown))
+<!-- latest_stable_release -->
+
 ## [v1.5.4](https://github.com/inspec/train/tree/v1.5.4) (2018-10-18)
 
 #### Merged Pull Requests
@@ -21,7 +31,6 @@
 - Remove the legacy version bumping from the rakefile [#359](https://github.com/inspec/train/pull/359) ([tas50](https://github.com/tas50))
 - Adds Azure Vault Client [#351](https://github.com/inspec/train/pull/351) ([r-fennell](https://github.com/r-fennell))
 - Correct example plugin link [#363](https://github.com/inspec/train/pull/363) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
-<!-- latest_stable_release -->
 
 ## [v1.5.0](https://github.com/inspec/train/tree/v1.5.0) (2018-09-27)
 

data/lib/train/file/remote/unix.rb

@@ -62,7 +62,8 @@ module Train
 
         def shallow_link_path
           return nil unless symlink?
-          @shallow_link_path ||= ::File.readlink(@path)
+          @shallow_link_path ||=
+            @backend.run_command("readlink #{@spath}").stdout.chomp
         end
 
         def unix_mode_mask(owner, type)

data/lib/train/platforms/detect/helpers/os_linux.rb

@@ -10,8 +10,8 @@ module Train::Platforms::Detect::Helpers
       case conf
       when /rawhide/i
         /((\d+) \(Rawhide\))/i.match(conf)[1].downcase
-      when /Amazon Linux AMI/i
-        /release ([\d\.]+)/.match(conf)[1]
+      when /Amazon Linux/i
+        /([\d\.]+)/.match(conf)[1]
       when /derived from .*linux|amazon/i
         /Linux ((\d+|\.)+)/i.match(conf)[1]
       else

data/lib/train/platforms/detect/specifications/os.rb

@@ -17,9 +17,15 @@ module Train::Platforms::Detect::Specifications
 
       plat.family('windows').in_family('os')
           .detect {
-            if winrm? || (@backend.local? && ruby_host_os(/mswin|mingw32|windows/))
-              true
+            # Can't return from a `proc` thus the `is_windows` shenanigans
+            is_windows = false
+            is_windows = true if winrm?
+
+            if @backend.class.to_s == 'Train::Transports::Local::Connection'
+              is_windows = true if ruby_host_os(/mswin|mingw32|windows/)
             end
+
+            is_windows
           }
       # windows platform
       plat.name('windows').in_family('windows')

data/lib/train/plugins/base_connection.rb

@@ -91,11 +91,6 @@ class Train::Plugins::Transport
       end
     end
 
-    # Is this a local transport?
-    def local?
-      false
-    end
-
     def force_platform!(name, platform_details = nil)
       plat = Train::Platforms.name(name)
       plat.backend = self

data/lib/train/transports/cisco_ios_connection.rb

@@ -7,8 +7,6 @@ class Train::Transports::SSH
     def initialize(options)
       super(options)
 
-      logger.level = Logger::INFO
-
       # Extract options to avoid passing them in to `Net::SSH.start` later
       @host = options.delete(:host)
       @user = options.delete(:user)

data/lib/train/transports/gcp.rb

@@ -88,6 +88,8 @@ module Train::Transports
         scopes = ['https://www.googleapis.com/auth/cloud-platform',
                   'https://www.googleapis.com/auth/compute']
         authorization = Google::Auth.get_application_default(scopes)
+        Google::Apis::ClientOptions.default.application_name = 'chef-inspec-train'
+        Google::Apis::ClientOptions.default.application_version = Train::VERSION
         Google::Apis::RequestOptions.default.authorization = authorization
       end
 

data/lib/train/transports/local.rb

@@ -28,10 +28,6 @@ module Train::Transports
                   end
       end
 
-      def local?
-        true
-      end
-
       def login_command
         nil # none, open your shell
       end

data/lib/train/transports/ssh.rb

@@ -218,6 +218,7 @@ module Train::Transports
         # We will also support the sudo password field for the same purpose
         # for the interim. # TODO
         ios_options[:enable_password] = @options[:enable_password] || @options[:sudo_password]
+        ios_options[:logger] = @options[:logger]
         ios_options.merge!(@connection_options)
         conn = CiscoIOSConnection.new(ios_options)
       end

data/lib/train/transports/vmware.rb

@@ -69,10 +69,6 @@ module Train::Transports
         end
       end
 
-      def local?
-        true
-      end
-
       def platform
         force_platform!('vmware', @platform_details)
       end

data/lib/train/version.rb

@@ -3,5 +3,5 @@
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 module Train
-  VERSION = '1.5.6'.freeze
+  VERSION = '1.5.11'.freeze
 end

data/test/fixtures/plugins/train-test-fixture/lib/train-test-fixture/connection.rb

@@ -10,10 +10,6 @@ module TrainPlugins
         super(options)
       end
 
-      def local?
-        true
-      end
-
       private
 
       def run_command_via_connection(cmd)

data/test/unit/platforms/detect/os_linux_test.rb

@@ -28,6 +28,14 @@ describe 'os_linux' do
     it 'normal linux' do
       detector.redhatish_version('derived from Ubuntu Linux 11').must_equal('11')
     end
+
+    it 'amazon linux 2 new release naming schema' do
+      detector.redhatish_version('Amazon Linux release 2 (Karoo)').must_equal('2')
+    end
+
+    it 'amazon linux 2 old release naming schema' do
+      detector.redhatish_version('Amazon Linux 2').must_equal('2')
+    end
   end
 
   describe 'lsb parse' do

data/test/unit/transports/gcp_test.rb

@@ -99,6 +99,18 @@ describe 'gcp transport' do
       client.is_a?(Google::Apis::ComputeV1::ComputeService).must_equal true
       cache[:api_call].count.must_equal 0
     end
+
+    it 'test gcp_compute_client application name' do
+      client = connection.gcp_compute_client
+      client.is_a?(Google::Apis::ComputeV1::ComputeService).must_equal true
+      client.client_options.application_name.must_equal 'chef-inspec-train'
+    end
+
+    it 'test gcp_compute_client application version' do
+      client = connection.gcp_compute_client
+      client.is_a?(Google::Apis::ComputeV1::ComputeService).must_equal true
+      client.client_options.application_version.must_equal Train::VERSION
+    end
   end
 
   describe 'gcp_iam_client' do
@@ -114,6 +126,18 @@ describe 'gcp transport' do
       client.is_a?(Google::Apis::IamV1::IamService).must_equal true
       cache[:api_call].count.must_equal 0
     end
+
+    it 'test gcp_iam_client application name' do
+      client = connection.gcp_iam_client
+      client.is_a?(Google::Apis::IamV1::IamService).must_equal true
+      client.client_options.application_name.must_equal 'chef-inspec-train'
+    end
+
+    it 'test gcp_iam_client application version' do
+      client = connection.gcp_iam_client
+      client.is_a?(Google::Apis::IamV1::IamService).must_equal true
+      client.client_options.application_version.must_equal Train::VERSION
+    end
   end
 
   describe 'gcp_project_client' do
@@ -129,6 +153,18 @@ describe 'gcp transport' do
       client.is_a?(Google::Apis::CloudresourcemanagerV1::CloudResourceManagerService).must_equal true
       cache[:api_call].count.must_equal 0
     end
+
+    it 'test gcp_project_client application name' do
+      client = connection.gcp_project_client
+      client.is_a?(Google::Apis::CloudresourcemanagerV1::CloudResourceManagerService).must_equal true
+      client.client_options.application_name.must_equal 'chef-inspec-train'
+    end
+
+    it 'test gcp_project_client application version' do
+      client = connection.gcp_project_client
+      client.is_a?(Google::Apis::CloudresourcemanagerV1::CloudResourceManagerService).must_equal true
+      client.client_options.application_version.must_equal Train::VERSION
+    end
   end
 
   describe 'gcp_storage_client' do
@@ -144,6 +180,18 @@ describe 'gcp transport' do
       client.is_a?(Google::Apis::StorageV1::StorageService).must_equal true
       cache[:api_call].count.must_equal 0
     end
+
+    it 'test gcp_storage_client application name' do
+      client = connection.gcp_storage_client
+      client.is_a?(Google::Apis::StorageV1::StorageService).must_equal true
+      client.client_options.application_name.must_equal 'chef-inspec-train'
+    end
+
+    it 'test gcp_storage_client application version' do
+      client = connection.gcp_storage_client
+      client.is_a?(Google::Apis::StorageV1::StorageService).must_equal true
+      client.client_options.application_version.must_equal Train::VERSION
+    end
   end
 
   describe 'gcp_admin_client' do
@@ -159,6 +207,18 @@ describe 'gcp transport' do
       client.is_a?(Google::Apis::AdminDirectoryV1::DirectoryService).must_equal true
       cache[:api_call].count.must_equal 0
     end
+
+    it 'test gcp_admin_client application name' do
+      client = connection.gcp_admin_client
+      client.is_a?(Google::Apis::AdminDirectoryV1::DirectoryService).must_equal true
+      client.client_options.application_name.must_equal 'chef-inspec-train'
+    end
+
+    it 'test gcp_admin_client application version' do
+      client = connection.gcp_admin_client
+      client.is_a?(Google::Apis::AdminDirectoryV1::DirectoryService).must_equal true
+      client.client_options.application_version.must_equal Train::VERSION
+    end
   end
 
   # test options override of env vars in connect

data/test/unit/transports/vmware_test.rb

@@ -127,12 +127,6 @@ describe 'Train::Transports::VMware::Connection' do
     end
   end
 
-  describe '#local' do
-    it 'returns true' do
-      create_transport.connection.local?.must_equal true
-    end
-  end
-
   describe '#platform' do
     it 'returns correct platform details' do
       platform = create_transport.connection.platform

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.11
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json