Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use gazelle for some maintenance of bazel BUILD files (backport #6466) #7931

Merged
merged 2 commits into from
Apr 19, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 19, 2023

This is an automatic backport of pull request #6466 done by Mergify.
Cherry-pick of 8de8f59 has failed:

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

You are currently cherry-picking commit 8de8f59d47.
  (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:   BAZEL.md
	modified:   BUILD.bazel
	modified:   bazel/BUILD.eetcd
	modified:   deps/amqp10_client/BUILD.bazel
	new file:   deps/amqp10_client/app.bzl
	modified:   deps/amqp10_client/test/mock_server.erl
	modified:   deps/amqp10_client/test/system_SUITE.erl
	modified:   deps/amqp10_common/BUILD.bazel
	new file:   deps/amqp10_common/app.bzl
	modified:   deps/amqp_client/BUILD.bazel
	modified:   deps/amqp_client/Makefile
	new file:   deps/amqp_client/app.bzl
	new file:   deps/rabbit/app.bzl
	modified:   deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel
	new file:   deps/rabbit/apps/rabbitmq_prelaunch/app.bzl
	modified:   deps/rabbit/test/feature_flags_SUITE_data/my_plugin/BUILD.bazel
	modified:   deps/rabbit/test/rabbit_fifo_SUITE.erl
	modified:   deps/rabbit/test/rabbit_fifo_dlx_SUITE.erl
	modified:   deps/rabbit/test/rabbit_fifo_prop_SUITE.erl
	modified:   deps/rabbit/test/rabbit_fifo_v0_SUITE.erl
	modified:   deps/rabbit/test/rabbit_stream_coordinator_SUITE.erl
	modified:   deps/rabbit/test/rabbit_stream_sac_coordinator_SUITE.erl
	modified:   deps/rabbit_common/BUILD.bazel
	new file:   deps/rabbit_common/app.bzl
	modified:   deps/rabbitmq_amqp1_0/BUILD.bazel
	new file:   deps/rabbitmq_amqp1_0/app.bzl
	modified:   deps/rabbitmq_auth_backend_cache/BUILD.bazel
	new file:   deps/rabbitmq_auth_backend_cache/app.bzl
	modified:   deps/rabbitmq_auth_backend_http/BUILD.bazel
	new file:   deps/rabbitmq_auth_backend_http/app.bzl
	modified:   deps/rabbitmq_auth_backend_ldap/BUILD.bazel
	new file:   deps/rabbitmq_auth_backend_ldap/app.bzl
	modified:   deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
	new file:   deps/rabbitmq_auth_backend_oauth2/app.bzl
	modified:   deps/rabbitmq_auth_mechanism_ssl/BUILD.bazel
	new file:   deps/rabbitmq_auth_mechanism_ssl/app.bzl
	modified:   deps/rabbitmq_aws/BUILD.bazel
	new file:   deps/rabbitmq_aws/app.bzl
	renamed:    deps/rabbitmq_aws/test/src/rabbitmq_aws_all_tests.erl -> deps/rabbitmq_aws/test/rabbitmq_aws_all_tests.erl
	renamed:    deps/rabbitmq_aws/test/src/rabbitmq_aws_app_tests.erl -> deps/rabbitmq_aws/test/rabbitmq_aws_app_tests.erl
	renamed:    deps/rabbitmq_aws/test/src/rabbitmq_aws_config_tests.erl -> deps/rabbitmq_aws/test/rabbitmq_aws_config_tests.erl
	renamed:    deps/rabbitmq_aws/test/src/rabbitmq_aws_json_tests.erl -> deps/rabbitmq_aws/test/rabbitmq_aws_json_tests.erl
	renamed:    deps/rabbitmq_aws/test/src/rabbitmq_aws_sign_tests.erl -> deps/rabbitmq_aws/test/rabbitmq_aws_sign_tests.erl
	renamed:    deps/rabbitmq_aws/test/src/rabbitmq_aws_sup_tests.erl -> deps/rabbitmq_aws/test/rabbitmq_aws_sup_tests.erl
	renamed:    deps/rabbitmq_aws/test/src/rabbitmq_aws_tests.erl -> deps/rabbitmq_aws/test/rabbitmq_aws_tests.erl
	renamed:    deps/rabbitmq_aws/test/src/rabbitmq_aws_urilib_tests.erl -> deps/rabbitmq_aws/test/rabbitmq_aws_urilib_tests.erl
	renamed:    deps/rabbitmq_aws/test/src/rabbitmq_aws_xml_tests.erl -> deps/rabbitmq_aws/test/rabbitmq_aws_xml_tests.erl
	renamed:    deps/rabbitmq_aws/test/src/test_aws_config.ini -> deps/rabbitmq_aws/test/test_aws_config.ini
	renamed:    deps/rabbitmq_aws/test/src/test_aws_credentials.ini -> deps/rabbitmq_aws/test/test_aws_credentials.ini
	modified:   deps/rabbitmq_cli/rabbitmqctl.bzl
	modified:   deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
	new file:   deps/rabbitmq_consistent_hash_exchange/app.bzl
	modified:   deps/rabbitmq_ct_client_helpers/BUILD.bazel
	new file:   deps/rabbitmq_ct_client_helpers/app.bzl
	modified:   deps/rabbitmq_ct_helpers/BUILD.bazel
	new file:   deps/rabbitmq_ct_helpers/app.bzl
	modified:   deps/rabbitmq_ct_helpers/src/rabbit_ct_helpers.erl
	modified:   deps/rabbitmq_event_exchange/BUILD.bazel
	new file:   deps/rabbitmq_event_exchange/app.bzl
	modified:   deps/rabbitmq_federation/BUILD.bazel
	new file:   deps/rabbitmq_federation/app.bzl
	modified:   deps/rabbitmq_federation_management/BUILD.bazel
	new file:   deps/rabbitmq_federation_management/app.bzl
	modified:   deps/rabbitmq_jms_topic_exchange/BUILD.bazel
	new file:   deps/rabbitmq_jms_topic_exchange/app.bzl
	modified:   deps/rabbitmq_management/BUILD.bazel
	new file:   deps/rabbitmq_management/app.bzl
	modified:   deps/rabbitmq_management_agent/BUILD.bazel
	new file:   deps/rabbitmq_management_agent/app.bzl
	modified:   deps/rabbitmq_mqtt/BUILD.bazel
	new file:   deps/rabbitmq_mqtt/app.bzl
	modified:   deps/rabbitmq_peer_discovery_aws/BUILD.bazel
	new file:   deps/rabbitmq_peer_discovery_aws/app.bzl
	modified:   deps/rabbitmq_peer_discovery_common/BUILD.bazel
	new file:   deps/rabbitmq_peer_discovery_common/app.bzl
	modified:   deps/rabbitmq_peer_discovery_consul/BUILD.bazel
	new file:   deps/rabbitmq_peer_discovery_consul/app.bzl
	modified:   deps/rabbitmq_peer_discovery_etcd/BUILD.bazel
	new file:   deps/rabbitmq_peer_discovery_etcd/app.bzl
	modified:   deps/rabbitmq_peer_discovery_k8s/BUILD.bazel
	new file:   deps/rabbitmq_peer_discovery_k8s/app.bzl
	modified:   deps/rabbitmq_prometheus/BUILD.bazel
	new file:   deps/rabbitmq_prometheus/app.bzl
	modified:   deps/rabbitmq_random_exchange/BUILD.bazel
	new file:   deps/rabbitmq_random_exchange/app.bzl
	modified:   deps/rabbitmq_recent_history_exchange/BUILD.bazel
	new file:   deps/rabbitmq_recent_history_exchange/app.bzl
	modified:   deps/rabbitmq_sharding/BUILD.bazel
	new file:   deps/rabbitmq_sharding/app.bzl
	modified:   deps/rabbitmq_shovel/BUILD.bazel
	new file:   deps/rabbitmq_shovel/app.bzl
	modified:   deps/rabbitmq_shovel_management/BUILD.bazel
	new file:   deps/rabbitmq_shovel_management/app.bzl
	modified:   deps/rabbitmq_shovel_management/src/rabbit_shovel_mgmt.erl
	modified:   deps/rabbitmq_shovel_management/src/rabbit_shovel_mgmt_util.erl
	modified:   deps/rabbitmq_stomp/BUILD.bazel
	new file:   deps/rabbitmq_stomp/app.bzl
	modified:   deps/rabbitmq_stream/BUILD.bazel
	new file:   deps/rabbitmq_stream/app.bzl
	modified:   deps/rabbitmq_stream_common/BUILD.bazel
	new file:   deps/rabbitmq_stream_common/app.bzl
	modified:   deps/rabbitmq_stream_management/BUILD.bazel
	new file:   deps/rabbitmq_stream_management/app.bzl
	modified:   deps/rabbitmq_top/BUILD.bazel
	new file:   deps/rabbitmq_top/app.bzl
	modified:   deps/rabbitmq_tracing/BUILD.bazel
	new file:   deps/rabbitmq_tracing/app.bzl
	modified:   deps/rabbitmq_trust_store/BUILD.bazel
	new file:   deps/rabbitmq_trust_store/app.bzl
	modified:   deps/rabbitmq_web_dispatch/BUILD.bazel
	new file:   deps/rabbitmq_web_dispatch/app.bzl
	modified:   deps/rabbitmq_web_mqtt/BUILD.bazel
	new file:   deps/rabbitmq_web_mqtt/app.bzl
	modified:   deps/rabbitmq_web_mqtt_examples/BUILD.bazel
	new file:   deps/rabbitmq_web_mqtt_examples/app.bzl
	modified:   deps/rabbitmq_web_stomp/BUILD.bazel
	new file:   deps/rabbitmq_web_stomp/app.bzl
	modified:   deps/rabbitmq_web_stomp_examples/BUILD.bazel
	new file:   deps/rabbitmq_web_stomp_examples/app.bzl
	modified:   deps/trust_store_http/BUILD.bazel
	new file:   deps/trust_store_http/app.bzl
	modified:   dist.bzl
	modified:   moduleindex.yaml
	modified:   rabbitmq.bzl
	modified:   rabbitmq_home.bzl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/BUILD.bazel

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Bazel build files are now maintained primarily with `bazel run
gazelle`. This will analyze and merge changes into the build files as
necessitated by certain code changes (e.g. the introduction of new
modules).

In some cases there hints to gazelle in the build files, such as `#
gazelle:erlang...` or `# keep` comments. xref checks on plugins that
depend on the cli are a good example.

(cherry picked from commit 8de8f59)

# Conflicts:
#	deps/rabbit/BUILD.bazel
@michaelklishin michaelklishin merged commit 5f9fc67 into v3.12.x Apr 19, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.12.x/pr-6466 branch April 19, 2023 09:43
HoloRin added a commit that referenced this pull request Apr 20, 2023
… (backport #7931) (#7936)

* Use gazelle generated bazel files

Bazel build files are now maintained primarily with `bazel run
gazelle`. This will analyze and merge changes into the build files as
necessitated by certain code changes (e.g. the introduction of new
modules).

In some cases there hints to gazelle in the build files, such as `#
gazelle:erlang...` or `# keep` comments. xref checks on plugins that
depend on the cli are a good example.

(cherry picked from commit 8de8f59)

# Conflicts:
#	deps/rabbit/BUILD.bazel
(cherry picked from commit 2aaf217)

# Conflicts:
#	BUILD.bazel
#	deps/amqp10_client/BUILD.bazel
#	deps/amqp_client/BUILD.bazel
#	deps/rabbit/BUILD.bazel
#	deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel
#	deps/rabbit_common/BUILD.bazel
#	deps/rabbitmq_amqp1_0/BUILD.bazel
#	deps/rabbitmq_auth_backend_cache/BUILD.bazel
#	deps/rabbitmq_auth_backend_http/BUILD.bazel
#	deps/rabbitmq_auth_backend_ldap/BUILD.bazel
#	deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
#	deps/rabbitmq_auth_mechanism_ssl/BUILD.bazel
#	deps/rabbitmq_aws/BUILD.bazel
#	deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
#	deps/rabbitmq_ct_client_helpers/BUILD.bazel
#	deps/rabbitmq_ct_helpers/BUILD.bazel
#	deps/rabbitmq_event_exchange/BUILD.bazel
#	deps/rabbitmq_federation/BUILD.bazel
#	deps/rabbitmq_federation_management/BUILD.bazel
#	deps/rabbitmq_jms_topic_exchange/BUILD.bazel
#	deps/rabbitmq_management/BUILD.bazel
#	deps/rabbitmq_management_agent/BUILD.bazel
#	deps/rabbitmq_mqtt/BUILD.bazel
#	deps/rabbitmq_peer_discovery_aws/BUILD.bazel
#	deps/rabbitmq_peer_discovery_common/BUILD.bazel
#	deps/rabbitmq_peer_discovery_consul/BUILD.bazel
#	deps/rabbitmq_peer_discovery_etcd/BUILD.bazel
#	deps/rabbitmq_peer_discovery_k8s/BUILD.bazel
#	deps/rabbitmq_prometheus/BUILD.bazel
#	deps/rabbitmq_random_exchange/BUILD.bazel
#	deps/rabbitmq_recent_history_exchange/BUILD.bazel
#	deps/rabbitmq_sharding/BUILD.bazel
#	deps/rabbitmq_shovel/BUILD.bazel
#	deps/rabbitmq_shovel_management/BUILD.bazel
#	deps/rabbitmq_stomp/BUILD.bazel
#	deps/rabbitmq_stream/BUILD.bazel
#	deps/rabbitmq_stream_common/BUILD.bazel
#	deps/rabbitmq_stream_management/BUILD.bazel
#	deps/rabbitmq_top/BUILD.bazel
#	deps/rabbitmq_tracing/BUILD.bazel
#	deps/rabbitmq_trust_store/BUILD.bazel
#	deps/rabbitmq_web_dispatch/BUILD.bazel
#	deps/rabbitmq_web_mqtt/BUILD.bazel
#	deps/rabbitmq_web_mqtt_examples/BUILD.bazel
#	deps/rabbitmq_web_stomp/BUILD.bazel
#	deps/rabbitmq_web_stomp_examples/BUILD.bazel
#	rabbitmq.bzl

* rabbit/BUILD.bazel: resolve conflicts, bazel run gazelle

(cherry picked from commit c1c450b)

* Resolve merge conflicts

* Resolve merge conflicts: maybe expression

* bazel run gazelle

* Resolve conflicts: ignore_warnings not yet available on plt rule

* Resolve more conflicts

* Re-run `bazel run gazelle`

* Delete non-existent suites

* bazel run gazelle with pre-release gazelle

* Ignore warnings for mqtt dialyze again

as they were never fixed on this branch

* Add missing test helpers

* Run bazel run gazelle

* Restore the original -include_lib statements from before #6466

since this broke erlang_ls

requires rules_erlang 3.9.13

(cherry picked from commit 854d01d)

---------

Co-authored-by: Rin Kuryloski <[email protected]>
Co-authored-by: Michael Klishin <[email protected]>
mergify bot added a commit that referenced this pull request Apr 20, 2023
… (backport #7931) (#7936)

* Use gazelle generated bazel files

Bazel build files are now maintained primarily with `bazel run
gazelle`. This will analyze and merge changes into the build files as
necessitated by certain code changes (e.g. the introduction of new
modules).

In some cases there hints to gazelle in the build files, such as `#
gazelle:erlang...` or `# keep` comments. xref checks on plugins that
depend on the cli are a good example.

(cherry picked from commit 8de8f59)

# Conflicts:
#	deps/rabbit/BUILD.bazel
(cherry picked from commit 2aaf217)

# Conflicts:
#	BUILD.bazel
#	deps/amqp10_client/BUILD.bazel
#	deps/amqp_client/BUILD.bazel
#	deps/rabbit/BUILD.bazel
#	deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel
#	deps/rabbit_common/BUILD.bazel
#	deps/rabbitmq_amqp1_0/BUILD.bazel
#	deps/rabbitmq_auth_backend_cache/BUILD.bazel
#	deps/rabbitmq_auth_backend_http/BUILD.bazel
#	deps/rabbitmq_auth_backend_ldap/BUILD.bazel
#	deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
#	deps/rabbitmq_auth_mechanism_ssl/BUILD.bazel
#	deps/rabbitmq_aws/BUILD.bazel
#	deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
#	deps/rabbitmq_ct_client_helpers/BUILD.bazel
#	deps/rabbitmq_ct_helpers/BUILD.bazel
#	deps/rabbitmq_event_exchange/BUILD.bazel
#	deps/rabbitmq_federation/BUILD.bazel
#	deps/rabbitmq_federation_management/BUILD.bazel
#	deps/rabbitmq_jms_topic_exchange/BUILD.bazel
#	deps/rabbitmq_management/BUILD.bazel
#	deps/rabbitmq_management_agent/BUILD.bazel
#	deps/rabbitmq_mqtt/BUILD.bazel
#	deps/rabbitmq_peer_discovery_aws/BUILD.bazel
#	deps/rabbitmq_peer_discovery_common/BUILD.bazel
#	deps/rabbitmq_peer_discovery_consul/BUILD.bazel
#	deps/rabbitmq_peer_discovery_etcd/BUILD.bazel
#	deps/rabbitmq_peer_discovery_k8s/BUILD.bazel
#	deps/rabbitmq_prometheus/BUILD.bazel
#	deps/rabbitmq_random_exchange/BUILD.bazel
#	deps/rabbitmq_recent_history_exchange/BUILD.bazel
#	deps/rabbitmq_sharding/BUILD.bazel
#	deps/rabbitmq_shovel/BUILD.bazel
#	deps/rabbitmq_shovel_management/BUILD.bazel
#	deps/rabbitmq_stomp/BUILD.bazel
#	deps/rabbitmq_stream/BUILD.bazel
#	deps/rabbitmq_stream_common/BUILD.bazel
#	deps/rabbitmq_stream_management/BUILD.bazel
#	deps/rabbitmq_top/BUILD.bazel
#	deps/rabbitmq_tracing/BUILD.bazel
#	deps/rabbitmq_trust_store/BUILD.bazel
#	deps/rabbitmq_web_dispatch/BUILD.bazel
#	deps/rabbitmq_web_mqtt/BUILD.bazel
#	deps/rabbitmq_web_mqtt_examples/BUILD.bazel
#	deps/rabbitmq_web_stomp/BUILD.bazel
#	deps/rabbitmq_web_stomp_examples/BUILD.bazel
#	rabbitmq.bzl

* rabbit/BUILD.bazel: resolve conflicts, bazel run gazelle

(cherry picked from commit c1c450b)

* Resolve merge conflicts

* Resolve merge conflicts: maybe expression

* bazel run gazelle

* Resolve conflicts: ignore_warnings not yet available on plt rule

* Resolve more conflicts

* Re-run `bazel run gazelle`

* Delete non-existent suites

* bazel run gazelle with pre-release gazelle

* Ignore warnings for mqtt dialyze again

as they were never fixed on this branch

* Add missing test helpers

* Run bazel run gazelle

* Restore the original -include_lib statements from before #6466

since this broke erlang_ls

requires rules_erlang 3.9.13

(cherry picked from commit 854d01d)

---------

Co-authored-by: Rin Kuryloski <[email protected]>
Co-authored-by: Michael Klishin <[email protected]>
(cherry picked from commit e7f08df)

# Conflicts:
#	deps/rabbit/BUILD.bazel
#	deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel
#	deps/rabbit_common/BUILD.bazel
#	deps/rabbitmq_aws/BUILD.bazel
#	deps/rabbitmq_shovel/BUILD.bazel
#	deps/rabbitmq_shovel_management/BUILD.bazel
#	deps/rabbitmq_stream/BUILD.bazel
#	deps/rabbitmq_stream_management/BUILD.bazel
#	moduleindex.yaml
michaelklishin added a commit that referenced this pull request Apr 24, 2023
if the input is given as a map.

References #7931, #7921
michaelklishin added a commit that referenced this pull request Apr 24, 2023
if the input is given as a map.

References #7931, #7921
mergify bot pushed a commit that referenced this pull request Apr 24, 2023
if the input is given as a map.

References #7931, #7921

(cherry picked from commit ddf7926)
HoloRin pushed a commit that referenced this pull request Apr 25, 2023
… (backport #7931) (#7936)

* Use gazelle generated bazel files

Bazel build files are now maintained primarily with `bazel run
gazelle`. This will analyze and merge changes into the build files as
necessitated by certain code changes (e.g. the introduction of new
modules).

In some cases there hints to gazelle in the build files, such as `#
gazelle:erlang...` or `# keep` comments. xref checks on plugins that
depend on the cli are a good example.

(cherry picked from commit 8de8f59)

# Conflicts:
#	deps/rabbit/BUILD.bazel
(cherry picked from commit 2aaf217)

# Conflicts:
#	BUILD.bazel
#	deps/amqp10_client/BUILD.bazel
#	deps/amqp_client/BUILD.bazel
#	deps/rabbit/BUILD.bazel
#	deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel
#	deps/rabbit_common/BUILD.bazel
#	deps/rabbitmq_amqp1_0/BUILD.bazel
#	deps/rabbitmq_auth_backend_cache/BUILD.bazel
#	deps/rabbitmq_auth_backend_http/BUILD.bazel
#	deps/rabbitmq_auth_backend_ldap/BUILD.bazel
#	deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
#	deps/rabbitmq_auth_mechanism_ssl/BUILD.bazel
#	deps/rabbitmq_aws/BUILD.bazel
#	deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
#	deps/rabbitmq_ct_client_helpers/BUILD.bazel
#	deps/rabbitmq_ct_helpers/BUILD.bazel
#	deps/rabbitmq_event_exchange/BUILD.bazel
#	deps/rabbitmq_federation/BUILD.bazel
#	deps/rabbitmq_federation_management/BUILD.bazel
#	deps/rabbitmq_jms_topic_exchange/BUILD.bazel
#	deps/rabbitmq_management/BUILD.bazel
#	deps/rabbitmq_management_agent/BUILD.bazel
#	deps/rabbitmq_mqtt/BUILD.bazel
#	deps/rabbitmq_peer_discovery_aws/BUILD.bazel
#	deps/rabbitmq_peer_discovery_common/BUILD.bazel
#	deps/rabbitmq_peer_discovery_consul/BUILD.bazel
#	deps/rabbitmq_peer_discovery_etcd/BUILD.bazel
#	deps/rabbitmq_peer_discovery_k8s/BUILD.bazel
#	deps/rabbitmq_prometheus/BUILD.bazel
#	deps/rabbitmq_random_exchange/BUILD.bazel
#	deps/rabbitmq_recent_history_exchange/BUILD.bazel
#	deps/rabbitmq_sharding/BUILD.bazel
#	deps/rabbitmq_shovel/BUILD.bazel
#	deps/rabbitmq_shovel_management/BUILD.bazel
#	deps/rabbitmq_stomp/BUILD.bazel
#	deps/rabbitmq_stream/BUILD.bazel
#	deps/rabbitmq_stream_common/BUILD.bazel
#	deps/rabbitmq_stream_management/BUILD.bazel
#	deps/rabbitmq_top/BUILD.bazel
#	deps/rabbitmq_tracing/BUILD.bazel
#	deps/rabbitmq_trust_store/BUILD.bazel
#	deps/rabbitmq_web_dispatch/BUILD.bazel
#	deps/rabbitmq_web_mqtt/BUILD.bazel
#	deps/rabbitmq_web_mqtt_examples/BUILD.bazel
#	deps/rabbitmq_web_stomp/BUILD.bazel
#	deps/rabbitmq_web_stomp_examples/BUILD.bazel
#	rabbitmq.bzl

* rabbit/BUILD.bazel: resolve conflicts, bazel run gazelle

(cherry picked from commit c1c450b)

* Resolve merge conflicts

* Resolve merge conflicts: maybe expression

* bazel run gazelle

* Resolve conflicts: ignore_warnings not yet available on plt rule

* Resolve more conflicts

* Re-run `bazel run gazelle`

* Delete non-existent suites

* bazel run gazelle with pre-release gazelle

* Ignore warnings for mqtt dialyze again

as they were never fixed on this branch

* Add missing test helpers

* Run bazel run gazelle

* Restore the original -include_lib statements from before #6466

since this broke erlang_ls

requires rules_erlang 3.9.13

(cherry picked from commit 854d01d)

---------

Co-authored-by: Rin Kuryloski <[email protected]>
Co-authored-by: Michael Klishin <[email protected]>
(cherry picked from commit e7f08df)

# Conflicts:
#	deps/rabbit/BUILD.bazel
#	deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel
#	deps/rabbit_common/BUILD.bazel
#	deps/rabbitmq_aws/BUILD.bazel
#	deps/rabbitmq_shovel/BUILD.bazel
#	deps/rabbitmq_shovel_management/BUILD.bazel
#	deps/rabbitmq_stream/BUILD.bazel
#	deps/rabbitmq_stream_management/BUILD.bazel
#	moduleindex.yaml
HoloRin added a commit that referenced this pull request Apr 25, 2023
… (backport #7931) (backport #7936) (#7954)

* Use gazelle for some maintenance of bazel BUILD files (backport #6466) (backport #7931) (#7936)

* Use gazelle generated bazel files

Bazel build files are now maintained primarily with `bazel run
gazelle`. This will analyze and merge changes into the build files as
necessitated by certain code changes (e.g. the introduction of new
modules).

In some cases there hints to gazelle in the build files, such as `#
gazelle:erlang...` or `# keep` comments. xref checks on plugins that
depend on the cli are a good example.

(cherry picked from commit 8de8f59)

# Conflicts:
#	deps/rabbit/BUILD.bazel
(cherry picked from commit 2aaf217)

# Conflicts:
#	BUILD.bazel
#	deps/amqp10_client/BUILD.bazel
#	deps/amqp_client/BUILD.bazel
#	deps/rabbit/BUILD.bazel
#	deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel
#	deps/rabbit_common/BUILD.bazel
#	deps/rabbitmq_amqp1_0/BUILD.bazel
#	deps/rabbitmq_auth_backend_cache/BUILD.bazel
#	deps/rabbitmq_auth_backend_http/BUILD.bazel
#	deps/rabbitmq_auth_backend_ldap/BUILD.bazel
#	deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
#	deps/rabbitmq_auth_mechanism_ssl/BUILD.bazel
#	deps/rabbitmq_aws/BUILD.bazel
#	deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
#	deps/rabbitmq_ct_client_helpers/BUILD.bazel
#	deps/rabbitmq_ct_helpers/BUILD.bazel
#	deps/rabbitmq_event_exchange/BUILD.bazel
#	deps/rabbitmq_federation/BUILD.bazel
#	deps/rabbitmq_federation_management/BUILD.bazel
#	deps/rabbitmq_jms_topic_exchange/BUILD.bazel
#	deps/rabbitmq_management/BUILD.bazel
#	deps/rabbitmq_management_agent/BUILD.bazel
#	deps/rabbitmq_mqtt/BUILD.bazel
#	deps/rabbitmq_peer_discovery_aws/BUILD.bazel
#	deps/rabbitmq_peer_discovery_common/BUILD.bazel
#	deps/rabbitmq_peer_discovery_consul/BUILD.bazel
#	deps/rabbitmq_peer_discovery_etcd/BUILD.bazel
#	deps/rabbitmq_peer_discovery_k8s/BUILD.bazel
#	deps/rabbitmq_prometheus/BUILD.bazel
#	deps/rabbitmq_random_exchange/BUILD.bazel
#	deps/rabbitmq_recent_history_exchange/BUILD.bazel
#	deps/rabbitmq_sharding/BUILD.bazel
#	deps/rabbitmq_shovel/BUILD.bazel
#	deps/rabbitmq_shovel_management/BUILD.bazel
#	deps/rabbitmq_stomp/BUILD.bazel
#	deps/rabbitmq_stream/BUILD.bazel
#	deps/rabbitmq_stream_common/BUILD.bazel
#	deps/rabbitmq_stream_management/BUILD.bazel
#	deps/rabbitmq_top/BUILD.bazel
#	deps/rabbitmq_tracing/BUILD.bazel
#	deps/rabbitmq_trust_store/BUILD.bazel
#	deps/rabbitmq_web_dispatch/BUILD.bazel
#	deps/rabbitmq_web_mqtt/BUILD.bazel
#	deps/rabbitmq_web_mqtt_examples/BUILD.bazel
#	deps/rabbitmq_web_stomp/BUILD.bazel
#	deps/rabbitmq_web_stomp_examples/BUILD.bazel
#	rabbitmq.bzl

* rabbit/BUILD.bazel: resolve conflicts, bazel run gazelle

(cherry picked from commit c1c450b)

* Resolve merge conflicts

* Resolve merge conflicts: maybe expression

* bazel run gazelle

* Resolve conflicts: ignore_warnings not yet available on plt rule

* Resolve more conflicts

* Re-run `bazel run gazelle`

* Delete non-existent suites

* bazel run gazelle with pre-release gazelle

* Ignore warnings for mqtt dialyze again

as they were never fixed on this branch

* Add missing test helpers

* Run bazel run gazelle

* Restore the original -include_lib statements from before #6466

since this broke erlang_ls

requires rules_erlang 3.9.13

(cherry picked from commit 854d01d)

---------

Co-authored-by: Rin Kuryloski <[email protected]>
Co-authored-by: Michael Klishin <[email protected]>
(cherry picked from commit e7f08df)

# Conflicts:
#	deps/rabbit/BUILD.bazel
#	deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel
#	deps/rabbit_common/BUILD.bazel
#	deps/rabbitmq_aws/BUILD.bazel
#	deps/rabbitmq_shovel/BUILD.bazel
#	deps/rabbitmq_shovel_management/BUILD.bazel
#	deps/rabbitmq_stream/BUILD.bazel
#	deps/rabbitmq_stream_management/BUILD.bazel
#	moduleindex.yaml

* Resolve merge conflicts

* Fix a dialyzer warning in rabbitmq_stream_management

* remove native.glob pass 1

* remove native.glob pass 2

* Use rules_erlang 3.9.14

* re-run bazel run gazelle once more

* once more

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Rin Kuryloski <[email protected]>
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.

2 participants