Merge branch 'main' of github.com:inspec/train into feature/CHEF-2414-warn-azure-deprecation

Author: sathish-progress

CHANGELOG.md

@@ -5,6 +5,12 @@
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v3.10.8](https://github.com/inspec/train/tree/v3.10.8) (2023-06-23)
+
+#### Merged Pull Requests
+- Fix cannot find a UUID when connect using train with local transport inside docker container [#747](https://github.com/inspec/train/pull/747) ([Vasu1105](https://github.com/Vasu1105))
+<!-- latest_stable_release -->
+
 ## [v3.10.7](https://github.com/inspec/train/tree/v3.10.7) (2022-10-19)
 
 #### Merged Pull Requests
@@ -14,7 +20,6 @@
 - Fix Cisco Nexus version detection [#737](https://github.com/inspec/train/pull/737) ([trickyearlobe](https://github.com/trickyearlobe))
 - Update net-ssh requirement from &gt;= 2.9, &lt; 7.0 to &gt;= 2.9, &lt; 8.0 [#733](https://github.com/inspec/train/pull/733) ([dependabot[bot]](https://github.com/dependabot[bot]))
 - Allow net-scp 4.0.0 [#739](https://github.com/inspec/train/pull/739) ([clintoncwolfe](https://github.com/clintoncwolfe))
-<!-- latest_stable_release -->
 
 ## [v3.10.1](https://github.com/inspec/train/tree/v3.10.1) (2022-06-29)
 

VERSION

@@ -1 +1 @@
-3.10.7
+3.10.8

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

@@ -117,6 +117,7 @@ def unix_uuid
       (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
 
@@ -155,6 +156,28 @@ def uuid_from_command
       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.

lib/train/version.rb

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