search

ManageIQ / manageiq-documentation

Documentation for the ManageIQ Management Platform
https://www.manageiq.org/docs/
Other
38 stars 113 forks source link

Fix missing method v2_key #1734

Closed Fryguy closed 1 year ago

Fryguy commented 1 year ago

This method hasn't existed since najdorf, use .key instead

@kbrock Please review. cc @dehawkins512

miq-bot commented 1 year ago

Checked commit https://github.com/Fryguy/manageiq-documentation/commit/57890bd0f6f0ae0d4bee2582546073ef9f3b79a3 with ruby 2.6.10, rubocop 1.28.2, haml-lint 0.35.0, and yamllint 0 files checked, 0 offenses detected Everything looks fine. :cake:

miq-bot commented 1 year ago

Some comments on commit https://github.com/Fryguy/manageiq-documentation/commit/57890bd0f6f0ae0d4bee2582546073ef9f3b79a3

installing_on_kubernetes/_topics/migrate_from_appliance.md

Fryguy commented 1 year ago

Backported to petrosian in commit 22705330215738a149faa65c3eae2d2e1e0d4bb9.

commit 22705330215738a149faa65c3eae2d2e1e0d4bb9
Author: Keenan Brock <keenan@thebrocks.net>
Date:   Wed Jul 12 21:44:51 2023 -0400

    Merge pull request #1734 from Fryguy/fix_invalid_method

    Fix missing method v2_key

    (cherry picked from commit fbe664644dfaa61abba8aee562602c5e858315d9)
Fryguy commented 1 year ago

@Fryguy A conflict occurred during the backport of this pull request to najdorf.

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 najdorf branch in order to resolve this.

Conflict details:

diff --cc installing_on_kubernetes/_topics/migrate_from_appliance.md
index 91826270,96846080..00000000
--- a/installing_on_kubernetes/_topics/migrate_from_appliance.md
+++ b/installing_on_kubernetes/_topics/migrate_from_appliance.md
@@@ -27,7 -31,9 +27,13 @@@

  2. Export the encryption key and Base64 encode it for the Kubernetes Secret.

++<<<<<<< HEAD
 +        $ vmdb && rails r "puts Base64.encode64(ManageIQ::Password.v2_key.to_s)"
++=======
+    ```bash
+    $ vmdb && rails r "puts Base64.encode64(ManageIQ::Password.key.to_s)"
+    ```
++>>>>>>> fbe66464 (Merge pull request #1734 from Fryguy/fix_invalid_method)

  3. Get the region number
Fryguy commented 1 year ago

Manually backported to najdorf via daf7c711721eb8874dfa2102a57600f7394e3736

commit daf7c711721eb8874dfa2102a57600f7394e3736 (HEAD -> najdorf, upstream/najdorf)
Author: Keenan Brock <keenan@thebrocks.net>
Date:   Wed Jul 12 21:44:51 2023 -0400

    Merge pull request #1734 from Fryguy/fix_invalid_method

    Fix missing method v2_key

    (cherry picked from commit fbe664644dfaa61abba8aee562602c5e858315d9)
Fryguy commented 1 year ago

Backported to oparin in commit 5a5037c639730d3ed75afbc06a9719d57e09a265.

commit 5a5037c639730d3ed75afbc06a9719d57e09a265
Author: Keenan Brock <keenan@thebrocks.net>
Date:   Wed Jul 12 21:44:51 2023 -0400

    Merge pull request #1734 from Fryguy/fix_invalid_method

    Fix missing method v2_key

    (cherry picked from commit fbe664644dfaa61abba8aee562602c5e858315d9)