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

Backport of troubleshoot: fixes and updated messages into release/1.15.x #16303

Merged

Conversation

hc-github-team-consul-core
Copy link
Contributor

Backport

This PR is auto-generated from #16294 to be assessed for backporting due to the inclusion of the label backport/1.15.

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


This PR makes a couple fixes, and updates all the output to be consistent across what's been discussed in the RFC. Note that this needs to be backported into 1.15.

Previously, it always printed route ___ found, even when there isn't a route. Now it only says that if it actually is a case where a route should be found.

In the below case, there are no routes and backendbloo does not have any instances. You can see there are no routes found in the below case (which is correct behavior) and the actions are displayed.

Screen Shot 2023-02-15 at 2 26 23 PM

This also capitalizes the output, and makes the error messages more consistent and adds possible actions to most error cases.

Error case (deleted deployment for a peered upstream):
Screen Shot 2023-02-16 at 12 32 33 PM
Success case (healthy upstream):
Screen Shot 2023-02-16 at 12 32 46 PM
Output for upstreams command:
Screen Shot 2023-02-16 at 12 33 06 PM

PR Checklist

  • updated test coverage
  • external facing docs updated
  • not a security concern

Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Feb 17, 2023

CLA assistant check
All committers have signed the CLA.

Copy link

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@malizz malizz force-pushed the backport/troubleshoot-fixes/remarkably-together-humpback branch from 4957af4 to 5c348b1 Compare February 22, 2023 20:47
@malizz malizz marked this pull request as ready for review February 22, 2023 20:52
@malizz malizz merged commit 7cd0eff into release/1.15.x Feb 22, 2023
@malizz malizz deleted the backport/troubleshoot-fixes/remarkably-together-humpback branch February 22, 2023 21:25
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.

4 participants