train-core 3.10.1 → 3.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 317ad7d2b997507f028541aeb119b6a9fee1949953f8aedbda2ab227060daa23
-  data.tar.gz: 9fcd8942668d778ea48d47a100bfbb8d8f080d92ab0af175df6a31aeb20124fc
+  metadata.gz: bd9123fc8c77d6d2913633bb544aae171f440d3a0558bacda3136fa62d856661
+  data.tar.gz: b8e558c2c7fa1479725228f1745ff5ed610f6975babc43cb07bbfb6289f41806
 SHA512:
-  metadata.gz: 3281d0bce957f81b3719faec39eeb7a7c3f9ceee2ee6d5ed8d40b6e2ec8ef5f61d42d09daa6c0defdc55777465ec939c853ebf8128356f2358b31f2181641050
-  data.tar.gz: 00caa3224bd23688c46c01f2e4e6ea2591fa25c04938e95d9bdb9d1fc2d8bf3758c01362bcbdcf6dcda8633f02c89d66157e92ebb8a98462a42f94f72e1630b6
+  metadata.gz: 0ed3576117bf704f08d0170e3f9c9d08e20da634300f02b986aaa8fb18094d0b027d9943bcc04043d986102e641ed7c09a4ed163ca6b9f8de1488d3063043721
+  data.tar.gz: deb114924bc9f537bb8a8c4df1f0b48936c8b7e081539109b886b4c26f994a6f96b214d514d2109ab75b526e2328473fb56f323e0746a28f8cf4cfce4df8e334

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
 
@@ -116,6 +117,7 @@ module Train::Platforms::Detect::Helpers
       (unix_uuid_from_chef         ||
        unix_uuid_from_machine_file ||
        uuid_from_command           ||
+       uuid_from_containerized_system ||
        raise(Train::TransportError, "Cannot find a UUID for your node."))
     end
 
@@ -154,6 +156,28 @@ module Train::Platforms::Detect::Helpers
       uuid_from_string(result.stdout.chomp) if result.exit_status == 0 && !result.stdout.empty?
     end
 
+    # This will run if anyone is running Train with local transport inside docker container
+    # This is fallback plan, if other ways of getting uuid fails for local transport running inside docker container
+    # TODO: This needs to be improved to support other container runtime
+    def uuid_from_containerized_system
+      uuid = nil
+
+      if File.exist?("/proc/self/cgroup")
+        cmd = @backend.run_command("head -1 /proc/self/cgroup|cut -d/ -f3")
+        unless cmd.stdout.strip.empty?
+          uuid = cmd.stdout.strip
+        end
+      end
+
+      if uuid.nil? && File.exist?("/proc/self/mountinfo")
+        cmd = @backend.run_command("cat /proc/self/mountinfo | grep -i /docker/containers/ | head -n 1 | awk '{print $4}' | awk NF=NF FS=/ | awk '{print $3}'")
+        unless cmd.stdout.strip.empty?
+          uuid = cmd.stdout.strip
+        end
+      end
+      uuid
+    end
+
     # This hashes the passed string into SHA1.
     # Then it downgrades the 160bit SHA1 to a 128bit
     # then we format it as a valid UUIDv5.

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.1".freeze
+  VERSION = "3.10.8".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-core
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.10.8
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-29 00:00:00.000000000 Z
+date: 2023-06-23 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