Skip to content

Commit

Permalink
Fix version parser regex for packaging
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
andrewkroh committed Nov 13, 2020
1 parent b6896ee commit 9a8d967
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fixed documentation for commands in beats dev guide {pull}22194[22194]
- Fix parsing of expired licences. {issue}21112[21112] {pull}22180[22180]
- Fix duplicated pod events in kubernetes autodiscover for pods with init or ephemeral containers. {pull}22438[22438]
- Fix FileVersion contained in Windows exe files. {pull}22581[22581]

*Auditbeat*

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/mage/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ func binaryExtension(goos string) string {
return ""
}

var parseVersionRegex = regexp.MustCompile(`(?m)^[^\d]*(?P<major>\d)+\.(?P<minor>\d)+(?:\.(?P<patch>\d)+.*)?$`)
var parseVersionRegex = regexp.MustCompile(`(?m)^[^\d]*(?P<major>\d+)\.(?P<minor>\d+)(?:\.(?P<patch>\d+).*)?$`)

// ParseVersion extracts the major, minor, and optional patch number from a
// version string.
Expand Down
2 changes: 2 additions & 0 deletions dev-tools/mage/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ func TestParseVersion(t *testing.T) {
{"1.2.3-SNAPSHOT", 1, 2, 3},
{"1.2.3rc1", 1, 2, 3},
{"1.2", 1, 2, 0},
{"7.10.0", 7, 10, 0},
{"10.01.22", 10, 1, 22},
}

for _, tc := range tests {
Expand Down

0 comments on commit 9a8d967

Please sign in to comment.