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

NAS-134046 / 25.04-RC.1 / Auth error in Export Key is not properly handled (by undsoft) #11515

Merged
merged 2 commits into from
Feb 7, 2025

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Feb 7, 2025

Automatic cherry-pick failed. Please resolve conflicts by running:

git reset --hard HEAD~1
git cherry-pick -x 8edfb86108554a9fceffda9166dac64c8d45d9ba
git cherry-pick -x 6066f1cda13dd70c81e29b5bbbb6edec4e3446b9

If the original PR was merged via a squash, you can just cherry-pick the squashed commit:

git reset --hard HEAD~1
git cherry-pick -x 84095d400815e55e27b868e9688641e9e470c209

Original issue:

  1. Create a dataset with Key encryption.
  2. Simulate pool.dataset.export_key failing in loadKey in ExportDatasetKeyDialogComponent.
  3. Click Export Key.
    ER: I see error dialog and I am not prompted to download the key.
    AR: I see error dialog and then I am prompted to download the key.

Original PR: #11505
Jira URL: https://ixsystems.atlassian.net/browse/NAS-134046

@undsoft undsoft marked this pull request as ready for review February 7, 2025 16:17
@undsoft undsoft requested a review from a team as a code owner February 7, 2025 16:17
@undsoft undsoft requested review from AlexKarpov98 and removed request for a team February 7, 2025 16:17
Copy link
Collaborator

@undsoft undsoft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

backported

@undsoft undsoft enabled auto-merge (squash) February 7, 2025 16:17
@undsoft undsoft disabled auto-merge February 7, 2025 16:17
@undsoft undsoft enabled auto-merge (squash) February 7, 2025 16:18
Copy link
Contributor

@AlexKarpov98 AlexKarpov98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ported.

Copy link

codecov bot commented Feb 7, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (stable/fangtooth@141bc6f). Learn more about missing BASE report.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@                 Coverage Diff                 @@
##             stable/fangtooth   #11515   +/-   ##
===================================================
  Coverage                    ?   82.92%           
===================================================
  Files                       ?     1651           
  Lines                       ?    58884           
  Branches                    ?     6231           
===================================================
  Hits                        ?    48831           
  Misses                      ?    10053           
  Partials                    ?        0           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@undsoft undsoft merged commit 446b149 into stable/fangtooth Feb 7, 2025
9 checks passed
@undsoft undsoft deleted the NAS-134046-25.04-RC.1 branch February 7, 2025 20:57
@bugclerk
Copy link
Contributor Author

bugclerk commented Feb 7, 2025

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.

@truenas truenas locked as resolved and limited conversation to collaborators Feb 7, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants