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.

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

Jump to bottom

Fix version parser regex for packaging #22581

Merged
merged 2 commits into from
Dec 1, 2020
Merged

Fix version parser regex for packaging #22581

merged 2 commits into from
Dec 1, 2020

Conversation

andrewkroh
Copy link
Member

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.

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 13, 2020
@andrewkroh
Fix version parser regex for packaging
9a8d967 
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.
@andrewkroh andrewkroh marked this pull request as ready for review November 13, 2020 17:40
@andrewkroh andrewkroh added Packaging Team:Automation Label for the Observability productivity team labels Nov 13, 2020
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 13, 2020
@andrewkroh andrewkroh added the needs_backport PR is waiting to be backported to other branches. label Nov 13, 2020
@andrewkroh andrewkroh requested a review from jsoriano November 30, 2020 17:39
@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 #22581 updated

  • Start Time: 2020-11-30T17:41:12.105+0000

  • Duration: 80 min 11 sec

Test stats 🧪

Test Results
Failed 0
Passed 16717
Skipped 1372
Total 18089

Steps errors 2

Expand to view the steps failures

Terraform Apply on x-pack/metricbeat/module/aws

  • Took 0 min 16 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 16717
Skipped 1372
Total 18089

@andrewkroh andrewkroh merged commit bb481b4 into elastic:master Dec 1, 2020
v1v added a commit to v1v/beats that referenced this pull request Dec 2, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-7…
6724419 
…-issues

* upstream/master: (41 commits)
  Fix version parser regex for packaging (elastic#22581)
  Fix local_dynamic documentation and add providers inline doc. (elastic#22657)
  fix: use proper param name for e2e tests (elastic#22836)
  [Heartbeat] Fix exit on disabled monitor (elastic#22829)
  Update Golang to 1.14.12 (elastic#22790)
  docs: fix setup.template.overwrite typos (elastic#22804)
  Add docs section for ECS EC2 monitoring (elastic#22784)
  Fixing logic to keep list of unique cluster UUIDs (elastic#22808)
  Skip somewhat flaky UDP system test on Windows (elastic#22810)
  Fix polling node when it is not ready and monitor by hostname (elastic#22666)
  Skip Filebeat test_shutdown on windows 7 (elastic#22797)
  Make monitoring Namespace thread-safe (elastic#22640)
  Drop pkt_dstaddr and pkt_srcaddr when equals to "-" (elastic#22721)
  Add support for reading from UNIX datagram sockets (elastic#22699)
  Fix export dashboard command from Elastic Cloud (elastic#22746)
  Skip flaky winlogbeat test on Windows-7 (elastic#22754)
  Missing `>` (elastic#22763) (elastic#22766)
  Fix k8s watcher issue when node access to list nodes and ns (elastic#22714)
  [Metricbeat/Kibana/stats] Enforce `exclude_usage=true` (elastic#22732)
  Avoid sending non-numeric floats in cloud foundry integrations (elastic#22634)
  ...
v1v added a commit to v1v/beats that referenced this pull request Dec 2, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/retry-win…
29404d9 
…dows-7

* upstream/master: (41 commits)
  Fix version parser regex for packaging (elastic#22581)
  Fix local_dynamic documentation and add providers inline doc. (elastic#22657)
  fix: use proper param name for e2e tests (elastic#22836)
  [Heartbeat] Fix exit on disabled monitor (elastic#22829)
  Update Golang to 1.14.12 (elastic#22790)
  docs: fix setup.template.overwrite typos (elastic#22804)
  Add docs section for ECS EC2 monitoring (elastic#22784)
  Fixing logic to keep list of unique cluster UUIDs (elastic#22808)
  Skip somewhat flaky UDP system test on Windows (elastic#22810)
  Fix polling node when it is not ready and monitor by hostname (elastic#22666)
  Skip Filebeat test_shutdown on windows 7 (elastic#22797)
  Make monitoring Namespace thread-safe (elastic#22640)
  Drop pkt_dstaddr and pkt_srcaddr when equals to "-" (elastic#22721)
  Add support for reading from UNIX datagram sockets (elastic#22699)
  Fix export dashboard command from Elastic Cloud (elastic#22746)
  Skip flaky winlogbeat test on Windows-7 (elastic#22754)
  Missing `>` (elastic#22763) (elastic#22766)
  Fix k8s watcher issue when node access to list nodes and ns (elastic#22714)
  [Metricbeat/Kibana/stats] Enforce `exclude_usage=true` (elastic#22732)
  Avoid sending non-numeric floats in cloud foundry integrations (elastic#22634)
  ...
andrewkroh added a commit to andrewkroh/beats that referenced this pull request Dec 15, 2020
@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 mentioned this pull request Dec 15, 2020
Merged
3 tasks
@andrewkroh andrewkroh added v7.11.0 and removed needs_backport PR is waiting to be backported to other branches. labels Dec 15, 2020
andrewkroh added a commit that referenced this pull request Dec 15, 2020
@andrewkroh
Fix version parser regex for packaging (#22581) (#23134)
bbd9da7 
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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsoriano jsoriano jsoriano approved these changes

Assignees
No one assigned
Labels
Packaging Team:Automation Label for the Observability productivity team v7.11.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@andrewkroh @elasticmachine @jsoriano