Skip to content

Cherry-pick #22581 to 7.x: Fix version parser regex for packaging#23134

Merged
andrewkroh merged 1 commit intoelastic:7.xfrom
andrewkroh:backport_22581_7.x
Dec 15, 2020
Merged

Cherry-pick #22581 to 7.x: Fix version parser regex for packaging#23134
andrewkroh merged 1 commit intoelastic:7.xfrom
andrewkroh:backport_22581_7.x

Conversation

@andrewkroh
Copy link
Copy Markdown
Member

@andrewkroh andrewkroh commented Dec 15, 2020 •
edited by zube bot
Loading

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

What does this PR do?

This fixes the version parser regex to allow it to handle double digit major/minor/patch
values. It fixes the FileVersion added to Windows exe files.

Why is it important?

The "raw" values were wrong in the Windows file metadata.

PS C:\Gopath\src\github.com\elastic\beats\x-pack\winlogbeat> (Get-Item .\winlogbeat.exe).VersionInfo | Format-List


OriginalFilename  : winlogbeat.exe
FileDescription   : Winlogbeat ships Windows event logs to Elasticsearch or Logstash.
ProductName       : Winlogbeat
Comments          : commit=1428d58cf2ed945441fb2ed03961cafa9e4ad3eb
CompanyName       : Elastic
FileName          : C:\Gopath\src\github.com\elastic\beats\x-pack\winlogbeat\winlogbeat.exe
FileVersion       : 7.10.0
ProductVersion    : 7.10.0
IsDebug           : False
IsPatched         : False
IsPreRelease      : False
IsPrivateBuild    : False
IsSpecialBuild    : False
Language          : Language Neutral
LegalCopyright    : Copyright Elastic, License Elastic License
LegalTrademarks   :
PrivateBuild      :
SpecialBuild      :
FileVersionRaw    : 7.0.0.0
ProductVersionRaw : 7.0.0.0

Checklist

  • My code follows the style guidelines of this project
  • 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.

@andrewkroh
Fix version parser regex for packaging (elastic#22581)
332ef8d 
This fixes the version parser regex to allow it to handle double digit major/minor/patch
values. It fixes the FileVersion added to Windows exe files.

(cherry picked from commit bb481b4)
@andrewkroh andrewkroh added [zube]: In Review backport Team:Automation Label for the Observability productivity team labels Dec 15, 2020
@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 Dec 15, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Dec 15, 2020

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Dec 15, 2020

💚 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 #23134 opened

  • Start Time: 2020-12-15T02:56:17.084+0000

  • Duration: 53 min 12 sec

Test stats 🧪

Test Results
Failed 0
Passed 17422
Skipped 1404
Total 18826

Steps errors 2

Expand to view the steps failures

Terraform Apply on x-pack/metricbeat/module/aws
  • Took 0 min 15 sec . View more details on here
Terraform Apply on x-pack/metricbeat/module/aws
  • Took 0 min 16 sec . View more details on here

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 17422
Skipped 1404
Total 18826

@andrewkroh andrewkroh merged commit bbd9da7 into elastic:7.x Dec 15, 2020
@zube zube bot removed the [zube]: Done label Mar 15, 2021
@andrewkroh andrewkroh deleted the backport_22581_7.x branch January 14, 2022 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@leehinman leehinman leehinman approved these changes

Assignees

No one assigned

Labels

backport Team:Automation Label for the Observability productivity team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@andrewkroh @elasticmachine @leehinman