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.

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

Fix typos and errors code status replacement in wazuh-api controller #4728

Merged
merged 2 commits into from Oct 20, 2022

Conversation

asteriscos
Copy link
Member

@asteriscos asteriscos commented Oct 20, 2022

Description

Team, this PR fixes typos and error codes that shouldn't be replaced in the pull request Replace generic HTTP status codes in the API controller #4710

Test

  • All jest tests should work.
  • Testing the previous PR #4710 should work

Check List

  • All tests pass
    • yarn test:jest
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

@asteriscos asteriscos marked this pull request as ready for review October 20, 2022 15:00
@asteriscos asteriscos requested a review from a team as a code owner October 20, 2022 15:00
@github-actions
Copy link
Contributor

Code coverage (Jest) % values
Statements 7.38% ( 2677 / 36280 )
Branches 3.19% ( 891 / 27958 )
Functions 5.13% ( 454 / 8845 )
Lines 7.47% ( 2593 / 34732 )

Copy link
Member

@yenienserrano yenienserrano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@asteriscos asteriscos merged commit f6f437d into 4.4-7.10 Oct 20, 2022
@asteriscos asteriscos deleted the fix/wz-api-console-error-status-typos-4650 branch October 20, 2022 15:15
@github-actions
Copy link
Contributor

The backport to 4.4-7.16 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.4-7.16 4.4-7.16
# Navigate to the new working tree
cd .worktrees/backport-4.4-7.16
# Create a new branch
git switch --create backport-4728-to-4.4-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f6f437d4388ba2ccae2adfd00e82488294ea5220
# Push it to GitHub
git push --set-upstream origin backport-4728-to-4.4-7.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-7.16

Then, create a pull request where the base branch is 4.4-7.16 and the compare/head branch is backport-4728-to-4.4-7.16.

github-actions bot pushed a commit that referenced this pull request Oct 20, 2022
…4728)

* Fix typos and replacement errors

* Add changelog

(cherry picked from commit f6f437d)
AlexRuiz7 pushed a commit that referenced this pull request Oct 20, 2022
…n wazuh-api controller (#4730)

Fix typos and errors code status replacement in wazuh-api controller (#4728)

* Fix typos and replacement errors

* Add changelog

(cherry picked from commit f6f437d)

Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
@AlexRuiz7 AlexRuiz7 restored the fix/wz-api-console-error-status-typos-4650 branch October 20, 2022 15:45
@AlexRuiz7 AlexRuiz7 deleted the fix/wz-api-console-error-status-typos-4650 branch October 20, 2022 15:45
AlexRuiz7 pushed a commit that referenced this pull request Oct 20, 2022
…4728)

* Fix typos and replacement errors

* Add changelog

(cherry picked from commit f6f437d)
asteriscos added a commit that referenced this pull request Oct 20, 2022
…azuh-api controller (#4733)

* Replace generic HTTP status codes in the API controller (#4710)

* Add http status codes constants

* Replace internal server errors for service unavailable

* Added changelog and made the error constant an enum

* Add HTTP status unit test

* Update CHANGELOG.md

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>
(cherry picked from commit 9f53850)

* Fix typos and errors code status replacement in wazuh-api controller (#4728)

* Fix typos and replacement errors

* Add changelog

(cherry picked from commit f6f437d)

Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants