Backport of Add the missing Service TaggedAddresses and Check Type fields to Txn API into release/1.20.x#22222
Merged
nitin-sachdev-29 merged 2 commits intoMar 20, 2025
Conversation
github-team-consul-core-pr-approver
approved these changes
Mar 13, 2025
Collaborator
github-team-consul-core-pr-approver
left a comment
There was a problem hiding this comment.
Auto approved Consul Bot automated PR
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport
This PR is auto-generated from #22220 to be assessed for backporting due to the inclusion of the label backport/1.20.
The below text is copied from the body of the original PR.
Description
Update: looks like there is an issue with API package unable to unmarshall TxnResult when the service has
TaggedAddressesset. This issue should be resolved first before this PR.Consul Transaction API Service Operation does not register the
TaggedAddressesfield in theAgentServicestruct that is sent from the client. Same with theTypefield in theHealthCheckstruct.Testing & Reproduction steps
txn.jsonTaggedAddressesand CheckTypeare not registered.Relevant Unit Test:
https://github.com/jzou-rbx/consul/blob/4d76a43dc6d0ad9dacd6079c7b34d128baad12c7/agent/txn_endpoint_test.go#L533
does not test for the
Typefield in a check.https://github.com/jzou-rbx/consul/blob/4d76a43dc6d0ad9dacd6079c7b34d128baad12c7/agent/txn_endpoint_test.go#L703 does not test for the
TaggedAddressesfield in a regular service.The test build after the PR now work properly to include these fields when submitting the same input above to the Transaction API.
PR Checklist
Overview of commits