searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-23 13:24:27 +01:00
Code Issues Releases Wiki Activity

Merge #2451

Browse Source 
2451: feat(API-keys): Change immutable_field error message r=Kerollmops a=ManyTheFish

Change the immutable_field error message to fit the recent changes in the spec:
aa0a148ee3..84a9baff68



Co-authored-by: ManyTheFish <many@meilisearch.com>
This commit is contained in:
bors[bot] 2022-06-02 09:26:36 +00:00 committed by GitHub
commit 7e3d5ebc8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meilisearch-auth/src/error.rs
View File

@ -28,7 +28,7 @@ pub enum AuthControllerError {
ApiKeyNotFound(String), ApiKeyNotFound(String),
#[error("`uid` field value `{0}` is already an existing API key.")] #[error("`uid` field value `{0}` is already an existing API key.")]
ApiKeyAlreadyExists(String), ApiKeyAlreadyExists(String),
#[error("`{0}` field cannot be modified for the given resource.")] #[error("The `{0}` field cannot be modified for the given resource.")]
ImmutableField(String), ImmutableField(String),
#[error("Internal error: {0}")] #[error("Internal error: {0}")]
Internal(Box<dyn Error + Send + Sync + 'static>), Internal(Box<dyn Error + Send + Sync + 'static>),

6
meilisearch-http/tests/auth/api_keys.rs
View File

@ -1150,7 +1150,7 @@ async fn error_patch_api_key_indexes() {
let (response, code) = server.patch_api_key(&uid, content).await; let (response, code) = server.patch_api_key(&uid, content).await;
assert_eq!(400, code, "{:?}", &response); assert_eq!(400, code, "{:?}", &response);
let expected = json!({"message": "`indexes` field cannot be modified for the given resource.", let expected = json!({"message": "The `indexes` field cannot be modified for the given resource.",
"code": "immutable_field", "code": "immutable_field",
"type": "invalid_request", "type": "invalid_request",
"link": "https://docs.meilisearch.com/errors#immutable_field" "link": "https://docs.meilisearch.com/errors#immutable_field"
@ -1206,7 +1206,7 @@ async fn error_patch_api_key_actions() {
let (response, code) = server.patch_api_key(&uid, content).await; let (response, code) = server.patch_api_key(&uid, content).await;
assert_eq!(400, code, "{:?}", &response); assert_eq!(400, code, "{:?}", &response);
let expected = json!({"message": "`actions` field cannot be modified for the given resource.", let expected = json!({"message": "The `actions` field cannot be modified for the given resource.",
"code": "immutable_field", "code": "immutable_field",
"type": "invalid_request", "type": "invalid_request",
"link": "https://docs.meilisearch.com/errors#immutable_field" "link": "https://docs.meilisearch.com/errors#immutable_field"
@ -1254,7 +1254,7 @@ async fn error_patch_api_key_expiration_date() {
let (response, code) = server.patch_api_key(&uid, content).await; let (response, code) = server.patch_api_key(&uid, content).await;
assert_eq!(400, code, "{:?}", &response); assert_eq!(400, code, "{:?}", &response);
let expected = json!({"message": "`expiresAt` field cannot be modified for the given resource.", let expected = json!({"message": "The `expiresAt` field cannot be modified for the given resource.",
"code": "immutable_field", "code": "immutable_field",
"type": "invalid_request", "type": "invalid_request",
"link": "https://docs.meilisearch.com/errors#immutable_field" "link": "https://docs.meilisearch.com/errors#immutable_field"