Merge pull request #10877 from rabbitmq/mergify/bp/v3.13.x/pr-10868

Bump Khepri to v0.13.0 (backport #10868)

Author: the-mikedavis

MODULE.bazel

@@ -296,8 +296,8 @@ erlang_package.hex_package(
 erlang_package.hex_package(
     name = "khepri",
     build_file = "@rabbitmq-server//bazel:BUILD.khepri",
-    sha256 = "0b6ff09fabf27cb1e8df0f976149305ad936abd17233263b36ccc7becbf31cb3",
-    version = "0.12.1",
+    sha256 = "1157d963eb5c002e040bbc86348669818d1da86d259a3705008655fefbd7f1c2",
+    version = "0.13.0",
 )
 
 erlang_package.hex_package(

deps/rabbit/src/rabbit_khepri.erl

@@ -1015,9 +1015,17 @@ register_projections() ->
                     fun register_rabbit_index_route_projection/0,
                     fun register_rabbit_topic_graph_projection/0],
     [case RegisterFun() of
-         ok              -> ok;
-         {error, exists} -> ok;
-         {error, Error}  -> throw(Error)
+         ok ->
+             ok;
+         %% Before Khepri v0.13.0, `khepri:register_projection/1,2,3` would
+         %% return `{error, exists}` for projections which already exist.
+         {error, exists} ->
+             ok;
+         %% In v0.13.0+, Khepri returns a `?khepri_error(..)` instead.
+         {error, {khepri, projection_already_exists, _Info}} ->
+             ok;
+         {error, Error} ->
+             throw(Error)
      end || RegisterFun <- RegisterFuns],
     ok.
 

rabbitmq-components.mk

@@ -116,7 +116,7 @@ dep_accept = hex 0.3.5
 dep_cowboy = hex 2.12.0
 dep_cowlib = hex 2.13.0
 dep_credentials_obfuscation = hex 3.4.0
-dep_khepri = hex 0.12.1
+dep_khepri = hex 0.13.0
 dep_khepri_mnesia_migration = hex 0.4.0
 dep_looking_glass = git https://github.com/rabbitmq/looking_glass.git main
 dep_prometheus = hex 4.11.0