Skip to content

Commit 10e2114

Browse files
Fix schema translation issue
1 parent 9770637 commit 10e2114

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -164,30 +164,33 @@
164164
%% auth_oauth2.opaque_token_signing_key.cert_pem_file = rabbit_cert.pem
165165

166166
{mapping, "auth_oauth2.opaque_token_signing_key.id",
167-
"rabbitmq_auth_backend_oauth2.key_config.opaque_token_signing_key.id",
167+
"rabbitmq_auth_backend_oauth2.opaque_token_signing_key.id",
168168
[{datatype, string}]}.
169169

170+
{translation,
171+
"rabbitmq_auth_backend_oauth2.opaque_token_signing_key.id",
172+
fun(Conf) -> list_to_binary(cuttlefish:conf_get("auth_oauth2.opaque_token_signing_key.id", Conf)) end}.
173+
170174
{mapping, "auth_oauth2.opaque_token_signing_key.type",
171-
"rabbitmq_auth_backend_oauth2.key_config.opaque_token_signing_key.type",
175+
"rabbitmq_auth_backend_oauth2.opaque_token_signing_key.type",
172176
[{datatype, {enum, [hs256, rs256]}}]}.
173177

174178
{mapping, "auth_oauth2.opaque_token_signing_key.key",
175-
"rabbitmq_auth_backend_oauth2.key_config.opaque_token_signing_key.key",
179+
"rabbitmq_auth_backend_oauth2.opaque_token_signing_key.key",
176180
[{datatype, string}]}.
177181

182+
{translation,
183+
"rabbitmq_auth_backend_oauth2.opaque_token_signing_key.key",
184+
fun(Conf) -> list_to_binary(cuttlefish:conf_get("auth_oauth2.opaque_token_signing_key.key", Conf)) end}.
185+
178186
{mapping, "auth_oauth2.opaque_token_signing_key.key_file",
179-
"rabbitmq_auth_backend_oauth2.key_config.opaque_token_signing_key.key_pem_file",
187+
"rabbitmq_auth_backend_oauth2.opaque_token_signing_key.key_pem_file",
180188
[{datatype, file}, {validators, ["file_accessible"]}]}.
181189

182190
{mapping, "auth_oauth2.opaque_token_signing_key.cert_file",
183-
"rabbitmq_auth_backend_oauth2.key_config.opaque_token_signing_key.cert_pem_file",
191+
"rabbitmq_auth_backend_oauth2.opaque_token_signing_key.cert_pem_file",
184192
[{datatype, file}, {validators, ["file_accessible"]}]}.
185193

186-
%%{translation,
187-
%% "rabbitmq_auth_backend_oauth2.opaque_token_signing_key",
188-
%% fun(Conf) ->
189-
%% rabbit_oauth2_schema:translate_opaque_token_signing_key(Conf)
190-
%% end}.
191194

192195
%% ID of the default signing key
193196
%%

deps/rabbitmq_auth_backend_oauth2/test/config_schema_SUITE_data/rabbitmq_auth_backend_oauth2.snippets

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
<<"id2">> => {pem, <<"I'm not a certificate">>}
4747
}
4848
},
49-
{opaque_token_signing_key,[]},
5049
{jwks_url, "https://my-jwt-issuer/jwks.json"},
5150
{cacertfile, "test/config_schema_SUITE_data/certs/cacert.pem"},
5251
{peer_verification, verify_none},
@@ -369,15 +368,16 @@
369368
"auth_oauth2.resource_server_id = new_resource_server_id
370369
auth_oauth2.opaque_token_signing_key.id = opaque-id
371370
auth_oauth2.opaque_token_signing_key.type = hs256
372-
auth_oauth2.opaque_token_signing_key.key = opaque-signing-key-value",
371+
auth_oauth2.opaque_token_signing_key.key = opaque-signing-key",
373372
[
374373
{rabbitmq_auth_backend_oauth2, [
375374
{resource_server_id, <<"new_resource_server_id">>},
376375
{opaque_token_signing_key, [
377-
{id, <<"opaque-id">>},
378-
{type, hs256},
379-
{key, <<"opaque-signing-key-value">>}
380-
]}
376+
{id, <<"opaque-id">>},
377+
{type, hs256},
378+
{key, <<"opaque-signing-key">>}
379+
]
380+
}
381381
]}
382382
], []
383383
}

0 commit comments

Comments
 (0)