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

Jump to bottom

Replace generic HTTP status codes in the API controller #4710

Merged
merged 6 commits into from
Oct 20, 2022
Merged

Replace generic HTTP status codes in the API controller #4710

merged 6 commits into from
Oct 20, 2022

Conversation

asteriscos
Copy link
Member

@asteriscos asteriscos commented Oct 18, 2022 •
edited by AlexRuiz7
Loading

Description

Hi team, this PR replaces HTTPS status error codes to prevent expected errors to be logged in the server console.

Checking the connection of a downed API should now throw a 503 Service Unavailable.

image

Issues Resolved

#4650

Test

  • Create in wazuh.yml configuration a fake Wazuh API entry to cause a connection exception.
  • Load the app
  • Try to connect to that API
  • Check for errors in the server logs

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 self-assigned this Oct 18, 2022
@asteriscos asteriscos linked an issue Oct 18, 2022 that may be closed by this pull request
Remove router Internal Error in server console #4650
Closed
@asteriscos asteriscos marked this pull request as ready for review October 18, 2022 16:31
@asteriscos asteriscos requested a review from a team as a code owner October 18, 2022 16:31
AlexRuiz7
AlexRuiz7 approved these changes Oct 19, 2022
View reviewed changes
Copy link
Member

@AlexRuiz7 AlexRuiz7 left a comment

Choose a reason for hiding this comment

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

  • Code review: ✔️
  • Test: ✔️

AlexRuiz7
AlexRuiz7 suggested changes Oct 19, 2022
View reviewed changes
Copy link
Member

@AlexRuiz7 AlexRuiz7 left a comment

Choose a reason for hiding this comment

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

Changelog entry missing

yenienserrano
yenienserrano approved these changes Oct 20, 2022
View reviewed changes
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

image

AlexRuiz7
AlexRuiz7 approved these changes Oct 20, 2022
View reviewed changes
Copy link
Member

@AlexRuiz7 AlexRuiz7 left a comment

Choose a reason for hiding this comment

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

LGTM

@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 )

@AlexRuiz7 AlexRuiz7 merged commit 9f53850 into 4.4-7.10 Oct 20, 2022
@AlexRuiz7 AlexRuiz7 deleted the fix/internal-server-console-error-4650 branch October 20, 2022 10:08
@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-4710-to-4.4-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9f53850ef89b07824774aedf0e3e6bfeb8a51113
# Push it to GitHub
git push --set-upstream origin backport-4710-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-4710-to-4.4-7.16.

github-actions bot pushed a commit that referenced this pull request Oct 20, 2022
@asteriscos @github-actions
Replace generic HTTP status codes in the API controller (#4710)
5c454c9 
* 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)
@github-actions github-actions bot mentioned this pull request Oct 20, 2022
Merged
AlexRuiz7 pushed a commit that referenced this pull request Oct 20, 2022
@github-actions @asteriscos
[Backport 4.4-1.2-wzd] Replace generic HTTP status codes in the API c…
ec50bab 
…ontroller (#4722)

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)

Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
AlexRuiz7 pushed a commit that referenced this pull request Oct 20, 2022
@asteriscos @AlexRuiz7
Replace generic HTTP status codes in the API controller (#4710)
de75a11 
* 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)
@AlexRuiz7 AlexRuiz7 mentioned this pull request Oct 20, 2022
Merged
@asteriscos asteriscos mentioned this pull request Oct 20, 2022
Merged
6 tasks
AlexRuiz7 added a commit that referenced this pull request Oct 20, 2022
@AlexRuiz7 @asteriscos
[Backport 4.4-7.16] Replace generic HTTP status codes in the API cont…
14304ad 
…roller (#4723)

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)

Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
AlexRuiz7 pushed a commit that referenced this pull request Oct 20, 2022
@asteriscos @AlexRuiz7
Replace generic HTTP status codes in the API controller (#4710)
e4d409a 
* 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)
asteriscos added a commit that referenced this pull request Oct 20, 2022
@AlexRuiz7 @asteriscos
[Backport 4.4-7.16] Fix typos and errors code status replacement in w…
8ff154e 
…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>
@Desvelao Desvelao mentioned this pull request Dec 20, 2022
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yenienserrano yenienserrano yenienserrano approved these changes

@AlexRuiz7 AlexRuiz7 AlexRuiz7 approved these changes

Assignees

@asteriscos asteriscos

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove router Internal Error in server console
3 participants
@asteriscos @AlexRuiz7 @yenienserrano