Skip to content

Commit b51a6f8

Browse files
the-mikedavisdcorbacho
authored andcommitted
Update khepri_mnesia_migration
The latest khepri_mnesia_migration has changed the name of the default converter to 'mnesia_to_khepri_example_converter'. Also, 'mnesia_to_khepri_converter' has been added as a behaviour module and the typespecs have been fixed for some functions in 'mnesia_to_khepri', resolving some dialyzer errors in the rabbit application. Updated with: bazel run gazelle -- update-repos \ --verbose \ --build_files_dir=bazel \ github.com/rabbitmq/khepri_mnesia_migration@3cac5f7cbf836fc7851154514b06939d04accf7d
1 parent 35c99b3 commit b51a6f8

File tree

3 files changed

+39
-25
lines changed

3 files changed

+39
-25
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ erlang_package.git_package(
250250
name = "khepri_mnesia_migration",
251251
build_file = "@rabbitmq-server//bazel:BUILD.khepri_mnesia_migration",
252252
repository = "rabbitmq/khepri_mnesia_migration",
253-
commit = "7893583d62ad78602ef3c3d8f8a82426c0926d19",
253+
commit = "da48b45ed0843234919b6e47006d5907cfe876f6",
254254
)
255255

256256
erlang_package.hex_package(

bazel/BUILD.khepri_mnesia_migration

Lines changed: 36 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,34 +33,22 @@ erlang_bytecode(
3333
"src/m2k_table_copy_sup.erl",
3434
"src/m2k_table_copy_sup_sup.erl",
3535
"src/mnesia_to_khepri.erl",
36-
"src/mnesia_to_khepri_default_converter.erl",
37-
],
38-
outs = [
39-
"ebin/khepri_mnesia_migration_app.beam",
40-
"ebin/khepri_mnesia_migration_sup.beam",
41-
"ebin/kmm_utils.beam",
42-
"ebin/m2k_cluster_sync.beam",
43-
"ebin/m2k_cluster_sync_sup.beam",
44-
"ebin/m2k_export.beam",
45-
"ebin/m2k_subscriber.beam",
46-
"ebin/m2k_table_copy.beam",
47-
"ebin/m2k_table_copy_sup.beam",
48-
"ebin/m2k_table_copy_sup_sup.beam",
49-
"ebin/mnesia_to_khepri.beam",
50-
"ebin/mnesia_to_khepri_default_converter.beam",
51-
],
52-
hdrs = [
53-
"src/kmm_error.hrl",
54-
"src/kmm_logging.hrl",
36+
"src/mnesia_to_khepri_example_converter.erl",
5537
],
38+
hdrs = [":public_and_private_hdrs"],
5639
app_name = "khepri_mnesia_migration",
40+
beam = [":behaviours"],
41+
dest = "ebin",
5742
erlc_opts = "//:erlc_opts",
5843
deps = ["@khepri//:erlang_app"],
5944
)
6045

6146
filegroup(
6247
name = "beam_files",
63-
srcs = [":other_beam"],
48+
srcs = [
49+
":behaviours",
50+
":other_beam",
51+
],
6452
)
6553

6654
filegroup(
@@ -78,7 +66,7 @@ filegroup(
7866
"src/m2k_table_copy_sup.erl",
7967
"src/m2k_table_copy_sup_sup.erl",
8068
"src/mnesia_to_khepri.erl",
81-
"src/mnesia_to_khepri_default_converter.erl",
69+
"src/mnesia_to_khepri_example_converter.erl",
8270
],
8371
)
8472

@@ -90,9 +78,15 @@ filegroup(
9078
],
9179
)
9280

93-
filegroup(name = "public_hdrs")
81+
filegroup(
82+
name = "public_hdrs",
83+
srcs = glob(["include/**/*.hrl"]),
84+
)
9485

95-
filegroup(name = "priv")
86+
filegroup(
87+
name = "priv",
88+
srcs = glob(["priv/**/*"]),
89+
)
9690

9791
filegroup(
9892
name = "licenses",
@@ -121,8 +115,11 @@ filegroup(
121115
erlang_app(
122116
name = "erlang_app",
123117
srcs = [":all_srcs"],
118+
hdrs = [":public_hdrs"],
124119
app_name = "khepri_mnesia_migration",
125120
beam_files = [":beam_files"],
121+
license_files = [":license_files"],
122+
priv = [":priv"],
126123
deps = ["@khepri//:erlang_app"],
127124
)
128125

@@ -131,3 +128,19 @@ alias(
131128
actual = ":erlang_app",
132129
visibility = ["//visibility:public"],
133130
)
131+
132+
erlang_bytecode(
133+
name = "behaviours",
134+
srcs = [
135+
"src/mnesia_to_khepri_converter.erl",
136+
],
137+
hdrs = [":public_and_private_hdrs"],
138+
app_name = "khepri_mnesia_migration",
139+
dest = "ebin",
140+
erlc_opts = "//:erlc_opts",
141+
)
142+
143+
filegroup(
144+
name = "license_files",
145+
srcs = glob(["LICENSE*"]),
146+
)

moduleindex.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,8 @@ khepri_mnesia_migration:
306306
- m2k_table_copy_sup
307307
- m2k_table_copy_sup_sup
308308
- mnesia_to_khepri
309-
- mnesia_to_khepri_default_converter
309+
- mnesia_to_khepri_converter
310+
- mnesia_to_khepri_example_converter
310311
meck:
311312
- meck
312313
- meck_args_matcher

0 commit comments

Comments
 (0)