Skip to content

Backport of [OSS] Improve Gateway Test Coverage of Catalog Health into release/1.15.x#18013

Merged
DanStough merged 6 commits intorelease/1.15.xfrom
backport/dans/NET-3917/improve-integration-coverage/rapidly-able-lizard
Jul 5, 2023
Merged

Backport of [OSS] Improve Gateway Test Coverage of Catalog Health into release/1.15.x#18013
DanStough merged 6 commits intorelease/1.15.xfrom
backport/dans/NET-3917/improve-integration-coverage/rapidly-able-lizard

Conversation

@hc-github-team-consul-core
Copy link
Collaborator

Backport

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

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@DanStough
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

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.


Description

Two parts to this PR:

  1. I wanted to increase test coverage for gateways because I had to revert a recent change caused by the health check failing on startup.
  2. In adding this test coverage, I discovered that the default check registered to API gateways with consul connect envoy is invalid.

Testing & Reproduction steps

  1. Run the integration tests.

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/dans/NET-3917/improve-integration-coverage/rapidly-able-lizard branch from a8a7e75 to 8ff8586 Compare July 5, 2023 15:31
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/dans/NET-3917/improve-integration-coverage/rapidly-able-lizard branch 2 times, most recently from 1da8643 to 8ff8586 Compare July 5, 2023 15:31
@github-actions github-actions bot added the theme/cli Flags and documentation for the CLI interface label Jul 5, 2023
Copy link
Collaborator

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

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging July 5, 2023 15:34 Inactive
@vercel vercel bot temporarily deployed to Preview – consul July 5, 2023 15:36 Inactive
@DanStough DanStough marked this pull request as ready for review July 5, 2023 20:09
@DanStough DanStough force-pushed the backport/dans/NET-3917/improve-integration-coverage/rapidly-able-lizard branch from 3807bb3 to 5aba756 Compare July 5, 2023 20:33
@DanStough DanStough merged commit a741e94 into release/1.15.x Jul 5, 2023
@DanStough DanStough deleted the backport/dans/NET-3917/improve-integration-coverage/rapidly-able-lizard branch July 5, 2023 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

theme/cli Flags and documentation for the CLI interface

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants