Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jun 4, 2024

Proposed Changes

Since OTP 26 the verify_peer TLS option is enabled by default, which requires to specify cacerts as well. This change helps with not having to specify TLS options like cacertfile at every connection. This is especially helpful for shovels using AMQP 1.0, where the TLS options would otherwise need to be specified as URI parameters.

Similar env configuration already exists for amqp_client. (The option name ssl_options is chosen over tls_options or tls_opts because the former is widely used across RabbitMQ applications)

Types of Changes

What types of changes does your code introduce to this project?
Put an x in the boxes that apply

  • Bug fix (non-breaking change which fixes issue #NNNN)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause an observable behavior change in existing systems)
  • Documentation improvements (corrections, new content, etc)
  • Cosmetic change (whitespace, formatting, etc)
  • Build system and/or CI

Checklist

Put an x in the boxes that apply.
You can also fill these out after creating the PR.
If you're unsure about any of them, don't hesitate to ask on the mailing list.
We're here to help!
This is simply a reminder of what we are going to look for before merging your code.

  • I have read the CONTRIBUTING.md document
  • I have signed the CA (see https://cla.pivotal.io/sign/rabbitmq)
  • I have added tests that prove my fix is effective or that my feature works
  • All tests pass locally with my changes
  • If relevant, I have added necessary documentation to https://github.com/rabbitmq/rabbitmq-website
  • If relevant, I have added this change to the first version(s) in release-notes that I expect to introduce it

Further Comments


This is an automatic backport of pull request #11369 done by [Mergify](https://mergify.com).

Since OTP 26 the verify_peer TLS option is enabled by default, which
requires to specify cacerts as well. This change helps with not having
to specify TLS options like cacertfile at every connection. This is
especially helpful for shovels using AMQP 1.0, where the TLS options
would otherwise need to be specified as URI parameters. Similar env
configuration already exists for amqp_client.

(cherry picked from commit 2779bf7)

# Conflicts:
#	deps/amqp10_client/src/amqp10_client.erl
@mergify mergify bot added the conflicts label Jun 4, 2024
@mergify
Copy link
Author

mergify bot commented Jun 4, 2024

Cherry-pick of 2779bf7 has failed:

On branch mergify/bp/v3.13.x/pr-11369
Your branch is up to date with 'origin/v3.13.x'.

You are currently cherry-picking commit 2779bf7375.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   deps/amqp10_client/test/system_SUITE.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/amqp10_client/src/amqp10_client.erl

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@michaelklishin michaelklishin added this to the 3.13.4 milestone Jun 4, 2024
@michaelklishin michaelklishin merged commit 2757803 into v3.13.x Jun 4, 2024
@michaelklishin michaelklishin deleted the mergify/bp/v3.13.x/pr-11369 branch June 4, 2024 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants