gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-07-26 07:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix(openapi): set parameters in query instead of path for get params' (#1082) from Xstoudi/garage:fix/openapi-get-parameter into main-v2

Browse Source 
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/1082
This commit is contained in:
Alex
2025-06-20 10:25:51 +00:00
parent e8e722cc66 56a23d936e
commit 78f03aec78
2 changed files with 29 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/api/garage-admin-v2.json
+25 -46
View File
@@ -567,26 +567,20 @@
"parameters": [
{
"name": "id",
"in": "path",
"in": "query",
"description": "Admin API token ID",
"required": true,
"required": false,
"schema": {
"type": [
"string",
"null"
]
"type": "string"
}
},
{
"name": "search",
"in": "path",
"in": "query",
"description": "Partial token ID or name to search for",
"required": true,
"required": false,
"schema": {
"type": [
"string",
"null"
]
"type": "string"
}
}
],
@@ -662,38 +656,29 @@
"parameters": [
{
"name": "id",
"in": "path",
"in": "query",
"description": "Exact bucket ID to look up",
"required": true,
"required": false,
"schema": {
"type": [
"string",
"null"
]
"type": "string"
}
},
{
"name": "globalAlias",
"in": "path",
"in": "query",
"description": "Global alias of bucket to look up",
"required": true,
"required": false,
"schema": {
"type": [
"string",
"null"
]
"type": "string"
}
},
{
"name": "search",
"in": "path",
"in": "query",
"description": "Partial ID or alias to search for",
"required": true,
"required": false,
"schema": {
"type": [
"string",
"null"
]
"type": "string"
}
}
],
@@ -841,33 +826,27 @@
"parameters": [
{
"name": "id",
"in": "path",
"in": "query",
"description": "Access key ID",
"required": true,
"required": false,
"schema": {
"type": [
"string",
"null"
]
"type": "string"
}
},
{
"name": "search",
"in": "path",
"in": "query",
"description": "Partial key ID or name to search for",
"required": true,
"required": false,
"schema": {
"type": [
"string",
"null"
]
"type": "string"
}
},
{
"name": "showSecretKey",
"in": "path",
"in": "query",
"description": "Whether to return the secret access key",
"required": true,
"required": false,
"schema": {
"type": "boolean"
}
@@ -1094,7 +1073,7 @@
"parameters": [
{
"name": "bucketId",
"in": "path",
"in": "query",
"required": true,
"schema": {
"type": "string"
@@ -1102,7 +1081,7 @@
},
{
"name": "key",
"in": "path",
"in": "query",
"required": true,
"schema": {
"type": "string"
src/api/admin/api.rs
+4
View File
@@ -308,6 +308,7 @@ pub struct ListAdminTokensResponse(pub Vec<GetAdminTokenInfoResponse>);
// ---- GetAdminTokenInfo ----
#[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
#[into_params(parameter_in = Query)]
#[serde(rename_all = "camelCase")]
pub struct GetAdminTokenInfoRequest {
/// Admin API token ID
@@ -648,6 +649,7 @@ pub struct ListKeysResponseItem {
// ---- GetKeyInfo ----
#[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
#[into_params(parameter_in = Query)]
#[serde(rename_all = "camelCase")]
pub struct GetKeyInfoRequest {
/// Access key ID
@@ -790,6 +792,7 @@ pub struct BucketLocalAlias {
// ---- GetBucketInfo ----
#[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
#[into_params(parameter_in = Query)]
#[serde(rename_all = "camelCase")]
pub struct GetBucketInfoRequest {
/// Exact bucket ID to look up
@@ -928,6 +931,7 @@ pub struct CleanupIncompleteUploadsResponse {
}
#[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
#[into_params(parameter_in = Query)]
#[serde(rename_all = "camelCase")]
pub struct InspectObjectRequest {
pub bucket_id: String,