Skip to content

Backport of Fix a panic in connect-inject when the provided upstreams list is malformed into release/1.4.x#3971

Merged
dhiaayachi merged 5 commits intorelease/1.4.xfrom
backport/fix-panic-upstreams-annotations/adversely-amused-stud
May 6, 2024
Merged

Backport of Fix a panic in connect-inject when the provided upstreams list is malformed into release/1.4.x#3971
dhiaayachi merged 5 commits intorelease/1.4.xfrom
backport/fix-panic-upstreams-annotations/adversely-amused-stud

Conversation

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

Backport

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

🚨

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:
@dhiaayachi
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: unable to process merge commit: "86466472ec0f44d0e75e8fea567a6fc03936a45c", automatic backport requires rebase workflow

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


Changes proposed in this PR

  • Fix a panic when parsing a malformed upstream, now a malformed upstream will be ignored
  • Support multiple separators between upstreams (, , ).

How I've tested this PR

Added unit tests to test multiple scenarios including malformed upstream lists

How I expect reviewers to test this PR

N/A

Checklist


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/fix-panic-upstreams-annotations/adversely-amused-stud branch from 7cb2319 to 3470f50 Compare May 6, 2024 13:12
@dhiaayachi dhiaayachi marked this pull request as ready for review May 6, 2024 13:39
@dhiaayachi dhiaayachi requested a review from DanStough May 6, 2024 13:40
@dhiaayachi dhiaayachi merged commit 6b671ff into release/1.4.x May 6, 2024
@dhiaayachi dhiaayachi deleted the backport/fix-panic-upstreams-annotations/adversely-amused-stud branch May 6, 2024 17:15
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.

3 participants