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

Update test snapshots for 4.5 #5601

Merged
merged 4 commits into from
Jun 27, 2023
Merged

Update test snapshots for 4.5 #5601

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a93e54e
Add missing supported versions to the Docker environments (#5584)
Desvelao Jun 20, 2023
f153616
Update test snapshost
AlexRuiz7 Jun 27, 2023
95c7e84
Update API data to 4.5
AlexRuiz7 Jun 27, 2023
cbe3b91
Update branch patterns for GH Actions
AlexRuiz7 Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/eslint.yml
View file
Original file line number Diff line number Diff line change
@@ -10,11 +10,12 @@
name: ESLint

on:
push:
branches: [ "master", "*.*-*.*", "*.*-*.*-wzd", "[0-9].[0-9]+" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "*.*-*.*", "*.*-*.*-wzd", "[0-9].[0-9]+" ]
branches:
- 'master'
- '[345].[0-9]+' # Minor branches
- '[345].[0-9]+.[0-9]+' # Patch branches
- '[345].[0-9]+.[0-9]+-7.[0-9]+' # Minor branches - Kibana

jobs:
eslint:
6 changes: 3 additions & 3 deletions .github/workflows/unit-test.yml
View file
Original file line number Diff line number Diff line change
@@ -26,9 +26,9 @@ on:
pull_request:
branches:
- 'master'
- '*.*-*.*'
- '*.*-*.*-wzd'
- '[0-9].[0-9]+'
- '[345].[0-9]+' # Minor branches
- '[345].[0-9]+.[0-9]+' # Patch branches
- '[345].[0-9]+.[0-9]+-7.[0-9]+' # Minor branches - Kibana

jobs:
# Run unit tests with Jest
531 changes: 276 additions & 255 deletions common/api-info/endpoints.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion common/services/web_documentation.test.ts
View file
Original file line number Diff line number Diff line change
@@ -10,5 +10,5 @@ test(`Generate a web documentation URL to the base URL using to the plugin short
});

test(`Generate a web documentation URL using a specific version`, () => {
expect(webDocumentationLink('user-manual/agent-enrollment/index.html', '4.4')).toBe(`${DOCUMENTATION_WEB_BASE_URL}/4.4/user-manual/agent-enrollment/index.html`);
expect(webDocumentationLink('user-manual/agent-enrollment/index.html', '4.5')).toBe(`${DOCUMENTATION_WEB_BASE_URL}/4.5/user-manual/agent-enrollment/index.html`);
});
4 changes: 4 additions & 0 deletions docker/kbn-dev/dev.sh
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,10 @@ elastic_versions=(
'7.17.4'
'7.17.5'
'7.17.6'
'7.17.7'
'7.17.8'
'7.17.9'
'7.17.10'
'8.0.0'
'8.1.0'
'8.2.1'
2 changes: 2 additions & 0 deletions docker/osd-dev/dev.sh
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ os_versions=(
'2.3.0'
'2.4.0'
'2.4.1'
'2.6.0'
)

osd_versions=(
@@ -18,6 +19,7 @@ osd_versions=(
'2.3.0'
'2.4.0'
'2.4.1'
'2.6.0'
)

usage() {
4 changes: 4 additions & 0 deletions docker/wazuh-4.4-wz/pre.sh
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,10 @@

versions=(
"4.4.0"
"4.4.1"
"4.4.2"
"4.4.3"
"4.4.4"
)

wazuh_api_version=(
4 changes: 4 additions & 0 deletions docker/wazuh-4.4-wz/rel.sh
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,10 @@

versions=(
"4.4.0"
"4.4.1"
"4.4.2"
"4.4.3"
"4.4.4"
)

usage() {
7 changes: 7 additions & 0 deletions docker/wazuh-4.x-es/pre.sh
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,10 @@ elastic_versions=(
"7.17.4"
"7.17.5"
"7.17.6"
"7.17.7"
"7.17.8"
"7.17.9"
"7.17.10"
)

wazuh_api_version=(
@@ -28,6 +32,9 @@ wazuh_api_version=(
"4.3.10"
"4.4.0"
"4.4.1"
"4.4.2"
"4.4.3"
"4.4.4"
)

usage() {
8 changes: 8 additions & 0 deletions docker/wazuh-4.x-es/rel.sh
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,10 @@ elastic_versions=(
"7.17.4"
"7.17.5"
"7.17.6"
"7.17.7"
"7.17.8"
"7.17.9"
"7.17.10"
)

wazuh_versions=(
@@ -27,6 +31,10 @@ wazuh_versions=(
"4.3.9"
"4.3.10"
"4.4.0"
"4.4.1"
"4.4.2"
"4.4.3"
"4.4.4"
)

usage() {
12 changes: 6 additions & 6 deletions ...guration/office365/components/SubscriptionTab/__snapshots__/SubscriptionTab.test.tsx.snap
View file
Original file line number Diff line number Diff line change
@@ -60,11 +60,11 @@ exports[`SubscriptionTab component renders correctly to match the snapshot 1`] =
helpLinks={
Array [
Object {
"href": "https://documentation.wazuh.com/4.4/office365/index.html",
"href": "https://documentation.wazuh.com/4.5/office365/index.html",
"text": "Using Wazuh to monitor Office 365",
},
Object {
"href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
"href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
"text": "Configuration options for the module",
},
]
@@ -76,11 +76,11 @@ exports[`SubscriptionTab component renders correctly to match the snapshot 1`] =
help={
Array [
Object {
"href": "https://documentation.wazuh.com/4.4/office365/index.html",
"href": "https://documentation.wazuh.com/4.5/office365/index.html",
"text": "Using Wazuh to monitor Office 365",
},
Object {
"href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
"href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
"text": "Configuration options for the module",
},
]
@@ -238,11 +238,11 @@ exports[`SubscriptionTab component renders correctly to match the snapshot 1`] =
links={
Array [
Object {
"href": "https://documentation.wazuh.com/4.4/office365/index.html",
"href": "https://documentation.wazuh.com/4.5/office365/index.html",
"text": "Using Wazuh to monitor Office 365",
},
Object {
"href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
"href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
"text": "Configuration options for the module",
},
]
12 changes: 6 additions & 6 deletions .../configuration/office365/components/api-auth-tab/__snapshots__/api-auth-tab.test.tsx.snap
View file
Original file line number Diff line number Diff line change
@@ -70,11 +70,11 @@ exports[`ApiAuthTab component renders correctly to match the snapshot 1`] = `
helpLinks={
Array [
Object {
"href": "https://documentation.wazuh.com/4.4/office365/index.html",
"href": "https://documentation.wazuh.com/4.5/office365/index.html",
"text": "Using Wazuh to monitor Office 365",
},
Object {
"href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
"href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
"text": "Configuration options for the module",
},
]
@@ -86,11 +86,11 @@ exports[`ApiAuthTab component renders correctly to match the snapshot 1`] = `
help={
Array [
Object {
"href": "https://documentation.wazuh.com/4.4/office365/index.html",
"href": "https://documentation.wazuh.com/4.5/office365/index.html",
"text": "Using Wazuh to monitor Office 365",
},
Object {
"href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
"href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
"text": "Configuration options for the module",
},
]
@@ -248,11 +248,11 @@ exports[`ApiAuthTab component renders correctly to match the snapshot 1`] = `
links={
Array [
Object {
"href": "https://documentation.wazuh.com/4.4/office365/index.html",
"href": "https://documentation.wazuh.com/4.5/office365/index.html",
"text": "Using Wazuh to monitor Office 365",
},
Object {
"href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
"href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
"text": "Configuration options for the module",
},
]
12 changes: 6 additions & 6 deletions ...nt/configuration/office365/components/general-tab/__snapshots__/general-tab.test.tsx.snap
View file
Original file line number Diff line number Diff line change
@@ -61,11 +61,11 @@ exports[`GeneralTab component renders correctly to match the snapshot 1`] = `
helpLinks={
Array [
Object {
"href": "https://documentation.wazuh.com/4.4/office365/index.html",
"href": "https://documentation.wazuh.com/4.5/office365/index.html",
"text": "Using Wazuh to monitor Office 365",
},
Object {
"href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
"href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
"text": "Configuration options for the module",
},
]
@@ -78,11 +78,11 @@ exports[`GeneralTab component renders correctly to match the snapshot 1`] = `
help={
Array [
Object {
"href": "https://documentation.wazuh.com/4.4/office365/index.html",
"href": "https://documentation.wazuh.com/4.5/office365/index.html",
"text": "Using Wazuh to monitor Office 365",
},
Object {
"href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
"href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
"text": "Configuration options for the module",
},
]
@@ -258,11 +258,11 @@ exports[`GeneralTab component renders correctly to match the snapshot 1`] = `
links={
Array [
Object {
"href": "https://documentation.wazuh.com/4.4/office365/index.html",
"href": "https://documentation.wazuh.com/4.5/office365/index.html",
"text": "Using Wazuh to monitor Office 365",
},
Object {
"href": "https://documentation.wazuh.com/4.4/user-manual/reference/ossec-conf/office365-module.html",
"href": "https://documentation.wazuh.com/4.5/user-manual/reference/ossec-conf/office365-module.html",
"text": "Configuration options for the module",
},
]