manageiq-smartstate 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ec94bdbd4d33105e0c1f05d411ad4455dc49318
-  data.tar.gz: a02ad229203f98d7cf0c52a01fdc4827ceb444ca
+  metadata.gz: b8ffe0ea7f752ee9698daddf1ebb4f78233e57f6
+  data.tar.gz: 516997461f598bc97ef96df4df1ade730edce39d
 SHA512:
-  metadata.gz: 412fb444df349b110a1d313ae88fa3862c136c6550e758533e34d6eb4bffa40393fa7346e64e31e3671b8ec53a54898a96f762740a338bc151c3f8fd5e62c8a1
-  data.tar.gz: ace0c8bd5f756282c00906260e4e6954b742c9a19710c6ab89e9e5bc24069afc3a7cd1761601b270458ea0e7bab094382c0b36226403af3c005598601b62736c
+  metadata.gz: 0e8c0e84ba2b336b6081d87dbbcf432f0deb831f4467d366aa4461fa9d1449255a175bd0a32e19446ef80ec5d570926adf8f1a43fbccdde849a7c8530d6cddae
+  data.tar.gz: cfe139450f783f6a4ced52ed9262e1c15d660ec4671ecea3cd9f2859a3a4ebd000fa3cc1226208d064395ca1c72522e0ea13381420c84cd363055acf9346d99a

data/Gemfile

@@ -4,7 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem "manageiq-gems-pending", :git => "https://github.com/ManageIQ/manageiq-gems-pending.git", :branch => "master"
-gem "manageiq-password",     :git => "https://github.com/ManageIQ/manageiq-password.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/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.2.15".freeze
+    VERSION = "0.2.16".freeze
   end
 end

data/lib/metadata/MIQExtract/MIQExtract.rb

@@ -36,12 +36,12 @@ class MIQExtract
       @target = filename
       @configFile = filename.respond_to?(:vmConfigFile) ? @target.vmConfigFile : nil
 
-      $log.info "MIQExtract using config file: [#{@configFile}]  settings: [#{MiqPassword.sanitize_string(ost.scanData.inspect)}]"
+      $log.info "MIQExtract using config file: [#{@configFile}]  settings: [#{ManageIQ::Password.sanitize_string(ost.scanData.inspect)}]"
     else
       @externalMount = false
       @configFile = filename.gsub(/^"/, "").gsub(/"$/, "")
 
-      $log.info "MIQExtract using config file: [#{@configFile}]  settings: [#{MiqPassword.sanitize_string(ost.scanData.inspect)}]"
+      $log.info "MIQExtract using config file: [#{@configFile}]  settings: [#{ManageIQ::Password.sanitize_string(ost.scanData.inspect)}]"
       ost.openParent = true if ost.scanData.fetch_path('snapshot', 'use_existing') == true
       ost.force = false if ost.scanData.fetch_path('snapshot', 'forceFleeceDefault') == false
       ost.snapshotDescription = ost.scanData.fetch_path('snapshot', 'description') if ost.scanData.fetch_path('snapshot', 'description')

data/lib/metadata/VMMount/VMPlatformMountLinux.rb

@@ -32,7 +32,7 @@ module VMPlatformMountLinux
     # TODO: passing the user name and password on the command line is BAD.
     #       Change this to use web-services.
     #
-    @cs = MiqPassword::Key.new
+    @cs = ManageIQ::Password::Key.new
     cmd = "#{VCBNAME} -h #{@ems['host']} -u #{@ems['user']} -p #{@cs.decrypt64(@ems['password'])} -s \"Name:#{@vmName}\" | grep \"moref:\""
     #
     # XXX Don't forget to remove this. We're logging the username and password, not good.

data/lib/metadata/VmConfig/VmConfig.rb

@@ -408,7 +408,7 @@ class VmConfig
 
       require 'VMwareWebService/miq_fault_tolerant_vim'
 
-      password_decrypt = MiqPassword.decrypt(ems_host['password'])
+      password_decrypt = ManageIQ::Password.decrypt(ems_host['password'])
       hostVim = MiqFaultTolerantVim.new(:ip => ems_host['host'], :user => ems_host['user'], :pass => password_decrypt, :use_broker => ems_host['use_vim_broker'], :vim_broker_drb_uri => ems_host['vim_broker_drb_uri'])
       $log.info "#{conn_reason}: Connection to [#{ems_display_text}] completed for VM:[#{vmCfgFile}] in [#{Time.now - st}] seconds"
       return hostVim
@@ -425,7 +425,7 @@ class VmConfig
     ems = host_vim_credentials
     return (filename) if ems.nil?
 
-    password_decrypt = MiqPassword.decrypt(ems['password'])
+    password_decrypt = ManageIQ::Password.decrypt(ems['password'])
     $log.debug "resolve_path_names: emsHost = #{ems['host']}, emsUser = #{ems['user']}" if $log
     vi = MiqVimInventory.new(ems['host'], ems['user'], password_decrypt)
     return getDsName(filename, vi)

data/manageiq-smartstate.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "binary_struct",      "~> 2.1"
   spec.add_dependency "iniparse"
   spec.add_dependency "linux_block_device", "~>0.2.1"
+  spec.add_dependency "manageiq-password",  "~>0.1.0"
   spec.add_dependency "memory_buffer",      ">=0.1.0"
   spec.add_dependency "rufus-lru",          "~>1.0.3"
   spec.add_dependency "sys-uname",          "~>1.0.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - ManageIQ Developers
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: manageiq-password
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: memory_buffer
   requirement: !ruby/object:Gem::Requirement