Merge pull request #10546 from rabbitmq/fix-gazelle-oauth2

bazel run gazelle with edits to reduce the noise around (the generated) OAuth 2 dependency lists

Author: michaelklishin

deps/oauth2_client/BUILD.bazel

@@ -56,7 +56,7 @@ rabbitmq_app(
     hdrs = [":public_hdrs"],
     app_description = APP_DESCRIPTION,
     app_extra_keys = APP_EXTRA_KEYS,
-#    app_module = APP_MODULE,
+    #    app_module = APP_MODULE,
     app_name = APP_NAME,
     beam_files = [":beam_files"],
     extra_apps = [
@@ -69,6 +69,7 @@ rabbitmq_app(
     priv = [":priv"],
     deps = [
         "//deps/rabbit:erlang_app",
+        "//deps/rabbit_common:erlang_app",
     ],
 )
 

deps/oauth2_client/app.bzl

@@ -8,11 +8,9 @@ def all_beam_files(name = "all_beam_files"):
     )
     erlang_bytecode(
         name = "other_beam",
-        srcs = [
-            "src/oauth2_client.erl",
-        ],
+        srcs = ["src/oauth2_client.erl"],
         hdrs = [":public_and_private_hdrs"],
-        app_name = "rabbitmq_oauth2_client",
+        app_name = "oauth2_client",
         dest = "ebin",
         erlc_opts = "//:erlc_opts",
     )
@@ -26,11 +24,9 @@ def all_test_beam_files(name = "all_test_beam_files"):
     erlang_bytecode(
         name = "test_other_beam",
         testonly = True,
-        srcs = [
-            "src/oauth2_client.erl",
-        ],
+        srcs = ["src/oauth2_client.erl"],
         hdrs = [":public_and_private_hdrs"],
-        app_name = "rabbitmq_oauth2_client",
+        app_name = "oauth2_client",
         dest = "test",
         erlc_opts = "//:test_erlc_opts",
     )
@@ -50,9 +46,7 @@ def all_srcs(name = "all_srcs"):
 
     filegroup(
         name = "srcs",
-        srcs = [
-            "src/oauth2_client.erl",
-        ],
+        srcs = ["src/oauth2_client.erl"],
     )
     filegroup(
         name = "private_hdrs",
@@ -69,14 +63,13 @@ def all_srcs(name = "all_srcs"):
         ],
     )
 
-
 def test_suite_beam_files(name = "test_suite_beam_files"):
     erlang_bytecode(
         name = "test_oauth_http_mock_beam",
         testonly = True,
         srcs = ["test/oauth_http_mock.erl"],
         outs = ["test/oauth_http_mock.beam"],
-        app_name = "rabbitmq_oauth2_client",
+        app_name = "oauth2_client",
         erlc_opts = "//:test_erlc_opts",
     )
     erlang_bytecode(
@@ -85,6 +78,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         srcs = ["test/system_SUITE.erl"],
         outs = ["test/system_SUITE.beam"],
         hdrs = ["include/oauth2_client.hrl"],
-        app_name = "rabbitmq_oauth2_client",
+        app_name = "oauth2_client",
         erlc_opts = "//:test_erlc_opts",
     )

deps/rabbitmq_auth_backend_oauth2/BUILD.bazel

@@ -46,11 +46,11 @@ rabbitmq_app(
     license_files = [":license_files"],
     priv = [":priv"],
     deps = [
+        "//deps/oauth2_client:erlang_app",
         "//deps/rabbit:erlang_app",
         "@base64url//:erlang_app",
         "@cowlib//:erlang_app",
-        "@jose//:erlang_app",
-        "//deps/oauth2_client:erlang_app",
+        "@jose//:erlang_app"
     ],
 )
 
@@ -86,12 +86,11 @@ eunit(
         ":test_openid_http_handler_beam",
         ":test_jwks_http_sup_beam",
         ":test_rabbit_auth_backend_oauth2_test_util_beam",
-        ":test_oauth2_http_mock_beam"
+        ":test_oauth2_http_mock_beam",
     ],
     target = ":test_erlang_app",
 )
 
-
 broker_for_integration_suites(
     extra_plugins = [
         "//deps/rabbitmq_mqtt:erlang_app",
@@ -144,16 +143,15 @@ rabbitmq_suite(
     ],
 )
 
-
 rabbitmq_integration_suite(
     name = "system_SUITE",
     size = "medium",
     additional_beam = [
         "test/rabbit_auth_backend_oauth2_test_util.beam",
     ],
     runtime_deps = [
-        "@emqtt//:erlang_app",
         "//deps/oauth2_client:erlang_app",
+        "@emqtt//:erlang_app",
     ],
 )
 

deps/rabbitmq_auth_backend_oauth2/app.bzl

@@ -26,9 +26,9 @@ def all_beam_files(name = "all_beam_files"):
         dest = "ebin",
         erlc_opts = "//:erlc_opts",
         deps = [
+            "//deps/oauth2_client:erlang_app",
             "//deps/rabbit_common:erlang_app",
             "//deps/rabbitmq_cli:erlang_app",
-            "//deps/oauth2_client:erlang_app",
             "@jose//:erlang_app",
         ],
     )
@@ -60,10 +60,10 @@ def all_test_beam_files(name = "all_test_beam_files"):
         dest = "test",
         erlc_opts = "//:test_erlc_opts",
         deps = [
+            "//deps/oauth2_client:erlang_app",
             "//deps/rabbit_common:erlang_app",
             "//deps/rabbitmq_cli:erlang_app",
             "@jose//:erlang_app",
-            "//deps/oauth2_client:erlang_app",
         ],
     )
 
@@ -118,7 +118,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         testonly = True,
         srcs = ["test/oauth2_http_mock.erl"],
         outs = ["test/oauth2_http_mock.beam"],
-        app_name = "rabbitmq_oauth2_client",
+        app_name = "rabbitmq_auth_backend_oauth2",
         erlc_opts = "//:test_erlc_opts",
     )
     erlang_bytecode(
@@ -163,7 +163,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/system_SUITE.beam"],
         app_name = "rabbitmq_auth_backend_oauth2",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app","//deps/oauth2_client:erlang_app"],
+        deps = ["//deps/amqp_client:erlang_app"],
     )
     erlang_bytecode(
         name = "test_jwks_http_app_beam",

deps/rabbitmq_cli/BUILD.bazel

@@ -109,24 +109,17 @@ rabbitmqctl_compile_warnings_as_errors_test(
         "lib/**/*.ex",
         "test/**/*.exs",
     ]),
-    data = glob(["test/fixtures/**/*"]),
     archives = [
         "@hex//:archive",
     ],
+    data = glob(["test/fixtures/**/*"]),
     source_deps = {
         "@amqp//:sources": "amqp",
         "@csv//:sources": "csv",
         "@json//:sources": "json",
         "@temp//:sources": "temp",
         "@x509//:sources": "x509",
     },
-    deps = [
-        "//deps/amqp_client:erlang_app",
-        "//deps/rabbit:erlang_app",
-        "//deps/rabbit_common:erlang_app",
-        "@observer_cli//:erlang_app",
-        "@stdout_formatter//:erlang_app",
-    ],
     target_compatible_with = select({
         "@platforms//os:macos": [
             "@platforms//os:macos",
@@ -137,6 +130,13 @@ rabbitmqctl_compile_warnings_as_errors_test(
             "@elixir_config//:elixir_1_15",
         ],
     }),
+    deps = [
+        "//deps/amqp_client:erlang_app",
+        "//deps/rabbit:erlang_app",
+        "//deps/rabbit_common:erlang_app",
+        "@observer_cli//:erlang_app",
+        "@stdout_formatter//:erlang_app",
+    ],
 )
 
 test_suite(

deps/rabbitmq_management/BUILD.bazel

@@ -82,14 +82,14 @@ rabbitmq_app(
     priv = [":priv"],
     deps = [
         "//deps/amqp_client:erlang_app",
+        "//deps/oauth2_client:erlang_app",
         "//deps/rabbit:erlang_app",
         "//deps/rabbit_common:erlang_app",
         "//deps/rabbitmq_management_agent:erlang_app",
         "//deps/rabbitmq_web_dispatch:erlang_app",
         "@cowboy//:erlang_app",
         "@cowlib//:erlang_app",
         "@ranch//:erlang_app",
-        "//deps/oauth2_client:erlang_app",
     ],
 )
 

deps/rabbitmq_management/app.bzl

@@ -124,10 +124,10 @@ def all_beam_files(name = "all_beam_files"):
         erlc_opts = "//:erlc_opts",
         deps = [
             "//deps/amqp_client:erlang_app",
+            "//deps/oauth2_client:erlang_app",
             "//deps/rabbit:erlang_app",
             "//deps/rabbit_common:erlang_app",
             "//deps/rabbitmq_management_agent:erlang_app",
-            "//deps/oauth2_client:erlang_app",
         ],
     )
 
@@ -257,10 +257,10 @@ def all_test_beam_files(name = "all_test_beam_files"):
         erlc_opts = "//:test_erlc_opts",
         deps = [
             "//deps/amqp_client:erlang_app",
+            "//deps/oauth2_client:erlang_app",
             "//deps/rabbit:erlang_app",
             "//deps/rabbit_common:erlang_app",
             "//deps/rabbitmq_management_agent:erlang_app",
-            "//deps/oauth2_client:erlang_app",
         ],
     )
 

deps/rabbitmq_shovel/BUILD.bazel

@@ -169,12 +169,12 @@ rabbitmq_integration_suite(
     additional_beam = [
         "test/shovel_test_utils.beam",
     ],
-    deps = [
-        "@khepri//:erlang_app",
-    ],
     # FIXME: As of this writing, there is a bug in Khepri that makes this
     # testsuite unstable.
     flaky = True,
+    deps = [
+        "@khepri//:erlang_app",
+    ],
 )
 
 rabbitmq_integration_suite(

moduleindex.yaml

@@ -481,7 +481,6 @@ neotoma:
 - neotoma_parse
 oauth2_client:
 - oauth2_client
-- oauth2_client_app
 observer_cli:
 - observer_cli
 - observer_cli_application
@@ -957,6 +956,7 @@ rabbitmq_auth_backend_ldap:
 - rabbit_auth_backend_ldap_util
 - rabbit_log_ldap
 rabbitmq_auth_backend_oauth2:
+- Elixir.RabbitMQ.CLI.Ctl.Commands.AddSigningKeyCommand
 - Elixir.RabbitMQ.CLI.Ctl.Commands.AddUaaKeyCommand
 - rabbit_auth_backend_oauth2
 - rabbit_auth_backend_oauth2_app