Skip to content
This repository was archived by the owner on Nov 17, 2020. It is now read-only.

Commit 5a82a96

Browse files
lukebakkenlukebakken
committed
Change regex to pattern
1 parent 71cc270 commit 5a82a96

File tree

5 files changed

+34
-34
lines changed

5 files changed

+34
-34
lines changed

‎src/rabbit_federation_parameters.erl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
{runtime_parameter, <<"federation-upstream">>},
2929
{runtime_parameter, <<"federation-upstream-set">>},
3030
{policy_validator, <<"federation-upstream">>},
31-
{policy_validator, <<"federation-upstream-regex">>},
31+
{policy_validator, <<"federation-upstream-pattern">>},
3232
{policy_validator, <<"federation-upstream-set">>}]).
3333

3434
-rabbit_boot_step({?MODULE,
@@ -124,15 +124,15 @@ validate_policy([{<<"federation-upstream-set">>, Value}])
124124
validate_policy([{<<"federation-upstream-set">>, Value}]) ->
125125
{error, "~p is not a valid federation upstream set name", [Value]};
126126

127-
validate_policy([{<<"federation-upstream-regex">>, Value}])
127+
validate_policy([{<<"federation-upstream-pattern">>, Value}])
128128
when is_binary(Value) ->
129129
case re:compile(Value) of
130130
{ok, _} -> ok;
131131
{error, Reason} -> {error, "~s should be regular expression "
132-
"but is invalid: ~p", [Value, Reason]}
132+
"but is invalid: ~p", [Value, Reason]}
133133
end;
134-
validate_policy([{<<"federation-upstream-regex">>, Value}]) ->
135-
{error, "~p is not a valid federation upstream re name", [Value]};
134+
validate_policy([{<<"federation-upstream-pattern">>, Value}]) ->
135+
{error, "~p is not a valid federation upstream pattern name", [Value]};
136136

137137
validate_policy([{<<"federation-upstream">>, Value}])
138138
when is_binary(Value) ->
@@ -141,5 +141,5 @@ validate_policy([{<<"federation-upstream">>, Value}]) ->
141141
{error, "~p is not a valid federation upstream name", [Value]};
142142

143143
validate_policy(L) when length(L) >= 2 ->
144-
{error, "cannot specify federation-upstream and federation-upstream-set "
145-
"or federation-upstream-regex together", []}.
144+
{error, "cannot specify federation-upstream, federation-upstream-set "
145+
"or federation-upstream-pattern together", []}.

‎src/rabbit_federation_upstream.erl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
-export([federate/1, for/1, for/2, params_to_string/1, to_params/2]).
2424
%% For testing
25-
-export([from_set/2, from_re/2, remove_credentials/1]).
25+
-export([from_set/2, from_pattern/2, remove_credentials/1]).
2626

2727
-import(rabbit_misc, [pget/2, pget/3]).
2828
-import(rabbit_federation_util, [name/1, vhost/1, r/1]).
@@ -32,7 +32,7 @@
3232
federate(XorQ) ->
3333
rabbit_policy:get(<<"federation-upstream">>, XorQ) =/= undefined orelse
3434
rabbit_policy:get(<<"federation-upstream-set">>, XorQ) =/= undefined orelse
35-
rabbit_policy:get(<<"federation-upstream-regex">>, XorQ) =/= undefined.
35+
rabbit_policy:get(<<"federation-upstream-pattern">>, XorQ) =/= undefined.
3636

3737
for(XorQ) ->
3838
case federate(XorQ) of
@@ -50,11 +50,11 @@ for(XorQ, UpstreamName) ->
5050
upstreams(XorQ) ->
5151
UName = rabbit_policy:get(<<"federation-upstream">>, XorQ),
5252
USetName = rabbit_policy:get(<<"federation-upstream-set">>, XorQ),
53-
UReValue = rabbit_policy:get(<<"federation-upstream-regex">>, XorQ),
53+
UPatternValue = rabbit_policy:get(<<"federation-upstream-pattern">>, XorQ),
5454
%% Cannot define 2 at a time, see rabbit_federation_parameters:validate_policy/1
55-
case {UName, USetName, UReValue} of
55+
case {UName, USetName, UPatternValue} of
5656
{undefined, undefined, undefined} -> [];
57-
{undefined, undefined, _} -> find_contents(UReValue, vhost(XorQ));
57+
{undefined, undefined, _} -> find_contents(UPatternValue, vhost(XorQ));
5858
{undefined, _, undefined} -> set_contents(USetName, vhost(XorQ));
5959
{_, undefined, undefined} -> [[{<<"upstream">>, UName}]]
6060
end.
@@ -90,7 +90,7 @@ print(Fmt, Args) -> iolist_to_binary(io_lib:format(Fmt, Args)).
9090
from_set(SetName, XorQ) ->
9191
from_set_contents(set_contents(SetName, vhost(XorQ)), XorQ).
9292

93-
from_re(SetName, XorQ) ->
93+
from_pattern(SetName, XorQ) ->
9494
from_set_contents(find_contents(SetName, vhost(XorQ)), XorQ).
9595

9696
set_contents(<<"all">>, VHost) ->

‎test/exchange_SUITE.erl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
-import(rabbit_federation_test_util,
2828
[expect/3, expect_empty/2,
2929
set_upstream/4, set_upstream/5, clear_upstream/3, set_upstream_set/4,
30-
set_policy/5, set_policy_regex/5, clear_policy/3,
30+
set_policy/5, set_policy_pattern/5, clear_policy/3,
3131
set_policy_upstream/5, set_policy_upstreams/4]).
3232

3333
all() ->
@@ -42,7 +42,7 @@ groups() ->
4242
{cluster_size_1, [], [
4343
simple,
4444
multiple_upstreams,
45-
multiple_upstreams_regex,
45+
multiple_upstreams_pattern,
4646
multiple_uris,
4747
multiple_downstreams,
4848
e2e,
@@ -177,7 +177,7 @@ multiple_upstreams(Config) ->
177177
x(<<"upstream2">>),
178178
x(<<"fed12.downstream">>)]).
179179

180-
multiple_upstreams_regex(Config) ->
180+
multiple_upstreams_pattern(Config) ->
181181
set_upstream(Config, 0, <<"local453x">>,
182182
rabbit_ct_broker_helpers:node_uri(Config, 0), [
183183
{<<"exchange">>, <<"upstream">>},
@@ -188,22 +188,22 @@ multiple_upstreams_regex(Config) ->
188188
{<<"exchange">>, <<"upstream2">>},
189189
{<<"queue">>, <<"upstream2">>}]),
190190

191-
set_policy_regex(Config, 0, <<"regex">>, <<"^regex\.">>, <<"local\\d+x">>),
191+
set_policy_pattern(Config, 0, <<"pattern">>, <<"^pattern\.">>, <<"local\\d+x">>),
192192

193193
with_ch(Config,
194194
fun (Ch) ->
195-
Q = bind_queue(Ch, <<"regex.downstream">>, <<"key">>),
195+
Q = bind_queue(Ch, <<"pattern.downstream">>, <<"key">>),
196196
await_binding(Config, 0, <<"upstream">>, <<"key">>),
197197
await_binding(Config, 0, <<"upstream2">>, <<"key">>),
198198
publish_expect(Ch, <<"upstream">>, <<"key">>, Q, <<"HELLO1">>),
199199
publish_expect(Ch, <<"upstream2">>, <<"key">>, Q, <<"HELLO2">>)
200200
end, [x(<<"upstream">>),
201201
x(<<"upstream2">>),
202-
x(<<"regex.downstream">>)]),
202+
x(<<"pattern.downstream">>)]),
203203

204204
clear_upstream(Config, 0, <<"local453x">>),
205205
clear_upstream(Config, 0, <<"local3214x">>),
206-
clear_policy(Config, 0, <<"regex">>).
206+
clear_policy(Config, 0, <<"pattern">>).
207207

208208
multiple_uris(Config) ->
209209
%% We can't use a direct connection for Kill() to work.

‎test/queue_SUITE.erl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
-import(rabbit_federation_test_util,
2525
[expect/3,
2626
set_upstream/4, set_upstream/5, clear_upstream/3, set_policy/5, clear_policy/3,
27-
set_policy_regex/5, set_policy_upstream/5, set_policy_upstreams/4, q/1, with_ch/3,
27+
set_policy_pattern/5, set_policy_upstream/5, set_policy_upstreams/4, q/1, with_ch/3,
2828
declare_queue/2, delete_queue/2]).
2929

3030
all() ->
@@ -39,7 +39,7 @@ groups() ->
3939
{cluster_size_1, [], [
4040
simple,
4141
multiple_upstreams,
42-
multiple_upstreams_regex,
42+
multiple_upstreams_pattern,
4343
multiple_downstreams,
4444
bidirectional,
4545
dynamic_reconfiguration,
@@ -132,7 +132,7 @@ multiple_upstreams(Config) ->
132132
q(<<"upstream2">>),
133133
q(<<"fed12.downstream">>)]).
134134

135-
multiple_upstreams_regex(Config) ->
135+
multiple_upstreams_pattern(Config) ->
136136
set_upstream(Config, 0, <<"local453x">>,
137137
rabbit_ct_broker_helpers:node_uri(Config, 0), [
138138
{<<"exchange">>, <<"upstream">>},
@@ -143,19 +143,19 @@ multiple_upstreams_regex(Config) ->
143143
{<<"exchange">>, <<"upstream2">>},
144144
{<<"queue">>, <<"upstream2">>}]),
145145

146-
set_policy_regex(Config, 0, <<"regex">>, <<"^regex\.">>, <<"local\\d+x">>),
146+
set_policy_pattern(Config, 0, <<"pattern">>, <<"^pattern\.">>, <<"local\\d+x">>),
147147

148148
with_ch(Config,
149149
fun (Ch) ->
150-
expect_federation(Ch, <<"upstream">>, <<"regex.downstream">>),
151-
expect_federation(Ch, <<"upstream2">>, <<"regex.downstream">>)
150+
expect_federation(Ch, <<"upstream">>, <<"pattern.downstream">>),
151+
expect_federation(Ch, <<"upstream2">>, <<"pattern.downstream">>)
152152
end, [q(<<"upstream">>),
153153
q(<<"upstream2">>),
154-
q(<<"regex.downstream">>)]),
154+
q(<<"pattern.downstream">>)]),
155155

156156
clear_upstream(Config, 0, <<"local453x">>),
157157
clear_upstream(Config, 0, <<"local3214x">>),
158-
clear_policy(Config, 0, <<"regex">>).
158+
clear_policy(Config, 0, <<"pattern">>).
159159

160160
multiple_downstreams(Config) ->
161161
with_ch(Config,

‎test/rabbit_federation_test_util.erl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ set_policy(Config, Node, Name, Pattern, UpstreamSet) ->
201201
Name, Pattern, <<"all">>,
202202
[{<<"federation-upstream-set">>, UpstreamSet}]).
203203

204-
set_policy_regex(Config, Node, Name, Pattern, Regex) ->
204+
set_policy_pattern(Config, Node, Name, Pattern, Regex) ->
205205
rabbit_ct_broker_helpers:set_policy(Config, Node,
206206
Name, Pattern, <<"all">>,
207-
[{<<"federation-upstream-regex">>, Regex}]).
207+
[{<<"federation-upstream-pattern">>, Regex}]).
208208

209209
clear_policy(Config, Node, Name) ->
210210
rabbit_ct_broker_helpers:clear_policy(Config, Node, Name).
@@ -268,12 +268,12 @@ assert_link_status({DXorQNameBin, UpstreamName, UXorQNameBin}, Status,
268268
links(#'exchange.declare'{exchange = Name}) ->
269269
case rabbit_policy:get(<<"federation-upstream-set">>, xr(Name)) of
270270
undefined ->
271-
case rabbit_policy:get(<<"federation-upstream-regex">>, xr(Name)) of
271+
case rabbit_policy:get(<<"federation-upstream-pattern">>, xr(Name)) of
272272
undefined -> [];
273273
Regex ->
274274
X = #exchange{name = xr(Name)},
275275
[{Name, U#upstream.name, U#upstream.exchange_name} ||
276-
U <- rabbit_federation_upstream:from_re(Regex, X)]
276+
U <- rabbit_federation_upstream:from_pattern(Regex, X)]
277277
end;
278278
Set -> X = #exchange{name = xr(Name)},
279279
[{Name, U#upstream.name, U#upstream.exchange_name} ||
@@ -282,7 +282,7 @@ links(#'exchange.declare'{exchange = Name}) ->
282282
links(#'queue.declare'{queue = Name}) ->
283283
case rabbit_policy:get(<<"federation-upstream-set">>, qr(Name)) of
284284
undefined ->
285-
case rabbit_policy:get(<<"federation-upstream-regex">>, qr(Name)) of
285+
case rabbit_policy:get(<<"federation-upstream-pattern">>, qr(Name)) of
286286
undefined -> [];
287287
Regex ->
288288
Q = amqqueue:new(qr(Name),
@@ -295,7 +295,7 @@ links(#'queue.declare'{queue = Name}) ->
295295
#{},
296296
classic),
297297
[{Name, U#upstream.name, U#upstream.queue_name} ||
298-
U <- rabbit_federation_upstream:from_re(Regex, Q)]
298+
U <- rabbit_federation_upstream:from_pattern(Regex, Q)]
299299
end;
300300
Set -> Q = amqqueue:new(qr(Name),
301301
self(),

0 commit comments

Comments
 (0)