manageiq-smartstate 0.3.10 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d279efbb6413424193473e6d2139818d1afb189
-  data.tar.gz: 732bdf1ffae2c46876c93a3cc66b56fcb9478b4e
+  metadata.gz: d63431a0219ca739a68bc15b1c5856beeb3a08a5
+  data.tar.gz: b16b3f96b811e2d3cb75d0991a19b2dee837ec70
 SHA512:
-  metadata.gz: 8617444550ba063368dba0d683a7bddfac1e861bc52ffb866e16206b5f57239d76502a850a73aef07fe0bd94f2e2a94f34d7dba307acb665f2dc3ddfd03f0012
-  data.tar.gz: 7f3967e4f1fec3c427e22a371849f3ba2c0e05e94c4899eba1fbc70a00cba98bec315fe8a8788f29b6ed1188b9e0b26f3ecfaa8d0b6630eb13f8d72f4c3224b7
+  metadata.gz: '08d5cc7d71aea21a889af06207aff8df129a2f8917efc8cf7fe67b47e7ecf5cb7214ab91c274ec1a7fb16a2bbec6c42681715121e5a5c7b60c0f41faf269aca5'
+  data.tar.gz: c8222c9952bae19d739975849261812f9aebc29f7728c1a4d641cac30577feede0cd422bc5e2ba1a5a15b0315d0183376f75b0711942e3eadd550ca7a83672a2

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in manageiq-smartstate.gemspec
 gemspec
 
-gem "manageiq-gems-pending", :git => "https://github.com/ManageIQ/manageiq-gems-pending.git", :branch => "ivanchuk"
+gem "manageiq-gems-pending", :git => "https://github.com/ManageIQ/manageiq-gems-pending.git", :branch => "master"
 
 # Modified gems for vmware_web_service.  Setting sources here since they are git references
 gem "handsoap", "~>0.2.5", :require => false, :git => "https://github.com/ManageIQ/handsoap.git", :tag => "v0.2.5-5"

data/lib/MiqVm/MiqRhevmVm.rb

@@ -42,7 +42,7 @@ class MiqRhevmVm < MiqVm
     disks = @rhevm.collect_vm_disks(@rhevmVm)
     disks.each_with_index do |disk, idx|
       $log.debug "MiqRhevmVm#getCfg: disk = #{disk.inspect}"
-      storage_domain = disk.storage_domains&.first
+      storage_domain = disk.storage_domains.first
       if storage_domain.nil?
         $log.info("Disk <#{disk.name}> is skipped due to unassigned storage domain")
         next

data/lib/fs/modules/LinuxMount.rb

@@ -309,27 +309,23 @@ module LinuxMount
     #
     components.each do |c|
       ncp = File.join(cp, c)
-      cp = follow_all_symlinks(ncp)
-    end
-    cp
-  end
-
-  def follow_all_symlinks(link_ptr)
-    #
-    # Each filesystem knows how to check for,
-    # and read its own links.
-    #
-    no_more_links = false
-    until no_more_links
-      filesys, tmp_link_ptr = getFsPathBase(link_ptr)
-      if filesys.fileSymLink?(tmp_link_ptr)
-        symlink = getSymLink(filesys, tmp_link_ptr)
-        link_ptr = symlink[0, 1] == '/' ? symlink : File.join(File.dirname(link_ptr), symlink)
+      #
+      # Each file system know how to check for,
+      # and read its own links.
+      #
+      fs, lp = getFsPathBase(ncp)
+      if fs.fileSymLink?(lp)
+        sl = getSymLink(fs, lp)
+        if sl[0, 1] == '/'
+          cp = sl
+        else
+          cp = File.join(cp, sl)
+        end
       else
-        no_more_links = true
+        cp = ncp
       end
     end
-    link_ptr
+    (cp)
   end
 
   def getSymLink(fs, p)

data/lib/fs/ntfs/data_run.rb

@@ -282,7 +282,7 @@ module NTFS
 
       @runSpec.each_slice(2) do |lcn, len|
         total_clusters += len
-        next unless lcn && len && total_clusters > start_vcn
+        next unless total_clusters > start_vcn
 
         start = lcn + (vcn - (total_clusters - len))
         count = len - (start - lcn)

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.3.10".freeze
+    VERSION = "0.4.0".freeze
   end
 end

data/lib/metadata/VmConfig/VmConfig.rb

@@ -498,7 +498,7 @@ class VmConfig
   end
 
   def rhevm_disk_file_entry(disk)
-    storage_id = disk.storage_domains&.first&.id
+    storage_id = disk.storage_domains.first&.id
     disk_id = disk.image_id || disk.id
     full_path = storage_id && File.join('/dev', storage_id, disk_id)
     {:path => full_path, :name => disk_id, :size => disk.actual_size.to_i}
@@ -550,7 +550,7 @@ class VmConfig
         elsif miqvm.rhevmVm
           disks = miqvm.rhevm.collect_vm_disks(miqvm.rhevmVm)
           disks.each do |disk|
-            storage_id = disk.storage_domains&.first&.id
+            storage_id = disk.storage_domains.first&.id
             disk_id = disk.image_id || disk.id
             full_path = storage_id && File.join('/dev', storage_id, disk_id)
             d = {:path => full_path, :name => disk.name.to_s, :size => disk.actual_size.to_i}

data/lib/metadata/linux/LinuxPackages.rb

@@ -175,7 +175,7 @@ module MiqLinux
       pkgs = doc.add_element 'applications'
       @packages.each do |p|
         next unless p.installed
-        pkgs.add_element('application', {"name" => p.name, "version" => p.version, "description" => p.description, "typename" => p.category, "arch" => p.arch, "release" => p.release, "install_time" => p.installtime})
+        pkgs.add_element('application', {"name" => p.name, "version" => p.version, "description" => p.description, "typename" => p.category, "arch" => p.arch, "release" => p.release, "install_time" => p.installtime, "build_time" => p.buildtime, "url" => p.url})
         # "status" => p.status, "depends" => p.depends
       end
       doc

data/lib/metadata/linux/MiqRpmPackages.rb

@@ -22,9 +22,11 @@ class MiqRpmPackages
   RELEASE     = 1002
   SUMMARY     = 1004
   DESCRIPTION = 1005
+  BUILDTIME   = 1006
   INSTALLTIME = 1008
   VENDOR      = 1011
   GROUP       = 1016
+  URL         = 1020
   ARCH        = 1022
   REQUIRES    = 1049
 
@@ -34,9 +36,11 @@ class MiqRpmPackages
     1002 => "release",
     1004 => "summary",
     1005 => "description",
+    1006 => "buildtime",
     1008 => "installtime",
     1011 => "vendor",
     1016 => "category",  # group
+    1020 => "url",
     1022 => "arch",
     1049 => "depends",   # requires
   }
@@ -101,7 +105,7 @@ class MiqRpmPackages
   private
 
   def time_tag?(tag)
-    tag == "installtime"
+    ['installtime', 'buildtime'].include?(tag)
   end
 
   def convert(tag, val)
@@ -148,6 +152,7 @@ if __FILE__ == $0
   rpmPkgs.each do |pkg|
     puts "Package: #{pkg.name}"
     puts "\tInstall Time: #{pkg.installtime}"
+    puts "\tBuild Time: #{pkg.buildtime}"
     puts "\tVersion: #{pkg.version}"
     puts "\tRelease: #{pkg.release}"
     puts "\tSummary: #{pkg.summary}"
@@ -155,6 +160,7 @@ if __FILE__ == $0
     puts "\tArchitecture: #{pkg.arch}"
     puts "\tCategory: #{pkg.category}"
     puts "\tDescription: #{pkg.description}"
+    puts "\tURL: #{pkg.url}"
     puts "\tDepends: #{pkg.depends}"
   end
 end

data/lib/metadata/util/md5deep.rb

@@ -1,7 +1,6 @@
 require 'time'
 require 'metadata/util/win32/peheader'
 require 'metadata/util/win32/versioninfo'
-require 'metadata/util/find_class_methods'
 require 'util/miq-xml'
 require 'ostruct'
 require 'util/miq-encode'
@@ -55,35 +54,29 @@ class MD5deep
   def scan_glob(filename)
     filename.tr!("\\", "/")
     startDir = File.dirname(filename)
+    globPattern = File.basename(filename)
     @xml.root.add_attribute("base_path", startDir)
-    path_prefix = startDir[0, 2]
-    @drive_letter = path_prefix.match?(/^\w\:/) ? path_prefix : ""
+    @fs.chdir(startDir)
 
     # First check if we are passed a fully qualifed file name
     if @fs.fileExists?(filename)
-      base_file = File.basename(filename)
-      isDir?(filename) ? process_dir_as_file(startDir, base_file, @xml.root) : processFile(startDir, base_file, @xml.root)
+      isDir?(filename) ? process_dir_as_file(startDir, globPattern, @xml.root) : processFile(startDir, globPattern, @xml.root)
     else
       # If the file is not found then process the data as a glob pattern.
-      process_each_glob_file(filename)
+      @fs.dirGlob(globPattern) do |f|
+        # $log.info "Glob file found: [#{f}]"
+        # Passing "startDir" as the first parameter is a work-around for issues
+        # when scanning Win VMs from Linux where the path returned from dirGlob
+        # do not include the drive letter.
+        # Below is the original line
+        # processFile(File.dirname(f), File.basename(f), @xml.root)
+        processFile(startDir, File.basename(f), @xml.root)
+      end
     end
     @xml
   end
 
-  def process_each_glob_file(file_name)
-    FindClassMethods.glob(file_name, @fs) do |f|
-      # Passing "startDir" as the first parameter is a work-around for issues
-      # when scanning Win VMs from Linux where the path returned from dirGlob
-      # do not include the drive letter.
-      processFile(File.dirname(f), File.basename(f), @xml.root)
-    end
-  rescue => err
-    $log.error "process_each_glob_file: Exception #{err} rescued"
-    $log.debug err.backtrace.join("\n")
-  end
-
   def read_fs(path, xmlNode)
-    @drive_letter = @drive_letter.nil? ? "" : @drive_letter
     if @fs
       @fs.dirForeach(path)  { |x| processFile(path, x, xmlNode) }
       @fs.dirForeach(path)  { |x| processDir(path,  x, xmlNode) }
@@ -98,7 +91,7 @@ class MD5deep
 
   def processDir(path, x, xmlNode)
     if x != "." && x != ".."
-      currFile = File.join(@drive_letter, path, x)
+      currFile = File.join(path, x)
 
       begin
         if File.directory?(currFile)
@@ -117,7 +110,7 @@ class MD5deep
 
   def process_dir_as_file(path, x, xml_node)
     if x != "." && x != ".."
-      curr_dir = File.join(@drive_letter, path, x)
+      curr_dir = File.join(path, x)
       if isDir?(curr_dir)
         xml_file_node = xml_node.add_element("file", "name" => x, "fqname" => curr_dir)
         stat_hash = {}
@@ -129,43 +122,39 @@ class MD5deep
 
   def processFile(path, x, xmlNode)
     if (@opts.exclude.include?(x) == false) && x[0..0] != "$"
-      currFile = File.join(@drive_letter, path, x)
+      currFile = File.join(path, x)
 
       begin
         #       unless File.directory?(currFile) then
-        return if isDir?(currFile)
-
-        # File we have an exclusion list and the current file is in it, skip to the next file
-        @fullFileCount += 1
-        fh = fileOpen(currFile)
-
-        xmlFileNode = xmlNode.add_element("file", "name" => x, "fqname" => currFile)
-        statHash = {}
-        statHash.merge!(getFileStats(fh))
-        statHash.merge!(calculate_digest(fh))
-        xmlFileNode.add_attributes(statHash)
-
-        ext = File.extname(currFile).downcase
-        if @opts.winVerList.include?(ext)
-          pe_hdr = PEheader.new(fh) rescue nil
-          process_pe_header(pe_hdr, xmlFileNode) unless pe_hdr.nil?
+        unless isDir?(currFile)
+          # File we have an exclusion list and the current file is in it, skip to the next file
+          @fullFileCount += 1
+          fh = fileOpen(currFile)
+
+          xmlFileNode = xmlNode.add_element("file", "name" => x, "fqname" => currFile)
+          statHash = {}
+          statHash.merge!(getFileStats(fh))
+          statHash.merge!(calculate_digest(fh))
+          xmlFileNode.add_attributes(statHash)
+
+          ext = File.extname(currFile).downcase
+          if @opts.winVerList.include?(ext)
+            if @opts.versioninfo || @opts.imports
+              peHdr = PEheader.new(fh) rescue nil
+              unless peHdr.nil?
+                xmlFileNode.add_element("versioninfo", peHdr.versioninfo) if @opts.versioninfo && !peHdr.versioninfo.blank?
+                xmlFileNode.add_element("libraries", "imports" => peHdr.getImportList) if @opts.imports && !peHdr.imports.blank?
+              end
+            end
+          end
+
+          getFileContents(fh, xmlFileNode) if @opts.contents == true
+          fh.close
         end
-
-        getFileContents(fh, xmlFileNode) if @opts.contents == true
-        fh.close
       rescue Errno::EACCES, RuntimeError, SystemCallError
         fh.close if fh.kind_of?(File) && !fh.closed?
       end
     end
-    $log.debug "processFile: finished @xml is #{@xml}"
-  end
-
-  def process_pe_header(pe_hdr, xml_file_node)
-    xml_file_node.add_element("versioninfo", pe_hdr.versioninfo) if @opts.versioninfo && pe_hdr.versioninfo.present?
-    xml_file_node.add_element("libraries", "imports" => pe_hdr.getImportList) if @opts.imports && pe_hdr.imports.present?
-  rescue TypeError => err
-    $log.info "process_pe_header: TypeError handling PEheader; skipping PEheader info"
-    $log.debug err.backtrace.join("\n")
   end
 
   def isDir?(currFile)
@@ -226,15 +215,10 @@ class MD5deep
       # Create hash for requested digests
       digest = create_digest_hash
 
-      begin
-        fileName.seek(0, IO::SEEK_SET)
-        # Loop over each digest and add the file contents
-        while (buf = fileName.read(10_240_000))
-          digest.each_pair { |_k, v| v << buf }
-        end
-      rescue => err
-        $log.error "Error #{err} reading file to calculate digest"
-        $log.debug err.backtrace.join("\n")
+      fileName.seek(0, IO::SEEK_SET)
+      # Loop over each digest and add the file contents
+      while buf = fileName.read(10240000)
+        digest.each_pair { |_k, v| v << buf }
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest
@@ -525,7 +525,6 @@ files:
 - lib/metadata/linux/MiqConaryPackages.rb
 - lib/metadata/linux/MiqRpmPackages.rb
 - lib/metadata/util/event_log_filter.rb
-- lib/metadata/util/find_class_methods.rb
 - lib/metadata/util/md5deep.rb
 - lib/metadata/util/win32/Win32Accounts.rb
 - lib/metadata/util/win32/Win32EventLog.rb

data/lib/metadata/util/find_class_methods.rb

@@ -1,133 +0,0 @@
-module FindClassMethods
-  # Return directory entries matching specified glob pattern
-  #
-  # @param glob_pattern [String] pattern to match
-  # @param flags [Integer] file match flags
-  # @yield block invoked with each match if specified
-  #
-  # @see VfsRealFile.fnmatch
-  # @see FindClassMethods#dir_and_glob which does most of the work regarding globbing
-  # @see FindClassMethods#find which retrieves stats information & dir entries for found files
-  #
-  def self.glob(glob_pattern, filesys, flags = 0)
-    @fs = filesys
-    return [] unless (glob = dir_and_glob(glob_pattern))
-
-    ra = []
-    find(@search_path, glob_depth(glob)) do |p|
-      if (p = check_file(p, glob, flags))
-        block_given? ? yield(p) : ra << p
-      end
-    end
-    ra.sort_by(&:downcase)
-  end
-
-  #
-  # Determine if the file returned from "find" will be used or skipped.
-  #
-  def self.check_file(file, glob, flags)
-    return nil if file == @search_path
-
-    if @search_path == File::SEPARATOR
-      file.sub!(File::SEPARATOR, "")
-    else
-      file.sub!("#{@search_path}#{File::SEPARATOR}", "")
-    end
-
-    return nil if file == "" || !File.fnmatch(glob, file, flags)
-
-    @specified_path ? File.join(@specified_path, file) : file
-  end
-
-  #
-  # Modified version of Find.find:
-  # - Accepts only a single path.
-  # - Can be restricted by depth - optimization for glob searches.
-  #
-  # @param path [String] starting directory of the find
-  # @param max_depth [Integer] max number of levels to decend befroelookup
-  # @yield files found
-  #
-  def self.find(path, max_depth = nil)
-    block_given? || (return enum_for(__method__, path, max_depth))
-
-    depths = [0]
-    paths  = [path.dup]
-
-    while (file = paths.shift)
-      depth = depths.shift
-      yield file.dup.taint
-      next if max_depth && depth + 1 > max_depth
-
-      get_dir_entries(file).each do |f|
-        f = File.join(file, f)
-        paths.unshift f.untaint
-        depths.unshift depth + 1
-      end
-    end
-  end
-
-  def self.get_dir_entries(directory)
-    return [] unless @fs.fileExists?(directory) && @fs.fileDirectory?(directory)
-
-    files = @fs.dirEntries(directory)
-    files -= [".", ".."]
-    files.sort!
-    files.reverse_each
-  rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG
-    $log.info "find: while-loop @fs.dirEntries #{directory} returned an error"
-    []
-  end
-
-  GLOB_CHARS = '*?[{'.freeze
-  def self.glob_str?(str)
-    str.gsub(/\\./, "X").count(GLOB_CHARS) != 0
-  end
-
-  # Returns files matching glob pattern
-  #
-  # @api private
-  # @param glob_pattern [String,Regex] pattern to search for
-  # @return [String] paths to files found
-  #
-  def self.dir_and_glob(glob_pattern)
-    stripped_path   = glob_pattern.sub(/^[a-zA-Z]:/, "")
-    glob_path       = Pathname.new(stripped_path)
-    @search_path    = File::SEPARATOR
-    @specified_path = File::SEPARATOR
-
-    unless glob_path.absolute?
-      @search_path    = Dir.getwd
-      @specified_path = nil
-    end
-
-    components   = path_components(glob_path)
-    @search_path = File.expand_path(@search_path, "/")
-    @fs.fileExists?(@search_path) ? File.join(components) : nil
-  end
-
-  def self.path_components(glob_path, search_path = @search_path)
-    components = glob_path.each_filename.to_a
-    while (comp = components.shift)
-      if glob_str?(comp)
-        components.unshift(comp)
-        break
-      end
-      @search_path = File.join(search_path, comp)
-      @specified_path = @specified_path ? File.join(@specified_path, comp) : comp
-    end
-    components
-  end
-
-  # Return max levels which glob pattern may resolve to
-  #
-  # @api private
-  # @param glob_pattern [String,Regex] pattern to search for
-  # @return [Integer] max levels which pattern may match
-  def self.glob_depth(glob_pattern)
-    path_components = Pathname(glob_pattern).each_filename.to_a
-    return nil if path_components.include?('**')
-
-    path_components.length
-  end
-end