manageiq-smartstate 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed6cdedaecb944396bb518edae782820b6321ebb
-  data.tar.gz: 99be3b80679cb30fa0130c25c22b01cd92638601
+  metadata.gz: 98576a595a6fc668bca6de56af398d52114fec83
+  data.tar.gz: 29fda5c203c4eebf2083449effe8ab4127d0ed17
 SHA512:
-  metadata.gz: 7f4f15e0ca102d88489d6966490b22f2ec8c7279b090a8dd3604c23f1b6843739aef1f99f985f17b59e4b2cf3b655af59301db5e27165083eefd1ad301cbbf9c
-  data.tar.gz: f2880d65ff4a68d41364fbf2c76fa37a3cc27a4ba807e92c8af4e1afe180f7ce1650c16b44e2d853ae762998a123761ec1e2cf5fb9982d9d082847c80105fea1
+  metadata.gz: e7e3bdb59eb6e3724ed430315f9451c5dae75f1cd1dfc988e5f20d0a3a36903402f7357e842a08ea7cfe8d3553d7491a4f6f2bd624b590e373b45423ef9c4e42
+  data.tar.gz: 3b9ae707377b267a8c803bb3f478eca4ea81736367ff684dfcfbe85012bc487aa411a5e2e009cbb5df473c38dfb05a62b33f090078067013f49b8d1532589680

data/.codeclimate.yml

@@ -26,6 +26,7 @@ engines:
       languages:
         ruby:
           mass_threshold: 25
+          count_threshold: 5
         javascript:
   eslint:
     enabled: false
@@ -39,6 +40,11 @@ engines:
   rubocop:
     enabled: true
     config: '.rubocop_cc.yml'
+checks:
+  method-complexity:
+    enabled: true
+    config:
+      threshold: 8
 prepare:
   fetch:
   - url: "https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_base.yml"

data/lib/VolumeManager/LVM/scanner.rb

@@ -5,59 +5,69 @@ module Lvm2Scanner
 
   LVM_ID_LEN          = 8
   LVM_TYPE_LEN        = 8
-  LVM_ID              = "LABELONE"
+  LVM_ID              = "LABELONE".freeze
 
   PV_ID_LEN           = 32
   MDA_MAGIC_LEN       = 16
-  FMTT_MAGIC          = "\040\114\126\115\062\040\170\133\065\101\045\162\060\116\052\076"
+  FMTT_MAGIC          = "\040\114\126\115\062\040\170\133\065\101\045\162\060\116\052\076".freeze
 
   #
   # On disk label header.
   #
-  LABEL_HEADER = BinaryStruct.new([
-    "A#{LVM_ID_LEN}",       'lvm_id',
-    'Q',                    'sector_xl',
-    'L',                    'crc_xl',
-    'L',                    'offset_xl',
-    "A#{LVM_TYPE_LEN}",     'lvm_type'
-  ])
+  LABEL_HEADER = BinaryStruct.new(
+    [
+      "A#{LVM_ID_LEN}",   'lvm_id',
+      'Q',                'sector_xl',
+      'L',                'crc_xl',
+      'L',                'offset_xl',
+      "A#{LVM_TYPE_LEN}", 'lvm_type'
+    ]
+  )
 
   #
   # On disk physical volume header.
   #
-  PV_HEADER = BinaryStruct.new([
-    "A#{PV_ID_LEN}",        'pv_uuid',
-    "Q",                    'device_size_xl'
-  ])
+  PV_HEADER = BinaryStruct.new(
+    [
+      "A#{PV_ID_LEN}", 'pv_uuid',
+      "Q",             'device_size_xl'
+    ]
+  )
 
   #
   # On disk disk location structure.
   #
-  DISK_LOCN = BinaryStruct.new([
-    "Q",                    'offset',
-    "Q",                    'size'
-  ])
+  DISK_LOCN = BinaryStruct.new(
+    [
+      "Q", 'offset',
+      "Q", 'size'
+    ]
+  )
 
   #
   # On disk metadata area header.
   #
-  MDA_HEADER = BinaryStruct.new([
-    "L",                    'checksum_xl',
-    "A#{MDA_MAGIC_LEN}",    'magic',
-    "L",                    'version',
-    "Q",                    'start',
-    "Q",                    'size'
-  ])
+  MDA_HEADER = BinaryStruct.new(
+    [
+      "L",                 'checksum_xl',
+      "A#{MDA_MAGIC_LEN}", 'magic',
+      "L",                 'version',
+      "Q",                 'start',
+      "Q",                 'size'
+    ]
+  )
 
   #
   # On disk raw location header, points to metadata.
   #
-  RAW_LOCN = BinaryStruct.new([
-    "Q",                    'offset',
-    "Q",                    'size',
-    "L",                    'checksum',
-    "L",                    'filler'
-  ])
+  RAW_LOCN = BinaryStruct.new(
+    [
+      "Q", 'offset',
+      "Q", 'size',
+      "L", 'checksum',
+      "L", 'filler'
+    ]
+  )
 
   #
   # Scan the physical volume for LVM headers.
@@ -91,7 +101,7 @@ module Lvm2Scanner
   def self.readLabel(d, s)
     d.seek(s * SECTOR_SIZE, IO::SEEK_SET)
     lh = readStruct(d, LABEL_HEADER)
-    return lh if lh.lvm_id == LVM_ID
+    return lh if lh&.lvm_id == LVM_ID
     nil
   end # def self.readLabel
 
@@ -152,5 +162,8 @@ module Lvm2Scanner
 
   def self.readStruct(d, struct)
     OpenStruct.new(struct.decode(d.read(struct.size)))
+  rescue StandardError => err
+    $log&.debug err.to_s
+    nil
   end # def self.readStruct
 end # module Lvm2Scanner

data/lib/disk/modules/AzureDiskCommon.rb

@@ -43,6 +43,7 @@ module AzureDiskCommon
   end
 
   def d_close_common
+    @managed_disk&.close
     return nil unless $log.debug?
     t1 = Time.now.to_i
     $log.debug("#{@my_class}: close(#{@disk_path})")
@@ -84,7 +85,7 @@ module AzureDiskCommon
       options[:date] = @snapshot if @snapshot
       ret = @storage_acct.get_blob_raw(@container, @blob, key, options)
     else
-      ret = @storage_disk_svc.get_blob_raw(@disk_name, @resource_group, options)
+      ret = managed_disk.read(options)
     end
 
     @reads += 1
@@ -96,4 +97,8 @@ module AzureDiskCommon
   def key
     @key ||= @storage_acct_svc.list_account_keys(@storage_acct.name, @storage_acct.resource_group).fetch('key1')
   end
+
+  def managed_disk
+    @managed_disk ||= @storage_disk_svc.open(@disk_name, @resource_group)
+  end
 end

data/lib/disk/modules/AzureManagedDisk.rb

@@ -48,7 +48,7 @@ module AzureManagedDisk
         :start_byte => 0,
         :length     => 1
       }
-      data = @storage_disk_svc.get_blob_raw(@disk_name, @resource_group, options)
+      data = managed_disk.read(options)
       data.headers
     end
   end

data/lib/fs/MiqFS/FsProbe.rb

@@ -25,13 +25,20 @@ module FsProbe
     partNum = dobj.partNum
 
     probes.each do |pmod|
-      $log.debug "MIQ(FsProbe-getFsMod) FS probe attempting [#{pmod}] for [#{fname}] [partition: #{partNum}]"
+      $log.debug("MIQ(FsProbe-getFsMod) FS probe attempting [#{pmod}] for [#{fname}] [partition: #{partNum}]")
+
       require_relative "modules/#{pmod}"
-      if Object.const_get(pmod).probe(dobj)
-        mod = pmod.chomp("Probe")
-        $log.info "MIQ(FsProbe-getFsMod) FS probe detected [#{mod}] for [#{fname}] [partition: #{partNum}]"
-        require_relative "modules/#{mod}"
-        return Object.const_get(mod)
+      begin
+        if Object.const_get(pmod).probe(dobj)
+          mod = pmod.chomp("Probe")
+          $log.info("MIQ(FsProbe-getFsMod) FS probe detected [#{mod}] for [#{fname}] [partition: #{partNum}]")
+          require_relative "modules/#{mod}"
+          return Object.const_get(mod)
+        end
+      rescue StandardError => err
+        $log.debug(err.to_s)
+        # continue to probe even when one probing fails.
+        next
       end
     end
     nil

data/lib/fs/MiqFS/modules/AUFSProbe.rb

@@ -7,18 +7,18 @@ module AUFSProbe
   AUFS_MAGIC_OFFSET = 52
   AUFS_MAGIC_SIZE   = 4
   AUFS_SUPER_MAGIC  = 0x12121313
-  AUFS_FSTYPE       = "aufs"
+  AUFS_FSTYPE       = "aufs".freeze
 
   def self.probe(dobj)
-    return(false) unless dobj.kind_of?(MiqDisk)
+    return false unless dobj.kind_of?(MiqDisk)
 
     # Check for aufs magic number or name at offset.
     dobj.seek(AUFS_SUPER_OFFSET + AUFS_MAGIC_OFFSET)
     buf = dobj.read(AUFS_MAGIC_SIZE)
-    isAufs = false
-    isAufs = true if buf.unpack('L')[0] == AUFS_SUPER_MAGIC
-    isAufs = true if buf == AUFS_FSTYPE
-    raise "AUFS is Not Supported" if isAufs
+    bs = buf&.unpack('L')
+    magic = bs.nil? ? nil : bs[0]
+
+    raise "AUFS is Not Supported" if magic == AUFS_SUPER_MAGIC || buf == AUFS_FSTYPE
 
     # No AUFS.
     false

data/lib/fs/MiqFS/modules/Ext3Probe.rb

@@ -2,24 +2,21 @@ require 'fs/ext3/superblock'
 
 module Ext3Probe
   def self.probe(dobj)
-    $log.debug("Ext3Probe >> dobj=#{dobj}") if $log
     unless dobj.kind_of?(MiqDisk)
-      $log.debug "Ext3Probe << FALSE because Disk Object class is not MiqDisk, but is '#{dobj.class}'" if $log
+      $log&.debug("Ext3Probe << FALSE because Disk Object class is not MiqDisk, but is '#{dobj.class}'")
       return false
     end
 
-    begin
-      dobj.seek(0, IO::SEEK_SET)
-      sb = Ext3::Superblock.new(dobj)
+    dobj.seek(0, IO::SEEK_SET)
+    Ext3::Superblock.new(dobj)
 
-      # If initializing the superblock does not throw any errors, then this is ext3
-      $log.debug("Ext3Probe << TRUE")
-      return true
-    rescue => err
-      $log.debug "Ext3Probe << FALSE because #{err.message}" if $log
-      return false
-    ensure
-      dobj.seek(0, IO::SEEK_SET)
-    end
+    # If initializing the superblock does not throw any errors, then this is ext3
+    $log&.debug("Ext3Probe << TRUE")
+    return true
+  rescue => err
+    $log&.debug("Ext3Probe << FALSE because #{err.message}")
+    return false
+  ensure
+    dobj.seek(0, IO::SEEK_SET)
   end
 end

data/lib/fs/MiqFS/modules/Ext4Probe.rb

@@ -2,24 +2,21 @@ require 'fs/ext4/superblock'
 
 module Ext4Probe
   def self.probe(dobj)
-    $log.debug("Ext4Probe >> dobj=#{dobj}") if $log
     unless dobj.kind_of?(MiqDisk)
-      $log.debug "Ext4Probe << FALSE because Disk Object class is not MiqDisk, but is '#{dobj.class}'" if $log
+      $log&.debug("Ext4Probe << FALSE because Disk Object class is not MiqDisk, but is '#{dobj.class}'")
       return false
     end
 
-    begin
-      dobj.seek(0, IO::SEEK_SET)
-      sb = Ext4::Superblock.new(dobj)
+    dobj.seek(0, IO::SEEK_SET)
+    Ext4::Superblock.new(dobj)
 
-      # If initializing the superblock does not throw any errors, then this is Ext4
-      $log.debug("Ext4Probe << TRUE")
-      return true
-    rescue => err
-      $log.debug "Ext4Probe << FALSE because #{err.message}" if $log
-      return false
-    ensure
-      dobj.seek(0, IO::SEEK_SET)
-    end
+    # If initializing the superblock does not throw any errors, then this is Ext4
+    $log&.debug("Ext4Probe << TRUE")
+    return true
+  rescue => err
+    $log&.debug("Ext4Probe << FALSE because #{err.message}")
+    return false
+  ensure
+    dobj.seek(0, IO::SEEK_SET)
   end
 end

data/lib/fs/MiqFS/modules/Fat32Probe.rb

@@ -1,8 +1,7 @@
 module Fat32Probe
   def self.probe(dobj)
-    $log.debug("Fat32Probe >> dobj=#{dobj}") if $log
     unless dobj.kind_of?(MiqDisk)
-      $log.debug "Fat32Probe << FALSE because Disk Object class is not MiqDisk, but is '#{dobj.class}'" if $log
+      $log&.debug "Fat32Probe << FALSE because Disk Object class is not MiqDisk, but is '#{dobj.class}'"
       return false
     end
 
@@ -11,13 +10,18 @@ module Fat32Probe
     bs = dobj.read(512)
 
     # Check byte 66 for 0x29 (extended signature).
-    if bs[66] != 0x29
-      $log.debug("Fat32Probe << FALSE because there is no extended signature") if $log
+    if bs.nil? || bs[66] != 0x29
+      $log&.debug("Fat32Probe << FALSE because there is no extended signature")
       return false
     end
 
     # Check file system label for 'FAT32   '
     # NOTE: This works for MS tools but maybe not for others.
+    if bs.length < 90
+      $log&.debug("Fat32Probe << FALSE because there is no filesystem label")
+      return false
+    end
+
     fslabel = bs[82, 8].unpack('a8')[0].strip
     fat32 = fslabel == 'FAT32'
     if $log

data/lib/fs/MiqFS/modules/HFSProbe.rb

@@ -9,7 +9,8 @@ module HFSProbe
 
     # Check for HFS signature in first int.
     dobj.seek(HFS_SUPER_OFFSET + HFS_MAGIC_OFFSET)
-    magic = dobj.read(HFS_MAGIC_SIZE).unpack('S')[0]
+    bs = dobj.read(HFS_MAGIC_SIZE)&.unpack('S')
+    magic = bs.nil? ? nil : bs[0]
     raise "HFS is Not Supported" if magic == HFS_SUPER_MAGIC
 
     # No HFS.

data/lib/fs/MiqFS/modules/Iso9660Probe.rb

@@ -2,7 +2,7 @@ module Iso9660Probe
   ISO9660FS_SUPER_OFFSET  = 32768
   ISO9660FS_MAGIC_OFFSET  = 1
   ISO9660FS_MAGIC_SIZE    = 5
-  ISO9660FS_MAGIC         = "CD001"
+  ISO9660FS_MAGIC         = "CD001".freeze
 
   def self.probe(dobj)
     return false unless dobj.kind_of?(MiqDisk)

data/lib/fs/MiqFS/modules/NTFSProbe.rb

@@ -1,14 +1,14 @@
 module NTFSProbe
   def self.probe(dobj)
-    $log.debug("NTFSProbe >> dobj=#{dobj}") if $log
     unless dobj.kind_of?(MiqDisk)
-      $log.debug "NTFSProbe << FALSE because Disk Object class is not MiqDisk, but is '#{dobj.class}'" if $log
+      $log&.debug "NTFSProbe << FALSE because Disk Object class is not MiqDisk, but is '#{dobj.class}'"
       return false
     end
 
     # Check for oem name = NTFS.
     dobj.seek(3)
-    oem = dobj.read(8).unpack('a8')[0].strip
+    bs = dobj.read(8)&.unpack('a8')
+    oem = bs[0].strip if bs
 
     ntfs = oem == 'NTFS'
     if $log

data/lib/fs/MiqFS/modules/ReFSProbe.rb

@@ -1,12 +1,11 @@
 module ReFSProbe
-  FS_SIGNATURE  = [0x00, 0x00, 0x00, 0x52, 0x65, 0x46, 0x53, 0x00] # ...ReFS.
+  FS_SIGNATURE = [0x00, 0x00, 0x00, 0x52, 0x65, 0x46, 0x53, 0x00].freeze # ...ReFS.
 
   def self.probe(dobj)
-    $log.debug "ReFSProbe >> dobj=#{dobj}"  if $log
-    return false  unless dobj.kind_of?(MiqDisk)
+    return false unless dobj.kind_of?(MiqDisk)
 
     dobj.seek(0, IO::SEEK_SET)
-    magic = dobj.read(FS_SIGNATURE.size).unpack('C*')
+    magic = dobj.read(FS_SIGNATURE.size)&.unpack('C*')
 
     # Check for ReFS signature
     raise "ReFS is Not Supported" if magic == FS_SIGNATURE

data/lib/fs/MiqFS/modules/RealFSProbe.rb

@@ -1,6 +1,6 @@
 module RealFSProbe
   def self.probe(dobj)
     return(true) if dobj.to_s == "test_disk"
-    (false)
+    false
   end
 end

data/lib/fs/MiqFS/modules/Reiser4Probe.rb

@@ -2,14 +2,14 @@ module Reiser4Probe
   REISER4_MASTER_OFFSET = 65536
   REISER4_MAGIC_OFFSET  = REISER4_MASTER_OFFSET
   REISER4_MAGIC_SIZE    = 10
-  REISER4_MAGIC         = "ReIsEr4"
+  REISER4_MAGIC         = "ReIsEr4".freeze
 
   def self.probe(dobj)
     return(false) unless dobj.kind_of?(MiqDisk)
 
     # Assume Reiser4 - read magic at offset.
     dobj.seek(REISER4_MAGIC_OFFSET)
-    magic = dobj.read(REISER4_MAGIC_SIZE).strip
+    magic = dobj.read(REISER4_MAGIC_SIZE)&.strip
     raise "Reiser4 is Not Supported" if magic == REISER4_MAGIC
 
     # No Reiser4.

data/lib/fs/MiqFS/modules/ReiserFSProbe.rb

@@ -1,19 +1,17 @@
 module ReiserFSProbe
   REISERFS_DISK_OFFSET_NEW = 64 * 1024
-  REISERFS_DISK_OFFSET_OLD =  8 * 1024
+  REISERFS_DISK_OFFSET_OLD = 8 * 1024
 
   REISERFS_SUPER_SIZE   = 204
 
   REISERFS_MAGIC_OFFSET = 52
   REISERFS_MAGIC_SIZE   = 10
 
-  REISERFS_MAGIC1 = "ReIsErFs"
-  REISERFS_MAGIC2 = "ReIsEr2Fs"
-  REISERFS_MAGIC3 = "ReIsEr3Fs"
+  REISERFS_MAGIC1 = "ReIsErFs".freeze
+  REISERFS_MAGIC2 = "ReIsEr2Fs".freeze
+  REISERFS_MAGIC3 = "ReIsEr3Fs".freeze
 
   def self.probe(dobj)
-    return false unless dobj.kind_of?(MiqDisk)
-
     return true if ReiserFSProbe.isMagic?(ReiserFSProbe.getMagic(dobj, REISERFS_DISK_OFFSET_NEW))
     return true if ReiserFSProbe.isMagic?(ReiserFSProbe.getMagic(dobj, REISERFS_DISK_OFFSET_OLD))
 
@@ -22,6 +20,8 @@ module ReiserFSProbe
   end
 
   def self.getMagic(dobj, offset)
+    return false unless dobj.kind_of?(MiqDisk)
+
     # Assume ReiserFS - read superblock at desired offset.
     dobj.seek(offset) # new disk start offset.
     sb = dobj.read(REISERFS_SUPER_SIZE)

data/lib/fs/MiqFS/modules/UnionFSProbe.rb

@@ -9,7 +9,7 @@ module UnionFSProbe
 
     # Assume UnionFS - read magic at offset.
     dobj.seek(UNIONFS_SUPER_OFFSET + UNIONFS_MAGIC_OFFSET)
-    magic = dobj.read(UNIONFS_MAGIC_SIZE).unpack('L')
+    magic = dobj.read(UNIONFS_MAGIC_SIZE)&.unpack('L')
     raise "UnionFS is Not Supported" if magic == UNIONFS_MAGIC
 
     # No UnionFS.

data/lib/fs/MiqFS/modules/XFSProbe.rb

@@ -2,25 +2,22 @@ require 'fs/xfs/superblock'
 
 module XFSProbe
   def self.probe(dobj)
-    $log.debug("XFSProbe >> dobj=#{dobj}") if $log
     unless dobj.kind_of?(MiqDisk)
-      $log.debug "XFSProbe << FALSE because Disk Object class is not MiqDisk, but is '#{dobj.class}'" if $log
+      $log&.debug("XFSProbe << FALSE because Disk Object class is not MiqDisk, but is '#{dobj.class}'")
       return false
     end
 
-    begin
-      # The first Allocation Group's Superblock is at block zero.
-      dobj.seek(0, IO::SEEK_SET)
-      XFS::Superblock.new(dobj)
+    # The first Allocation Group's Superblock is at block zero.
+    dobj.seek(0, IO::SEEK_SET)
+    XFS::Superblock.new(dobj)
 
-      # If initializing the superblock does not throw any errors, then this is XFS
-      $log.debug("XFSProbe << TRUE")
-      return true
-    rescue => err
-      $log.debug "XFSProbe << FALSE because #{err.message}" if $log
-      return false
-    ensure
-      dobj.seek(0, IO::SEEK_SET)
-    end
+    # If initializing the superblock does not throw any errors, then this is XFS
+    $log&.debug("XFSProbe << TRUE")
+    return true
+  rescue => err
+    $log&.debug("XFSProbe << FALSE because #{err.message}")
+    return false
+  ensure
+    dobj.seek(0, IO::SEEK_SET)
   end
 end

data/lib/fs/MiqFS/modules/ZFSProbe.rb

@@ -9,7 +9,8 @@ module ZFSProbe
 
     # Check for magic at uberblock offset.
     dobj.seek(ZFS_SUPER_OFFSET + ZFS_MAGIC_OFFSET)
-    magic = dobj.read(ZFS_MAGIC_SIZE).unpack('L')[0]
+    bs = dobj.read(ZFS_MAGIC_SIZE)&.unpack('L')
+    magic = bs.nil? ? nil : bs[0]
     raise "ZFS is Not Supported" if magic == ZFS_SUPER_MAGIC
 
     # No ZFS.

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.2.6".freeze
+    VERSION = "0.2.7".freeze
   end
 end

data/manageiq-smartstate.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "azure-armrest",      "~> 0.9"
+  spec.add_dependency "azure-armrest",      "~> 0.9.5"
   spec.add_dependency "binary_struct",      "~> 2.1"
   spec.add_dependency "iniparse"
   spec.add_dependency "linux_block_device", "~>0.2.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: binary_struct
   requirement: !ruby/object:Gem::Requirement