train-core 3.10.0 → 3.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 579bb940034fbb7c1d8f6e8025b0d364e5b78f2161efd6155a0f7d65f03af7e0
-  data.tar.gz: f5ffb30dfd921debde3e54dc2f88d0f9c41644b02ec7bf3eb6d32797dcc81bc5
+  metadata.gz: 6d396bbb358c284289e040d532236fa26f2f92d73aa41dde56bf0b914a087238
+  data.tar.gz: e378a5a7c8af2cc8bcadc02abc1e99c310f73a182703edac027592074dfa8eba
 SHA512:
-  metadata.gz: f6972393f3e6721198c850213d00e120c49668fe29fe60d50d2d465bf5839d9e0ee7281d14e98143d2bd9bb33130f6bee9e859e9c111c490dfdca02ea0d96a27
-  data.tar.gz: a68a449c540c36712f68b69ef6103955e4bb10287c98b4448a65b0b103bdb8e9cbf401a3316bdca6a347e9fa85dd55fa4c1619fcb7ff4cc379fecb33032918b0
+  metadata.gz: e37b9360ad1d5c206c700b770e41d552d0a864dfec0df63fde6201c7c842b3f45f9bcb0ffc2f4f6413b55d5354864eae87c1488c2c7dc31228ab9b39da5509e1
+  data.tar.gz: 699adc38633ac5c01a0de55baa35ed4bacf060efff95a7c05d6afb324fff206c4920e29151b0ed23fb1ee2b7b4b57352323654df19a1393c2f22eae6de18678e

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

@@ -106,6 +106,7 @@ module Train::Platforms::Detect::Helpers
       m = res.match(/Cisco Nexus Operating System \(NX-OS\) Software/)
       unless m.nil?
         v = res[/^\s*system:\s+version (\d+\.\d+)/, 1]
+        v ||= res[/NXOS: version (\d+\.\d+)/, 1]
         return @cache[:cisco] = { version: v, type: "nexus" }
       end
 

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

@@ -383,7 +383,7 @@ module Train::Platforms::Detect::Specifications
     def self.load_other
       plat.family("arista_eos").title("Arista EOS Family").in_family("os")
         .detect do
-          true
+          !@backend.run_command("show version").stdout.match(/Arista/).nil?
         end
 
       declare_instance("arista_eos", "Arista EOS", "arista_eos") do

data/lib/train/version.rb

@@ -2,5 +2,5 @@
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 module Train
-  VERSION = "3.10.0".freeze
+  VERSION = "3.10.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-core
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.7
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -87,7 +87,7 @@ dependencies:
         version: '1.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -97,7 +97,7 @@ dependencies:
         version: '1.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
         version: '2.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
         version: '2.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 description: A minimal Train with a backends for ssh and winrm.
 email:
 - inspec@chef.io
@@ -162,7 +162,6 @@ files:
 - lib/train/transports/cisco_ios_connection.rb
 - lib/train/transports/local.rb
 - lib/train/transports/mock.rb
-- lib/train/transports/podman.rb
 - lib/train/transports/ssh.rb
 - lib/train/transports/ssh_connection.rb
 - lib/train/version.rb

data/lib/train/transports/podman.rb

@@ -1,157 +0,0 @@
-require "docker"
-require_relative "../errors"
-
-module Train::Transports
-  class Podman < Train.plugin(1)
-
-    name "podman"
-
-    include_options Train::Extras::CommandWrapper
-    option :host, required: true
-    option :podman_url, required: false
-
-    def connection(state = {}, &block)
-      opts = merge_options(options, state || {})
-
-      validate_options(opts)
-
-      if @connection && @connection_options == opts
-        reuse_connection(&block)
-      else
-        create_new_connection(opts, &block)
-      end
-    end
-
-    private
-
-    # Creates a new Podman connection instance and save it for potential future
-    # reuse.
-    #
-    # @param options [Hash] connection options
-    # @return [Podman::Connection] a Podman connection instance
-    # @api private
-    def create_new_connection(options, &block)
-      if @connection
-        logger.debug("[Podman] shutting previous connection #{@connection}")
-        @connection.close
-      end
-
-      @connection_options = options
-      @connection = Connection.new(options, &block)
-    end
-
-    # Return the last saved Podman connection instance.
-    #
-    # @return [Podman::Connection] a Podman connection instance
-    # @api private
-    def reuse_connection
-      logger.debug("[Podman] reusing existing connection #{@connection}")
-      yield @connection if block_given?
-      @connection
-    end
-  end
-
-  class Train::Transports::Podman
-    class Connection < BaseConnection
-      def initialize(options)
-        super(options)
-
-        @id = options[:host]
-
-        if RUBY_PLATFORM =~ /windows|mswin|msys|mingw|cygwin/
-          raise "Unsupported host platform."
-        end
-
-        # Currently Podman url can be set using option and setting the environment variable.
-        uid = Process.uid
-        podman_url = options[:podman_url] || ENV["CONTAINER_HOST"]
-        podman_url ||= "unix:///run/podman/podman.sock" if uid == 0
-        podman_url ||= "unix:///run/user/#{uid}/podman/podman.sock"
-
-        Docker.url = podman_url
-
-        # Using docker-api ruby library to fetch the Podman container data.
-        @container = ::Docker::Container.get(@id) ||
-          raise("Can't find Podman container #{@id}")
-        @cmd_wrapper = nil
-        @cmd_wrapper = CommandWrapper.load(self, @options)
-        @probably_windows = nil
-      rescue Excon::Error::Socket
-        raise Train::TransportError, "Unable to connect to Podman using #{podman_url}"
-      rescue Docker::Error::NotFoundError => e
-        raise Train::TransportError, "Container Not Found: #{e.message}"
-      rescue Docker::Error::ServerError => e
-        raise Train::TransportError, "#{e.message}"
-      end
-
-      def close
-        # nothing to do at the moment
-      end
-
-      def uri
-        if @container.nil?
-          "podman://#{@id}"
-        else
-          "podman://#{@container.id}"
-        end
-      end
-
-      def unique_identifier
-        @container.nil? ? @id : @container.id # default uuid set to the podman host.
-      end
-
-      private
-
-      def file_via_connection(path)
-        if os.aix?
-          Train::File::Remote::Aix.new(self, path)
-        elsif os.solaris?
-          Train::File::Remote::Unix.new(self, path)
-        elsif os.windows?
-          Train::File::Remote::Windows.new(self, path)
-        else
-          Train::File::Remote::Linux.new(self, path)
-        end
-      end
-
-      def run_command_via_connection(cmd, &_data_handler)
-        cmd = @cmd_wrapper.run(cmd) unless @cmd_wrapper.nil?
-
-        # Cannot use os.windows? here because it calls run_command_via_connection,
-        # causing infinite recursion during initial platform detection
-        if sniff_for_windows?
-          invocation = cmd_run_command(cmd)
-        else
-          invocation = sh_run_command(cmd)
-        end
-        stdout, stderr, exit_status = @container.exec(
-          invocation, user: @options[:user]
-        )
-        CommandResult.new(stdout.join, stderr.join, exit_status)
-      rescue ::Docker::Error::DockerError => _
-        raise
-      rescue => _
-        # @TODO: differentiate any other error
-        raise
-      end
-
-      def sh_run_command(cmd)
-        ["/bin/sh", "-c", cmd]
-      end
-
-      def cmd_run_command(cmd)
-        ["cmd.exe", "/s", "/c", cmd]
-      end
-
-      def sniff_for_windows?
-        return @probably_windows unless @probably_windows.nil?
-
-        # Run a command using /bin/sh, which should fail under Windows
-        stdout, _stderr, _exit_status = @container.exec(
-          sh_run_command("true"), user: @options[:user]
-        )
-        @probably_windows = !!stdout.detect { |l| l.include? "failure in a Windows system call" }
-      end
-    end
-  end
-end