Skip to content

Commit

Permalink
Merge pull request #2542 from wazuh/merge-4.5.4-into-4.6.0
Browse files Browse the repository at this point in the history
Merge 4.5.4 into 4.6.0
  • Loading branch information
Dwordcito authored Oct 21, 2023
2 parents b5e833e + 3e08cf9 commit 7c8ba36
Show file tree
Hide file tree
Showing 14 changed files with 244 additions and 8 deletions.
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ All notable changes to this project will be documented in this file.

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.6.0

## [4.5.3]
## [v4.5.4]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.4

## [v4.5.3]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.3

## [4.5.2]
## [v4.5.2]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.2

Expand Down
2 changes: 2 additions & 0 deletions aix/SPECS/wazuh-agent-aix.spec
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,8 @@ rm -fr %{buildroot}
%changelog
* Tue Oct 24 2023 support <info@wazuh.com> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Tue Oct 24 2023 support <info@wazuh.com> - 4.5.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
* Tue Oct 10 2023 support <info@wazuh.com> - 4.5.3
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
* Thu Aug 31 2023 support <info@wazuh.com> - 4.5.2
Expand Down
202 changes: 202 additions & 0 deletions bump_version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
"""
This script is used to bump the version of the Wazuh packages repository.
Copyright (C) 2015-2020, Wazuh Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
"""
import argparse
import datetime
import glob
import re
from packaging.version import Version

FORMAT_STRING="%m-%d-%Y"

arg_parser=argparse.ArgumentParser()
arg_parser.add_argument('-v', '--version', action='store', dest='version',
help='Version to bump to', required=True)
arg_parser.add_argument('-r', '--revision', action='store', dest='revision',
help='Revision to bump to. Default: 1', default=1)
arg_parser.add_argument('-d', '--date', action='store', dest='date',
help='Date to bump to. Format: m-d-Y. Default: today',
default=datetime.date.today().strftime(FORMAT_STRING))
args=arg_parser.parse_args()

date=datetime.datetime.strptime(args.date, FORMAT_STRING)
version=Version(args.version)

## Find files to bump .spec, changelog, pkginfo, .pkgproj, test-*.sh,
## installVariables.sh, CHANGELOG.md
spec_files=glob.glob('**/*.spec', recursive=True)
changelog_files=glob.glob('**/changelog', recursive=True)
copyright_files=glob.glob('**/copyright', recursive=True)
pkginfo_files=glob.glob('**/pkginfo', recursive=True)
pkgproj_files=glob.glob('**/*.pkgproj', recursive=True)
test_files=glob.glob('**/test-*.sh', recursive=True)
install_variables_files=glob.glob('**/installVariables.sh', recursive=True)
changelog_md_files=glob.glob('**/CHANGELOG.md', recursive=True)
VERSION_files=glob.glob('**/VERSION', recursive=True)

## Bump version in .spec files
SPEC_FORMAT_STRING="%a %b %d %Y"
spec_date=date.strftime(SPEC_FORMAT_STRING)
for spec_file in spec_files:
with open(spec_file, 'r', encoding="utf-8") as file:
print('Bumping version in ' + spec_file)
filedata=file.read()
# Replace version and revision
REGEX=r'Version:\s*(\d+\.\d+\.\d+)'
filedata=re.sub(REGEX, f"Version: {version}", filedata)
REGEX=r'Revision:\s*(\d+)'
filedata=re.sub(REGEX, 'Revision: ' + str(args.revision),
filedata)
# Add new version to changelog
REGEX=r'%changelog'
changelog_string=(f"* {spec_date} support <info@wazuh.com> - {version}"
"\n- More info: https://documentation.wazuh.com/current/release-"
f"notes/release-{version.major}-{version.minor}-"
f"{version.micro}.html")
filedata=re.sub(REGEX, '%changelog\n' + changelog_string, filedata)

with open(spec_file, 'w', encoding="utf-8") as file:
file.write(filedata)

## Bump version in deb changelog files
DEB_FORMAT_STRING="%a, %d %b %Y %H:%M:%S +0000"
deb_changelog_date=date.strftime(DEB_FORMAT_STRING)
for changelog_file in changelog_files:
with open(changelog_file, 'r', encoding="utf-8") as file:
print('Bumping version in ' + changelog_file)
filedata=file.read()
install_type=re.search(r'(wazuh-(agent|manager|indexer|dashboard))',
filedata).group(1)
changelog_string=(f"{install_type} ({version}-RELEASE) stable; "
"urgency=low\n\n * More info: https://documentation.wazuh.com/"
f"current/release-notes/release-{version.major}-{version.minor}-"
f"{version.micro}.html\n\n -- "
f"Wazuh, Inc <info@wazuh.com> {deb_changelog_date}\n\n")
# Add new version to changelog
filedata=changelog_string + filedata

with open(changelog_file, 'w', encoding="utf-8") as file:
file.write(filedata)

## Bump version in deb copyrigth files

for copyrigth_file in copyright_files:
with open(copyrigth_file, 'r', encoding="utf-8") as file:
print('Bumping version in ' + copyrigth_file)
filedata=file.read()
# Replace version and revision
REGEX=(r'Wazuh, Inc <info@wazuh.com> on '
r'(\w+),\s(\d+)\s(\w+)\s(\d+)\s(\d+):(\d+):(\d+)\s\+(\d+)')
filedata=re.sub(REGEX,
f"Wazuh, Inc <info@wazuh.com> on {deb_changelog_date}",
filedata)

with open(copyrigth_file, 'w', encoding="utf-8") as file:
file.write(filedata)

## Bump version in pkginfo files

PKGINFO_FORMAT_STRING="%d%b%Y"

for pkginfo_file in pkginfo_files:
with open(pkginfo_file, 'r', encoding="utf-8") as file:
print('Bumping version in ' + pkginfo_file)
filedata=file.read()
# Replace version and revision
REGEX=r'VERSION=\"(\d+\.\d+\.\d+)\"'
filedata=re.sub(REGEX, f'VERSION=\"{version}\"', filedata)
REGEX=r'PSTAMP=(.*)'
filedata=re.sub(REGEX,
f'PSTAMP=\"{date.strftime(PKGINFO_FORMAT_STRING)}\"',
filedata)

with open(pkginfo_file, 'w', encoding="utf-8") as file:
file.write(filedata)

## Bump version in .pkgproj files

for pkgproj_file in pkgproj_files:
with open(pkgproj_file, 'r', encoding="utf-8") as file:
print('Bumping version in ' + pkgproj_file)
filedata=file.read()
# Replace version and revision
REGEX=r'<string>(\d+\.\d+\.\d+)-(\d+)</string>'
filedata=re.sub(REGEX, f'<string>{version}-{args.revision}</string>',
filedata)
REGEX=r'<string>wazuh-agent-(\d+\.\d+\.\d+)-(\d+)'
filedata=re.sub(REGEX,
f'<string>wazuh-agent-{version}-{args.revision}',
filedata)

with open(pkgproj_file, 'w', encoding="utf-8") as file:
file.write(filedata)

## Bump version in test-*.sh files

for test_file in test_files:
with open(test_file, 'r', encoding="utf-8") as file:
print('Bumping version in ' + test_file)
filedata=file.read()
# Replace version and revision
REGEX=r'wazuh-manager.x86_64\s+(\d+\.\d+\.\d+)-(\d+)'
filedata=re.sub(REGEX,
f'wazuh-manager.x86_64 {version}-{args.revision}',
filedata)
REGEX=r'wazuh_version=\"(\d+\.\d+\.\d+)\"'
filedata=re.sub(REGEX, f'wazuh_version=\"{version}\"', filedata)

with open(test_file, 'w', encoding="utf-8") as file:
file.write(filedata)

## Bump version in installVariables.sh files

for install_variables_file in install_variables_files:
with open(install_variables_file, 'r', encoding="utf-8") as file:
print('Bumping version in ' + install_variables_file)
filedata=file.read()
# Replace version and revision
REGEX=r'wazuh_major=\"(\d+\.\d+)\"'
filedata=re.sub(REGEX,
f'wazuh_major=\"{version.major}.{version.minor}\"',
filedata)
REGEX=r'wazuh_version=\"(\d+\.\d+\.\d+)\"'
filedata=re.sub(REGEX, f'wazuh_version=\"{version}\"', filedata)

with open(install_variables_file, 'w', encoding="utf-8") as file:
file.write(filedata)

## Bump version in CHANGELOG.md files

for changelog_md_file in changelog_md_files:
with open(changelog_md_file, 'r', encoding="utf-8") as file:
print('Bumping version in ' + changelog_md_file)
filedata=file.read()
# Add new version to changelog
REGEX=(r'All notable changes to this project '
r'will be documented in this file.')
changelog_string=(f"## [{version}]\n\n- https://github.com/wazuh/"
f"wazuh-packages/releases/tag/v{version}\n")
filedata=re.sub(REGEX, REGEX + '\n' + changelog_string,
filedata)

with open(changelog_md_file, 'w', encoding="utf-8") as file:
file.write(filedata)

## Bump version in VERSION files

for VERSION_file in VERSION_files:
with open(VERSION_file, 'r', encoding="utf-8") as file:
print('Bumping version in ' + VERSION_file)
filedata=file.read()
# Replace version and revision
REGEX=r'(\d+\.\d+\.\d+)'
filedata=re.sub(REGEX, f'{version}', filedata)

with open(VERSION_file, 'w', encoding="utf-8") as file:
file.write(filedata)
6 changes: 6 additions & 0 deletions debs/SPECS/wazuh-agent/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ wazuh-agent (4.6.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html

-- Wazuh, Inc <info@wazuh.com> Tue, 31 Oct 2023 00:00:00 +0000

wazuh-agent (4.5.4-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html

-- Wazuh, Inc <info@wazuh.com> Tue, 24 Oct 2023 00:00:00 +0000

wazuh-agent (4.5.3-RELEASE) stable; urgency=low
Expand Down
5 changes: 5 additions & 0 deletions debs/SPECS/wazuh-manager/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ wazuh-manager (4.6.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html

-- Wazuh, Inc <info@wazuh.com> Tue, 31 Oct 2023 00:00:00 +0000
wazuh-manager (4.5.4-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html

-- Wazuh, Inc <info@wazuh.com> Tue, 24 Oct 2023 00:00:00 +0000

wazuh-manager (4.5.3-RELEASE) stable; urgency=low
Expand Down
2 changes: 2 additions & 0 deletions rpms/SPECS/wazuh-agent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,8 @@ rm -fr %{buildroot}
%changelog
* Tue Oct 24 2023 support <info@wazuh.com> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Tue Oct 24 2023 support <info@wazuh.com> - 4.5.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
* Tue Oct 10 2023 support <info@wazuh.com> - 4.5.3
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
* Thu Aug 31 2023 support <info@wazuh.com> - 4.5.2
Expand Down
2 changes: 2 additions & 0 deletions rpms/SPECS/wazuh-manager.spec
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,8 @@ rm -fr %{buildroot}
%changelog
* Tue Oct 24 2023 support <info@wazuh.com> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Tue Oct 24 2023 support <info@wazuh.com> - 4.5.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
* Tue Oct 10 2023 support <info@wazuh.com> - 4.5.3
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
* Thu Aug 31 2023 support <info@wazuh.com> - 4.5.2
Expand Down
4 changes: 4 additions & 0 deletions stack/dashboard/deb/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html

wazuh-dashboard (4.5.4-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html

-- Wazuh, Inc <info@wazuh.com> Tue, 24 Oct 2023 00:00:00 +0000

wazuh-dashboard (4.5.3-RELEASE) stable; urgency=low
Expand Down
2 changes: 2 additions & 0 deletions stack/dashboard/rpm/wazuh-dashboard.spec
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,8 @@ rm -fr %{buildroot}
%changelog
* Tue Oct 24 2023 support <info@wazuh.com> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Tue Oct 24 2023 support <info@wazuh.com> - 4.5.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
* Tue Oct 10 2023 support <info@wazuh.com> - 4.5.3
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
* Thu Aug 31 2023 support <info@wazuh.com> - 4.5.2
Expand Down
5 changes: 5 additions & 0 deletions stack/indexer/deb/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ wazuh-indexer (4.6.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html

-- Wazuh, Inc <info@wazuh.com> Tue, 31 Oct 2023 00:00:00 +0000
wazuh-indexer (4.5.4-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html

-- Wazuh, Inc <info@wazuh.com> Tue, 24 Oct 2023 00:00:00 +0000

wazuh-indexer (4.5.3-RELEASE) stable; urgency=low
Expand Down
2 changes: 1 addition & 1 deletion stack/indexer/deb/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <info@wazuh.com> Tue, 24 Oct 2023 00:00:00 +0000
Wazuh, Inc <info@wazuh.com> on Tue, 24 Oct 2023 00:00:00 +0000

It was downloaded from:

Expand Down
2 changes: 2 additions & 0 deletions stack/indexer/rpm/wazuh-indexer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -1446,6 +1446,8 @@ rm -fr %{buildroot}
%changelog
* Tue Oct 24 2023 support <info@wazuh.com> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Tue Oct 24 2023 support <info@wazuh.com> - 4.5.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
* Tue Oct 10 2023 support <info@wazuh.com> - 4.5.3
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
* Thu Aug 31 2023 support <info@wazuh.com> - 4.5.2
Expand Down
2 changes: 1 addition & 1 deletion tests/unattended/unit/suites/test-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ test-04-common_checkInstalled-all-installed-yum() {

@mocktrue yum list installed

@mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.6.0-1 @wazuh
@mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.6.0-1 @wazuh
@mkdir /var/ossec

@mock grep wazuh-indexer === @echo wazuh-indexer.x86_64 1.13.2-1 @wazuh
Expand Down
8 changes: 4 additions & 4 deletions tests/unattended/unit/suites/test-dashboard.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ test-03-dashboard_install-yum() {
load-dashboard_install
sys_type="yum"
sep="-"
wazuh_version="4.5.3"
wazuh_version="4.5.4"
wazuh_revision="1"
dashboard_install
}
Expand All @@ -68,7 +68,7 @@ test-ASSERT-FAIL-04-dashboard_install-yum-error() {
load-dashboard_install
sys_type="yum"
sep="-"
wazuh_version="4.5.3"
wazuh_version="4.5.4"
wazuh_revision="1"
@mockfalse yum install wazuh-dashboard-1.13.2-1 -y
dashboard_install
Expand All @@ -78,7 +78,7 @@ test-05-dashboard_install-apt() {
load-dashboard_install
sys_type="apt-get"
sep="="
wazuh_version="4.5.3"
wazuh_version="4.5.4"
wazuh_revision="1"
dashboard_install
}
Expand All @@ -91,7 +91,7 @@ test-ASSERT-FAIL-06-dashboard_install-apt-error() {
load-dashboard_install
sys_type="apt-get"
sep="="
wazuh_version="4.5.3"
wazuh_version="4.5.4"
wazuh_revision="1"
@mockfalse apt install wazuh-dashboard=1.13.2-1 -y
dashboard_install
Expand Down

0 comments on commit 7c8ba36

Please sign in to comment.