Skip to content

[Upgrade Assistant] Minimize reindex attributes used to create credential hash #123727

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.

Sign up for GitHub

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

Merged
alisonelizabeth merged 4 commits into from
Jan 26, 2022
Merged

[Upgrade Assistant] Minimize reindex attributes used to create credential hash #123727

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c93afea
minimize reindex attributes used to create credential hash
alisonelizabeth Jan 25, 2022
6d29e10
only exclude reindexOptions
alisonelizabeth Jan 25, 2022
84260c5
add code comment
alisonelizabeth Jan 26, 2022
44f24a3
Merge branch '7.17' into bugfix/ua/reindex_loop
kibanamachine Jan 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@ import { ReindexSavedObject, ReindexStatus } from '../../../common/types';
export type Credential = Record<string, any>;

// Generates a stable hash for the reindex operation's current state.
const getHash = (reindexOp: ReindexSavedObject) =>
createHash('sha256')
.update(stringify({ id: reindexOp.id, ...reindexOp.attributes }))
const getHash = (reindexOp: ReindexSavedObject) => {
// Remove reindexOptions from the SO attributes as it creates an unstable hash
// This needs further investigation, see: https://github.com/elastic/kibana/issues/123752
const { reindexOptions, ...attributes } = reindexOp.attributes;
Copy link
Contributor

@sebelga sebelga Jan 26, 2022

Choose a reason for hiding this comment

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

Can we add a comment to mention that we exclude the reindexOptions for now as it creates an unstable hash. This needs to be investigated (with link to #123752)

Copy link
Contributor Author

@alisonelizabeth alisonelizabeth Jan 26, 2022

Choose a reason for hiding this comment

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

👍 thanks for the reminder! Meant to do this and forgot to push it up.

return createHash('sha256')
.update(stringify({ id: reindexOp.id, ...attributes }))
.digest('base64');
};

// Returns a base64-encoded API key string or undefined
const getApiKey = async ({
Expand Down