train-core 3.10.7 → 3.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d396bbb358c284289e040d532236fa26f2f92d73aa41dde56bf0b914a087238
-  data.tar.gz: e378a5a7c8af2cc8bcadc02abc1e99c310f73a182703edac027592074dfa8eba
+  metadata.gz: bd9123fc8c77d6d2913633bb544aae171f440d3a0558bacda3136fa62d856661
+  data.tar.gz: b8e558c2c7fa1479725228f1745ff5ed610f6975babc43cb07bbfb6289f41806
 SHA512:
-  metadata.gz: e37b9360ad1d5c206c700b770e41d552d0a864dfec0df63fde6201c7c842b3f45f9bcb0ffc2f4f6413b55d5354864eae87c1488c2c7dc31228ab9b39da5509e1
-  data.tar.gz: 699adc38633ac5c01a0de55baa35ed4bacf060efff95a7c05d6afb324fff206c4920e29151b0ed23fb1ee2b7b4b57352323654df19a1393c2f22eae6de18678e
+  metadata.gz: 0ed3576117bf704f08d0170e3f9c9d08e20da634300f02b986aaa8fb18094d0b027d9943bcc04043d986102e641ed7c09a4ed163ca6b9f8de1488d3063043721
+  data.tar.gz: deb114924bc9f537bb8a8c4df1f0b48936c8b7e081539109b886b4c26f994a6f96b214d514d2109ab75b526e2328473fb56f323e0746a28f8cf4cfce4df8e334

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

@@ -117,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
 
@@ -155,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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-core
 version: !ruby/object:Gem::Version
-  version: 3.10.7
+  version: 3.10.8
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-19 00:00:00.000000000 Z
+date: 2023-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable