Merge branch 'main' into ha-mode-operator-policy

Author: michaelklishin

.github/SECURITY.md

@@ -63,9 +63,9 @@ When VMware products that depend on RabbitMQ are also affected, the disclosure p
 further to allow those projects to ship patch releases.
 
 
-## Tanzu RabbitMQ
+## VMware RabbitMQ
 
-[Tanzu RabbitMQ](https://tanzu.vmware.com/rabbitmq) is covered by the [VMware Security Response Policy](https://www.vmware.com/support/policies/security_response.html).
+[VMware RabbitMQ](https://www.vmware.com/products/rabbitmq.html) is covered by the [VMware Security Response Policy](https://www.vmware.com/support/policies/security_response.html).
 
-Vulnerabilities found in Tanzu RabbitMQ can be reported to the RabbitMQ core team or
+Vulnerabilities found in VMware RabbitMQ can be reported to the RabbitMQ core team or
 via the [VMware Security Response Center](https://www.vmware.com/security/vsrc.html).

.github/workflows/rabbitmq_peer_discovery_aws.yaml

@@ -15,7 +15,7 @@ jobs:
     - name: CHECKOUT REPOSITORY
       uses: actions/checkout@v3
     - name: WAIT FOR OCI IMAGE WORKFLOW
-      uses: lewagon/wait-on-check-action@v1.2.0
+      uses: lewagon/wait-on-check-action@v1.3.1
       with:
         ref: ${{ github.ref }}
         check-name: build-publish-dev-bazel (${{ matrix.image_tag_suffix }}, ${{ matrix.otp_version_id }})

MODULE.bazel

@@ -31,7 +31,7 @@ bazel_dep(
 
 bazel_dep(
     name = "rules_erlang",
-    version = "3.9.3",
+    version = "3.9.5",
 )
 
 erlang_config = use_extension(
@@ -59,8 +59,8 @@ erlang_config.internal_erlang_from_github_release(
 
 erlang_config.internal_erlang_from_github_release(
     name = "25_2",
-    sha256 = "94d5b6b0495050c5ea78a10c02ba3bdb58ce537c2a8869957760e67ec02924bd",
-    version = "25.2.2",
+    sha256 = "f4d9f11d67ba478a053d72e635a44722a975603fe1284063fdf38276366bc61c",
+    version = "25.2.3",
 )
 
 erlang_config.internal_erlang_from_http_archive(

Makefile

@@ -433,7 +433,7 @@ SCRIPTS = rabbitmq-defaults \
 	  rabbitmq-queues \
 	  rabbitmq-upgrade \
 	  rabbitmq-streams \
-		rabbitmq-tanzu
+	  vmware-rabbitmq
 
 AUTOCOMPLETE_SCRIPTS = bash_autocomplete.sh zsh_autocomplete.sh
 
@@ -447,7 +447,7 @@ WINDOWS_SCRIPTS = rabbitmq-defaults.bat \
 		  rabbitmq-service.bat \
 		  rabbitmq-upgrade.bat \
 		  rabbitmq-streams.bat \
-			rabbitmq-tanzu.bat \
+		  vmware-rabbitmq.bat \
 		  rabbitmqctl.bat
 
 UNIX_TO_DOS ?= todos

README.md

@@ -44,7 +44,7 @@ RabbitMQ documentation is also [developed on GitHub](https://github.com/rabbitmq
 
 ## Commercial Features and Support
 
- * [Commercial edition of RabbitMQ](https://tanzu.vmware.com/rabbitmq)
+ * [Commercial edition of RabbitMQ](https://www.vmware.com/products/rabbitmq.html)
  * [Commercial edition for Kubernetes](https://rabbitmq.com/kubernetes/tanzu/installation.html)
  * [Commercial support](https://rabbitmq.com/services.html) from [VMware](https://vmware.com) for open source RabbitMQ
 

WORKSPACE

@@ -4,7 +4,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_r
 git_repository(
     name = "rules_erlang",
     remote = "https://github.com/rabbitmq/rules_erlang.git",
-    tag = "3.9.3",
+    tag = "3.9.5",
 )
 
 load("@rules_erlang//:internal_deps.bzl", "rules_erlang_internal_deps")
@@ -78,9 +78,9 @@ http_file(
 
 http_file(
     name = "otp_src_25_2",
-    downloaded_file_path = "OTP-25.2.2.tar.gz",
-    sha256 = "535e535b2e90e71deca96c53f19710e6ebf3d4289b0a3116e7cf83b7e2c4bb7e",
-    urls = ["https://github.com/erlang/otp/archive/OTP-25.2.2.tar.gz"],
+    downloaded_file_path = "OTP-25.2.3.tar.gz",
+    sha256 = "637bc5cf68dd229fd3c3fe889a6f84dd32c4a827488550a0a98123b00c2d78b5",
+    urls = ["https://github.com/erlang/otp/archive/OTP-25.2.3.tar.gz"],
 )
 
 http_archive(
@@ -116,8 +116,8 @@ erlang_config(
         ),
         internal_erlang_from_github_release(
             name = "25_2",
-            sha256 = "94d5b6b0495050c5ea78a10c02ba3bdb58ce537c2a8869957760e67ec02924bd",
-            version = "25.2.2",
+            sha256 = "f4d9f11d67ba478a053d72e635a44722a975603fe1284063fdf38276366bc61c",
+            version = "25.2.3",
         ),
         internal_erlang_from_http_archive(
             name = "git_master",

bazel/BUILD.accept

@@ -16,48 +16,28 @@ erlc_opts(
 )
 
 erlang_bytecode(
-    name = "ebin_accept_encoding_header_beam",
-    srcs = ["src/accept_encoding_header.erl"],
-    outs = ["ebin/accept_encoding_header.beam"],
-    hdrs = ["include/accept.hrl"],
-    app_name = "accept",
-    erlc_opts = "//:erlc_opts",
-)
-
-erlang_bytecode(
-    name = "ebin_accept_header_beam",
-    srcs = ["src/accept_header.erl"],
-    outs = ["ebin/accept_header.beam"],
-    hdrs = ["include/accept.hrl"],
-    app_name = "accept",
-    erlc_opts = "//:erlc_opts",
-)
-
-erlang_bytecode(
-    name = "ebin_accept_neg_beam",
-    srcs = ["src/accept_neg.erl"],
-    outs = ["ebin/accept_neg.beam"],
-    app_name = "accept",
-    erlc_opts = "//:erlc_opts",
-)
-
-erlang_bytecode(
-    name = "ebin_accept_parser_beam",
-    srcs = ["src/accept_parser.erl"],
-    outs = ["ebin/accept_parser.beam"],
+    name = "other_beam",
+    srcs = [
+        "src/accept_encoding_header.erl",
+        "src/accept_header.erl",
+        "src/accept_neg.erl",
+        "src/accept_parser.erl",
+    ],
+    outs = [
+        "ebin/accept_encoding_header.beam",
+        "ebin/accept_header.beam",
+        "ebin/accept_neg.beam",
+        "ebin/accept_parser.beam",
+    ],
     hdrs = ["include/accept.hrl"],
     app_name = "accept",
+    beam = [],
     erlc_opts = "//:erlc_opts",
 )
 
 filegroup(
     name = "beam_files",
-    srcs = [
-        "ebin/accept_encoding_header.beam",
-        "ebin/accept_header.beam",
-        "ebin/accept_neg.beam",
-        "ebin/accept_parser.beam",
-    ],
+    srcs = [":other_beam"],
 )
 
 filegroup(

bazel/BUILD.aten

@@ -16,64 +16,17 @@ erlc_opts(
 )
 
 erlang_bytecode(
-    name = "ebin_aten_beam",
-    srcs = ["src/aten.erl"],
-    outs = ["ebin/aten.beam"],
-    app_name = "aten",
-    erlc_opts = "//:erlc_opts",
-)
-
-erlang_bytecode(
-    name = "ebin_aten_app_beam",
-    srcs = ["src/aten_app.erl"],
-    outs = ["ebin/aten_app.beam"],
-    app_name = "aten",
-    erlc_opts = "//:erlc_opts",
-)
-
-erlang_bytecode(
-    name = "ebin_aten_detect_beam",
-    srcs = ["src/aten_detect.erl"],
-    outs = ["ebin/aten_detect.beam"],
-    app_name = "aten",
-    erlc_opts = "//:erlc_opts",
-)
-
-erlang_bytecode(
-    name = "ebin_aten_detector_beam",
-    srcs = ["src/aten_detector.erl"],
-    outs = ["ebin/aten_detector.beam"],
-    app_name = "aten",
-    erlc_opts = "//:erlc_opts",
-)
-
-erlang_bytecode(
-    name = "ebin_aten_emitter_beam",
-    srcs = ["src/aten_emitter.erl"],
-    outs = ["ebin/aten_emitter.beam"],
-    app_name = "aten",
-    erlc_opts = "//:erlc_opts",
-)
-
-erlang_bytecode(
-    name = "ebin_aten_sink_beam",
-    srcs = ["src/aten_sink.erl"],
-    outs = ["ebin/aten_sink.beam"],
-    app_name = "aten",
-    erlc_opts = "//:erlc_opts",
-)
-
-erlang_bytecode(
-    name = "ebin_aten_sup_beam",
-    srcs = ["src/aten_sup.erl"],
-    outs = ["ebin/aten_sup.beam"],
-    app_name = "aten",
-    erlc_opts = "//:erlc_opts",
-)
-
-filegroup(
-    name = "beam_files",
+    name = "other_beam",
     srcs = [
+        "src/aten.erl",
+        "src/aten_app.erl",
+        "src/aten_detect.erl",
+        "src/aten_detector.erl",
+        "src/aten_emitter.erl",
+        "src/aten_sink.erl",
+        "src/aten_sup.erl",
+    ],
+    outs = [
         "ebin/aten.beam",
         "ebin/aten_app.beam",
         "ebin/aten_detect.beam",
@@ -82,6 +35,15 @@ filegroup(
         "ebin/aten_sink.beam",
         "ebin/aten_sup.beam",
     ],
+    hdrs = [],
+    app_name = "aten",
+    beam = [],
+    erlc_opts = "//:erlc_opts",
+)
+
+filegroup(
+    name = "beam_files",
+    srcs = [":other_beam"],
 )
 
 filegroup(

bazel/BUILD.base64url

@@ -6,34 +6,36 @@ erlc_opts(
     values = select({
         "@rules_erlang//:debug_build": [
             "+debug_info",
-            "+warn_format",
+            "+warn_bif_clash",
             "+warn_export_vars",
+            "+warn_format",
             "+warn_obsolete_guard",
-            "+warn_bif_clash",
         ],
         "//conditions:default": [
             "+debug_info",
-            "+warn_format",
+            "+deterministic",
+            "+warn_bif_clash",
             "+warn_export_vars",
+            "+warn_format",
             "+warn_obsolete_guard",
-            "+warn_bif_clash",
-            "+deterministic",
         ],
     }),
     visibility = [":__subpackages__"],
 )
 
 erlang_bytecode(
-    name = "ebin_base64url_beam",
+    name = "other_beam",
     srcs = ["src/base64url.erl"],
     outs = ["ebin/base64url.beam"],
+    hdrs = [],
     app_name = "base64url",
+    beam = [],
     erlc_opts = "//:erlc_opts",
 )
 
 filegroup(
     name = "beam_files",
-    srcs = ["ebin/base64url.beam"],
+    srcs = [":other_beam"],
 )
 
 filegroup(