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

Cherry-pick #22322 to 7.x: Fix incorrect hash when upgrading agent (#22322) #22323

Merged
merged 1 commit into from
Oct 30, 2020

Conversation

michalpristas
Copy link
Contributor

Cherry-pick of PR #22322 to 7.x branch. Original message:

What does this PR do?

For some weird special case when elastic-agent sha512 file contains a filename prefixed with ./
e.g:

748e927284f8eac2f5d8724f85a3be34d271b207147024906be4d254c5ff60affc51b191b7895e53bc3a1f4d1e76ef72e97c993d10b4be4804d9d6065ffefb9e  ./elastic-agent-7.11.0-SNAPSHOT-darwin-x86_64.tar.gz

elastic agent evaluates hashes incorrectly because it just trims the filename suffix. agent does not consider ./ to be part of the filename so it suspects that hash is
748e927284f8eac2f5d8724f85a3be34d271b207147024906be4d254c5ff60affc51b191b7895e53bc3a1f4d1e76ef72e97c993d10b4be4804d9d6065ffefb9e ./ instead of
748e927284f8eac2f5d8724f85a3be34d271b207147024906be4d254c5ff60affc51b191b7895e53bc3a1f4d1e76ef72e97c993d10b4be4804d9d6065ffefb9e

This PR just finds a correct line in a file and takes hash which is a fixed size string anyway without trimming suffixes.

Why is it important?

Fixes: #22306

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

[Ingest Manager] Fix incorrect hash when upgrading agent (elastic#22322)
@elasticmachine
Copy link
Collaborator

Pinging @elastic/ingest-management (Team:Ingest Management)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Oct 30, 2020
Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Backport looks good.

@elasticmachine
Copy link
Collaborator

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 1394
Skipped 4
Total 1398

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #22323 opened]

  • Start Time: 2020-10-30T18:04:25.548+0000

  • Duration: 36 min 22 sec

Test stats 🧪

Test Results
Failed 0
Passed 1394
Skipped 4
Total 1398

@michalpristas michalpristas merged commit 9ca6f90 into elastic:7.x Oct 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport bug Ingest Management:beta2 Group issues for ingest management beta2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants