Alex
382e74c798
All checks were successful
continuous-integration/drone/push Build is passing
**Spec:** - [x] Start writing - [x] Specify all layout endpoints - [x] Specify all endpoints for operations on keys - [x] Specify all endpoints for operations on key/bucket permissions - [x] Specify all endpoints for operations on buckets - [x] Specify all endpoints for operations on bucket aliases View rendered spec at <https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/admin-api/doc/drafts/admin-api.md> **Code:** - [x] Refactor code for admin api to use common api code that was created for K2V **General endpoints:** - [x] Metrics - [x] GetClusterStatus - [x] ConnectClusterNodes - [x] GetClusterLayout - [x] UpdateClusterLayout - [x] ApplyClusterLayout - [x] RevertClusterLayout **Key-related endpoints:** - [x] ListKeys - [x] CreateKey - [x] ImportKey - [x] GetKeyInfo - [x] UpdateKey - [x] DeleteKey **Bucket-related endpoints:** - [x] ListBuckets - [x] CreateBucket - [x] GetBucketInfo - [x] DeleteBucket - [x] PutBucketWebsite - [x] DeleteBucketWebsite **Operations on key/bucket permissions:** - [x] BucketAllowKey - [x] BucketDenyKey **Operations on bucket aliases:** - [x] GlobalAliasBucket - [x] GlobalUnaliasBucket - [x] LocalAliasBucket - [x] LocalUnaliasBucket **And also:** - [x] Separate error type for the admin API (this PR includes a quite big refactoring of error handling) - [x] Add management of website access - [ ] Check that nothing is missing wrt what can be done using the CLI - [ ] Improve formatting of the spec - [x] Make sure everyone is cool with the API design Fix #231 Fix #295 Co-authored-by: Alex Auvolat <alex@adnab.me> Reviewed-on: #298 Co-authored-by: Alex <alex@adnab.me> Co-committed-by: Alex <alex@adnab.me>
101 lines
2.2 KiB
Rust
101 lines
2.2 KiB
Rust
use std::sync::Arc;
|
|
|
|
use hyper::{Body, Response, StatusCode};
|
|
use serde::Serialize;
|
|
|
|
use garage_util::data::*;
|
|
use garage_util::error::Error as GarageError;
|
|
|
|
use garage_rpc::ring::Ring;
|
|
use garage_table::util::*;
|
|
|
|
use garage_model::garage::Garage;
|
|
use garage_model::k2v::counter_table::{BYTES, CONFLICTS, ENTRIES, VALUES};
|
|
|
|
use crate::k2v::error::*;
|
|
use crate::k2v::range::read_range;
|
|
|
|
pub async fn handle_read_index(
|
|
garage: Arc<Garage>,
|
|
bucket_id: Uuid,
|
|
prefix: Option<String>,
|
|
start: Option<String>,
|
|
end: Option<String>,
|
|
limit: Option<u64>,
|
|
reverse: Option<bool>,
|
|
) -> Result<Response<Body>, Error> {
|
|
let reverse = reverse.unwrap_or(false);
|
|
|
|
let ring: Arc<Ring> = garage.system.ring.borrow().clone();
|
|
|
|
let (partition_keys, more, next_start) = read_range(
|
|
&garage.k2v.counter_table.table,
|
|
&bucket_id,
|
|
&prefix,
|
|
&start,
|
|
&end,
|
|
limit,
|
|
Some((DeletedFilter::NotDeleted, ring.layout.node_id_vec.clone())),
|
|
EnumerationOrder::from_reverse(reverse),
|
|
)
|
|
.await?;
|
|
|
|
let s_entries = ENTRIES.to_string();
|
|
let s_conflicts = CONFLICTS.to_string();
|
|
let s_values = VALUES.to_string();
|
|
let s_bytes = BYTES.to_string();
|
|
|
|
let resp = ReadIndexResponse {
|
|
prefix,
|
|
start,
|
|
end,
|
|
limit,
|
|
reverse,
|
|
partition_keys: partition_keys
|
|
.into_iter()
|
|
.map(|part| {
|
|
let vals = part.filtered_values(&ring);
|
|
ReadIndexResponseEntry {
|
|
pk: part.sk,
|
|
entries: *vals.get(&s_entries).unwrap_or(&0),
|
|
conflicts: *vals.get(&s_conflicts).unwrap_or(&0),
|
|
values: *vals.get(&s_values).unwrap_or(&0),
|
|
bytes: *vals.get(&s_bytes).unwrap_or(&0),
|
|
}
|
|
})
|
|
.collect::<Vec<_>>(),
|
|
more,
|
|
next_start,
|
|
};
|
|
|
|
let resp_json = serde_json::to_string_pretty(&resp).map_err(GarageError::from)?;
|
|
Ok(Response::builder()
|
|
.status(StatusCode::OK)
|
|
.body(Body::from(resp_json))?)
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
struct ReadIndexResponse {
|
|
prefix: Option<String>,
|
|
start: Option<String>,
|
|
end: Option<String>,
|
|
limit: Option<u64>,
|
|
reverse: bool,
|
|
|
|
#[serde(rename = "partitionKeys")]
|
|
partition_keys: Vec<ReadIndexResponseEntry>,
|
|
|
|
more: bool,
|
|
#[serde(rename = "nextStart")]
|
|
next_start: Option<String>,
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
struct ReadIndexResponseEntry {
|
|
pk: String,
|
|
entries: i64,
|
|
conflicts: i64,
|
|
values: i64,
|
|
bytes: i64,
|
|
}
|