Skip to content

Allow tagged (e.g. encrypted:...) values for more rabbitmq.conf keys (backport #15808) (backport #15810)#15811

Merged
michaelklishin merged 3 commits intov4.2.xfrom
mergify/bp/v4.2.x/pr-15810
Mar 23, 2026
Merged

Allow tagged (e.g. encrypted:...) values for more rabbitmq.conf keys (backport #15808) (backport #15810)#15811
michaelklishin merged 3 commits intov4.2.xfrom
mergify/bp/v4.2.x/pr-15810

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Mar 23, 2026

When the support for tagged values in rabbitmq.conf was introduced #11989, not all candidate keys were immediately marked as supporting these new value types.

This PR updates a few more sensitive rabbitmq.conf keys to support encrypted:... values.

References #11989, #15807.


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

…keys

When the support for tagged values in `rabbitmq.conf` was introduced,
not all candidate keys were updated to include it.

This PR updates a few more sensitive `rabbitmq.conf` keys
to support `encrypted:...` values.

References #11989.

(cherry picked from commit e07cdf9)
(cherry picked from commit 81fc0a8)
@mergify mergify Bot added the conflicts label Mar 23, 2026
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Mar 23, 2026

Cherry-pick of 1c6aee5 has failed:

On branch mergify/bp/v4.2.x/pr-15810
Your branch is ahead of 'origin/v4.2.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1c6aee5ae.
  (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/rabbit/priv/schema/rabbit.schema
	modified:   deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets
	modified:   deps/rabbitmq_peer_discovery_etcd/test/config_schema_SUITE_data/rabbitmq_peer_discovery_etcd.snippets
	modified:   deps/rabbitmq_stomp/test/config_schema_SUITE_data/rabbitmq_stomp.snippets

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_auth_backend_ldap/test/config_schema_SUITE_data/rabbitmq_auth_backend_ldap.snippets

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 4.2.6 milestone Mar 23, 2026
(cherry picked from commit b9325dc)
(cherry picked from commit 1c6aee5)

Conflicts:
	deps/rabbitmq_auth_backend_ldap/test/config_schema_SUITE_data/rabbitmq_auth_backend_ldap.snippets
@michaelklishin michaelklishin force-pushed the mergify/bp/v4.2.x/pr-15810 branch from 0b3eeef to f143aa1 Compare March 23, 2026 21:33
@michaelklishin michaelklishin merged commit 7b92385 into v4.2.x Mar 23, 2026
296 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.2.x/pr-15810 branch March 23, 2026 22:50
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.

1 participant