Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update test snapshots for 4.5 (#5601)
Browse files Browse the repository at this point in the history
* Add missing supported versions to the Docker environments (#5584)

feat(environments): add latest versions to Docker environments

- Add Kibana versions: 7.17.7, 7.17.8, 7.17.9 and 7.17.10
- Add OpenSearch: 2.6.0
- Add OpenSearch Dashboards: 2.6.0
- Add Wazuh 4.4.1, 4.4.2, 4.4.3 and 4.4.4

* Update test snapshost

* Update API data to 4.5

* Update branch patterns for GH Actions

---------

Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
(cherry picked from commit 1ae5f19)
AlexRuiz7 committed Jun 27, 2023

Verified

This commit was signed with the committer’s verified signature.
lann Lann
1 parent daa4da2 commit 0f3236c
Showing 10 changed files with 262 additions and 196 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/eslint.yml
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
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
7 changes: 4 additions & 3 deletions docker/kbn-dev/dev.sh
Original file line number Diff line number Diff line change
@@ -11,9 +11,10 @@ elastic_versions=(
'7.17.4'
'7.17.5'
'7.17.6'
'7.17.7'
'7.17.8'
'7.17.9'
'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
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
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
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() {
12 changes: 8 additions & 4 deletions docker/wazuh-4.x-es/pre.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
s#!/usr/bin/env bash

elastic_versions=(
"7.10.2"
@@ -13,9 +13,10 @@ elastic_versions=(
"7.17.4"
"7.17.5"
"7.17.6"
"7.17.7"
"7.17.8"
"7.17.9"
"7.17.7"
"7.17.8"
"7.17.9"
"7.17.10"
)

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

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

wazuh_versions=(
@@ -31,6 +32,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() {
401 changes: 223 additions & 178 deletions plugins/main/common/api-info/endpoints.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion plugins/main/common/services/web_documentation.test.ts
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`);
});

0 comments on commit 0f3236c

Please sign in to comment.