Merge branch 'master' into rabbitmq-auth-backend-cache-7

1 files changed, 42 insertions, 16 deletions

diff --git a/test/config_schema_SUITE_data/snippets.config b/test/config_schema_SUITE_data/snippets.config
index ca40d2a429..09ddf95969 100644
--- a/test/config_schema_SUITE_data/snippets.config
+++ b/test/config_schema_SUITE_data/snippets.config
@@ -140,46 +140,46 @@ auth_backends.2 = internal",
                                                       rabbit_auth_backend_internal]}]}],[]}
 ,
 {16.1,
-"rabbitmq_auth_backend_ldap.servers.1 = DC1.domain.com
- rabbitmq_auth_backend_ldap.servers.2 = DC1.eng.domain.com",
+"auth_ldap.servers.1 = DC1.domain.com
+ auth_ldap.servers.2 = DC1.eng.domain.com",
 [{rabbitmq_auth_backend_ldap, [{servers, ["DC1.domain.com", "DC1.eng.domain.com"]}]}],
 [rabbitmq_auth_backend_ldap]}
 ,
 {16.2,
-"rabbitmq_auth_backend_ldap.servers.1 = hostname1
- rabbitmq_auth_backend_ldap.servers.2 = hostname2",
+"auth_ldap.servers.1 = hostname1
+ auth_ldap.servers.2 = hostname2",
 [{rabbitmq_auth_backend_ldap, [{servers, ["hostname1", "hostname2"]}]}],
 [rabbitmq_auth_backend_ldap]}
 ,
 {17,
-"rabbitmq_auth_backend_ldap.dn_lookup_attribute = userPrincipalName
-rabbitmq_auth_backend_ldap.dn_lookup_base = DC=gopivotal,DC=com
-rabbitmq_auth_backend_ldap.dn_lookup_bind = as_user",
+"auth_ldap.dn_lookup_attribute = userPrincipalName
+auth_ldap.dn_lookup_base = DC=gopivotal,DC=com
+auth_ldap.dn_lookup_bind = as_user",
 [{rabbitmq_auth_backend_ldap, [{dn_lookup_attribute,   "userPrincipalName"},
 {dn_lookup_base,        "DC=gopivotal,DC=com"},
 {dn_lookup_bind, as_user}]}],
 [rabbitmq_auth_backend_ldap]}
 ,
 {18,
-"rabbitmq_auth_backend_ldap.dn_lookup_bind.user_dn = username
-rabbitmq_auth_backend_ldap.dn_lookup_bind.password = password",
+"auth_ldap.dn_lookup_bind.user_dn = username
+auth_ldap.dn_lookup_bind.password = password",
 [{rabbitmq_auth_backend_ldap, [
 {dn_lookup_bind, {"username", "password"}}]}],
 [rabbitmq_auth_backend_ldap]}
 ,
 {19,
-"rabbitmq_auth_backend_ldap.other_bind = anon",
+"auth_ldap.other_bind = anon",
 [{rabbitmq_auth_backend_ldap, [{other_bind, anon}]}],
 [rabbitmq_auth_backend_ldap]}
 ,
 {20,
-"rabbitmq_auth_backend_ldap.other_bind = as_user",
+"auth_ldap.other_bind = as_user",
 [{rabbitmq_auth_backend_ldap, [{other_bind, as_user}]}],
 [rabbitmq_auth_backend_ldap]}
 ,
 {21,
-"rabbitmq_auth_backend_ldap.other_bind.user_dn = username
-rabbitmq_auth_backend_ldap.other_bind.password = password",
+"auth_ldap.other_bind.user_dn = username
+auth_ldap.other_bind.password = password",
 [{rabbitmq_auth_backend_ldap, [{other_bind, {"username", "password"}}]}],
 [rabbitmq_auth_backend_ldap]}
 ,
@@ -732,9 +732,9 @@ web_stomp.ssl.password   = changeme",
 [rabbitmq_web_stomp]},
 {69,
 "auth_backends.1 = http
-rabbitmq_auth_backend_http.user_path     = http://some-server/auth/user
-rabbitmq_auth_backend_http.vhost_path    = http://some-server/auth/vhost
-rabbitmq_auth_backend_http.resource_path = http://some-server/auth/resource",
+auth_http.user_path     = http://some-server/auth/user
+auth_http.vhost_path    = http://some-server/auth/vhost
+auth_http.resource_path = http://some-server/auth/resource",
 [{rabbit, [{auth_backends, [rabbit_auth_backend_http]}]},
   {rabbitmq_auth_backend_http,
    [{user_path,     "http://some-server/auth/user"},
@@ -818,6 +818,31 @@ credential_validator.regexp = ^abc\\d+",
       {regexp,             "^abc\\d+"}
     ]}
 ]}],[]},
+
+{79,
+"auth_backends.1 = amqp
+auth_amqp.username = user
+auth_amqp.vhost    = my_vhost
+auth_amqp.exchange = exchange_name
+auth_amqp.timeout  = 100",
+[{rabbit, [{auth_backends, [rabbit_auth_backend_amqp]}]},
+  {rabbitmq_auth_backend_amqp,
+   [{username, <<"user">>},
+    {vhost,    <<"my_vhost">>},
+    {exchange, <<"exchange_name">>},
+    {timeout,  100}]}],
+[rabbitmq_auth_backend_amqp]},
+
+{80,
+"auth_backends.1 = cache
+auth_cache.cached_backend = ldap",
+[
+        {rabbit,
+          [{auth_backends,[rabbit_auth_backend_cache]}]},
+        {rabbitmq_auth_backend_cache,
+          [{cached_backend,rabbit_auth_backend_ldap}]}
+], [rabbitmq_auth_backend_cache]},
+
 {auth_backend_cache,
  "auth_backends.1 = cache",
  [{rabbit, [{auth_backends, [rabbit_auth_backend_cache]}]}],
@@ -854,4 +879,5 @@ credential_validator.regexp = ^abc\\d+",
  [{rabbit, [{auth_backends, [rabbit_auth_backend_cache]}]},
   {rabbitmq_auth_backend_cache, [{cache_module, rabbit_auth_backend_ets_segmented}]}],
  [rabbitmq_auth_backend_cache]}
+
 ].