Fix some dialyzer build system errors in make (backport #11014) (#11015)

* Fix some dialyzer build system errors in make (#11014)

* make amqp10_common dialyze green in make

* make rabbitmq_ct_client_helpers dialyze green with make

* fixup rabbitmq_prelaunch path ref

* Cleanup unused dep_* vars

* Fixup xref for rabbitmq_ct_helpers

I could not figure out how to make xref aware of the cli code without
also checking the cli code as well, and reporting additional errors

* remove unused file

* fix make diaylze for rabbitmq_stream_common

* update deps/oauth2_client/Makefile to match Bazel

(cherry picked from commit 4ec33c8)

# Conflicts:
#	deps/amqp10_common/test/serial_number_SUITE.erl

* fixup backport

---------

Co-authored-by: Rin Kuryloski <[email protected]>

Author: mergify[bot]

Makefile

@@ -33,7 +33,7 @@ XREF_SCOPE = app deps
 
 # We add all the applications that are in non-standard paths
 # so they are included in the analyses as well.
-XREF_EXTRA_APP_DIRS = $(filter-out deps/rabbitmq_cli/_build/dev/lib/rabbit_common/,$(wildcard deps/rabbitmq_cli/_build/dev/lib/*/)) deps/rabbit/apps/rabbitmq_prelaunch/
+XREF_EXTRA_APP_DIRS = $(filter-out deps/rabbitmq_cli/_build/dev/lib/rabbit_common/,$(wildcard deps/rabbitmq_cli/_build/dev/lib/*/)) deps/rabbitmq_prelaunch/
 
 # For Elixir protocols the right fix is to include the consolidated/
 # folders in addition to ebin/. However this creates conflicts because

deps/amqp10_common/Makefile

@@ -44,6 +44,8 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
 	      rabbit_common/mk/rabbitmq-test.mk \
 	      rabbit_common/mk/rabbitmq-tools.mk
 
+PLT_APPS = eunit
+
 include rabbitmq-components.mk
 include erlang.mk
 

deps/oauth2_client/Makefile

@@ -2,35 +2,8 @@ PROJECT = oauth2_client
 PROJECT_DESCRIPTION = OAuth2 client from the RabbitMQ Project
 PROJECT_MOD = oauth2_client_app
 
-define PROJECT_APP_EXTRA_KEYS
-%% Hex.pm package informations.
-	{licenses, ["MPL-2.0"]},
-	{links, [
-	    {"Website", "https://www.rabbitmq.com/"},
-	    {"GitHub", "https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/oauth2_client"}
-	  ]},
-	{build_tools, ["make", "rebar3"]},
-	{files, [
-	    $(RABBITMQ_HEXPM_DEFAULT_FILES)
-	  ]}
-endef
-
-define HEX_TARBALL_EXTRA_METADATA
-#{
-	licenses => [<<"MPL-2.0">>],
-	links => #{
-		<<"Website">> => <<"https://www.rabbitmq.com">>,
-		<<"GitHub">> => <<"https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/oauth2_client">>
-	}
-}
-endef
-
-# Release artifacts are put in $(PACKAGES_DIR).
-PACKAGES_DIR ?= $(abspath PACKAGES)
-
-BUILD_DEPS = rabbit_common elvis_mk
-DEPS = cowlib 
-TEST_DEPS = rabbit rabbitmq_ct_helpers cowboy
+DEPS = rabbit rabbit_common
+TEST_DEPS = rabbitmq_ct_helpers cowboy
 LOCAL_DEPS = ssl inets crypto public_key
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-test.mk
@@ -42,36 +15,5 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-macros.mk \
 	      rabbit_common/mk/rabbitmq-test.mk \
 	      rabbit_common/mk/rabbitmq-tools.mk
 
-DEP_PLUGINS += elvis_mk
-dep_elvis_mk = git https://github.com/inaka/elvis.mk.git master
-
 include rabbitmq-components.mk
 include erlang.mk
-
-HEX_TARBALL_FILES += rabbitmq-components.mk \
-		     git-revisions.txt
-
-# --------------------------------------------------------------------
-# Compiler flags.
-# --------------------------------------------------------------------
-
-# gen_fsm is deprecated starting from Erlang 20, but we want to support
-# Erlang 19 as well.
-
-ERTS_VER := $(shell erl -version 2>&1 | sed -E 's/.* version //')
-ERLANG_20_ERTS_VER := 9.0
-
-ifeq ($(call compare_version,$(ERTS_VER),$(ERLANG_20_ERTS_VER),>=),true)
-ERLC_OPTS += -Dnowarn_deprecated_gen_fsm
-endif
-
-# Dialyze the tests.
-DIALYZER_OPTS += --src -r test
-
-# --------------------------------------------------------------------
-# ActiveMQ for the testsuite.
-# --------------------------------------------------------------------
-
-tests:: $(ACTIVEMQ)
-
-ct ct-system: $(ACTIVEMQ)

deps/rabbitmq_ct_client_helpers/Makefile

@@ -6,5 +6,7 @@ DEPS = rabbit_common rabbitmq_ct_helpers amqp_client
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
 	      rabbit_common/mk/rabbitmq-tools.mk
 
+PLT_APPS = common_test
+
 include ../../rabbitmq-components.mk
 include ../../erlang.mk

deps/rabbitmq_ct_helpers/Makefile

@@ -4,8 +4,10 @@ PROJECT_DESCRIPTION = Common Test helpers for RabbitMQ
 DEPS = rabbit_common proper inet_tcp_proxy meck
 TEST_DEPS = rabbit
 
-dep_rabbit_common  = git-subfolder https://github.com/rabbitmq/rabbitmq-server main deps/rabbit_common
-dep_rabbit         = git-subfolder https://github.com/rabbitmq/rabbitmq-server main deps/rabbit
+XREF_IGNORE = [ \
+    {'Elixir.OptionParser',split,1}, \
+    {'Elixir.RabbitMQCtl',exec_command,2}]
+
 dep_inet_tcp_proxy = git https://github.com/rabbitmq/inet_tcp_proxy master
 
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \

deps/rabbitmq_ct_helpers/WORKSPACE.bazel

@@ -10,6 +10,8 @@ endef
 DEPS =
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
 
+PLT_APPS = osiris
+
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk