Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Host verify_credentials_task password expectation #1271

Merged
merged 1 commit into from
Oct 2, 2024

Conversation

agrare
Copy link
Member

@agrare agrare commented Oct 2, 2024

The password is encrypted on the queue so we have to update our expectations in this test.

The password is encrypted on the queue so we have to update our
expectations in this test.
@Fryguy Fryguy self-assigned this Oct 2, 2024
@Fryguy Fryguy closed this Oct 2, 2024
@Fryguy Fryguy reopened this Oct 2, 2024
@Fryguy Fryguy merged commit e83ac86 into ManageIQ:master Oct 2, 2024
4 of 6 checks passed
@Fryguy
Copy link
Member

Fryguy commented Oct 2, 2024

@agrare A conflict occurred during the backport of this pull request to quinteros.

If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the quinteros branch in order to resolve this.

Conflict details:

diff --cc spec/requests/hosts_spec.rb
index 26f1eec1,36fe4e23..00000000
--- a/spec/requests/hosts_spec.rb
+++ b/spec/requests/hosts_spec.rb
@@@ -174,10 -125,9 +174,16 @@@ RSpec.describe "hosts API" d
        api_basic_authorize action_identifier(:hosts, :edit)
  
        verify_options = {
++<<<<<<< HEAD
 +        :credentials   => {
 +          "default" => {:userid => "root", :password => "abc123"}
 +        },
 +        :remember_host => true
++=======
+         "authentications" => {
+           "default" => {"userid" => "root", "password" => ManageIQ::Password.encrypt("abc123")}
+         }
++>>>>>>> e83ac860 (Merge pull request #1271 from agrare/fix_hosts_verify_credentials_task)
        }
  
        api_options = {

@Fryguy
Copy link
Member

Fryguy commented Oct 2, 2024

@agrare The remember_host bit is different as well as the main key (credentials vs authetications)

@agrare agrare deleted the fix_hosts_verify_credentials_task branch October 2, 2024 21:52
agrare pushed a commit to agrare/manageiq-api that referenced this pull request Oct 2, 2024
…ials_task

Fix Host verify_credentials_task password expectation

(cherry picked from commit e83ac86)
@Fryguy
Copy link
Member

Fryguy commented Oct 8, 2024

Backported to radjabov in commit 6c1f362.

commit 6c1f3628a399dc20cb8ff782cd95081f20446912
Author: Jason Frey <[email protected]>
Date:   Wed Oct 2 17:49:02 2024 -0400

    Merge pull request #1271 from agrare/fix_hosts_verify_credentials_task
    
    Fix Host verify_credentials_task password expectation
    
    (cherry picked from commit e83ac86008e00d7c6f68c5fc1d0db5f26d4425d1)

Fryguy added a commit that referenced this pull request Oct 8, 2024
Fix Host verify_credentials_task password expectation

(cherry picked from commit e83ac86)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants