Merge pull request #20631 from Fryguy/legacy_miq_password

Prefer ManageIQ::Password over legacy MiqPassword constant
ManageIQ · Sep 30, 2020 · bf28fa0 · bf28fa0
2 parents 8b0ce63 + 938bfc3
commit bf28fa0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/models/miq_queue.rb b/app/models/miq_queue.rb
@@ -649,7 +649,7 @@ def self.messaging_client_options
     (messaging_options_from_env || messaging_options_from_file)&.merge(
       :encoding => "json",
       :protocol => messaging_protocol,
-    )&.tap { |h| h[:password] = MiqPassword.try_decrypt(h.delete(:password)) }
+    )&.tap { |h| h[:password] = ManageIQ::Password.try_decrypt(h.delete(:password)) }
   end
   private_class_method :messaging_client_options
 

diff --git a/app/models/mixins/verify_credentials_mixin.rb b/app/models/mixins/verify_credentials_mixin.rb
@@ -63,7 +63,7 @@ def encrypt_verify_credential_params!(options)
       DDF.traverse(params_for_create) do |field|
         key_path = field[:name].try(:split, '.')
         if options.key_path?(key_path) && field[:type] == 'password'
-          options.store_path(key_path, MiqPassword.try_encrypt(options.fetch_path(key_path)))
+          options.store_path(key_path, ManageIQ::Password.try_encrypt(options.fetch_path(key_path)))
         end
       end
     end

diff --git a/spec/models/miq_queue_spec.rb b/spec/models/miq_queue_spec.rb
@@ -1008,7 +1008,7 @@ def queue_items
         end
 
         it "with encrypted password" do
-          stub_const("ENV", env_vars.to_h.merge("MESSAGING_PASSWORD" => MiqPassword.encrypt("password")))
+          stub_const("ENV", env_vars.to_h.merge("MESSAGING_PASSWORD" => ManageIQ::Password.encrypt("password")))
 
           expect(YAML).not_to receive(:load_file).with(MiqQueue::MESSAGING_CONFIG_FILE)
 
@@ -1058,7 +1058,7 @@ def queue_items
 
       it "with encrypted password" do
         allow(YAML).to receive(:load_file).and_call_original
-        expect(YAML).to receive(:load_file).with(MiqQueue::MESSAGING_CONFIG_FILE).and_return("test" => {"hostname" => "kafka.example.com", "port" => 9092, "username" => "user", "password" => MiqPassword.encrypt("password")})
+        expect(YAML).to receive(:load_file).with(MiqQueue::MESSAGING_CONFIG_FILE).and_return("test" => {"hostname" => "kafka.example.com", "port" => 9092, "username" => "user", "password" => ManageIQ::Password.encrypt("password")})
 
         expect(MiqQueue.send(:messaging_client_options)).to eq(
           :encoding => "json",