Skip to content

Commit 86c3820

Browse files
authored
Merge branch 'main' into refactor/badge-maker
2 parents a37ff70 + 8a52d17 commit 86c3820

12 files changed

+3
-580
lines changed

api/.sqlx/query-64a409de5df513f4081e941fa6483adcdb88c7db8653c55bbadc34e4fca53459.json

Lines changed: 0 additions & 58 deletions
This file was deleted.

api/.sqlx/query-6728fb02e292687d424e344fca2bce757363c59cb17d83145270ad31fdb729a3.json

Lines changed: 0 additions & 62 deletions
This file was deleted.

api/.sqlx/query-f417794744acaa64cd37424e698fa1a86c1bc57c04f206ea92558371581c515f.json

Lines changed: 0 additions & 60 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DROP TABLE aliases;

api/src/api/admin.rs

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ use super::PublishQueue;
3131

3232
pub fn admin_router() -> Router<Body, ApiError> {
3333
Router::builder()
34-
.get("/aliases", util::auth(util::json(list_aliases)))
35-
.post("/aliases", util::auth(util::json(create_alias)))
3634
.get("/users", util::auth(util::json(list_users)))
3735
.patch("/users/:user_id", util::auth(util::json(update_user)))
3836
.get("/scopes", util::auth(util::json(list_scopes)))
@@ -54,45 +52,6 @@ pub fn admin_router() -> Router<Body, ApiError> {
5452
.unwrap()
5553
}
5654

57-
#[instrument(name = "GET /api/admin/aliases", skip(req), err)]
58-
pub async fn list_aliases(req: Request<Body>) -> ApiResult<Vec<ApiAlias>> {
59-
let iam = req.iam();
60-
iam.check_admin_access()?;
61-
62-
let db = req.data::<Database>().unwrap();
63-
let (start, limit) = pagination(&req);
64-
let maybe_search = search(&req);
65-
let alias = db.list_aliases(start, limit, maybe_search).await?;
66-
67-
Ok(alias.into_iter().map(|alias| alias.into()).collect())
68-
}
69-
70-
#[instrument(
71-
name = "POST /api/admin/aliases",
72-
skip(req),
73-
err,
74-
fields(name, major_version)
75-
)]
76-
pub async fn create_alias(mut req: Request<Body>) -> ApiResult<ApiAlias> {
77-
let iam = req.iam();
78-
iam.check_admin_access()?;
79-
80-
let ApiCreateAliasRequest {
81-
name,
82-
major_version,
83-
target,
84-
} = decode_json(&mut req).await?;
85-
86-
let span = Span::current();
87-
span.record("name", &name);
88-
span.record("major_version", major_version);
89-
90-
let db = req.data::<Database>().unwrap();
91-
let alias = db.create_alias(&name, major_version, target).await?;
92-
93-
Ok(alias.into())
94-
}
95-
9655
#[instrument(name = "GET /api/admin/users", skip(req), err)]
9756
pub async fn list_users(req: Request<Body>) -> ApiResult<ApiList<ApiFullUser>> {
9857
let iam = req.iam();

api/src/api/types.rs

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -188,36 +188,6 @@ impl From<User> for ApiFullUser {
188188
}
189189
}
190190

191-
#[derive(Debug, Deserialize)]
192-
#[serde(rename_all = "camelCase")]
193-
pub struct ApiCreateAliasRequest {
194-
pub name: String,
195-
pub major_version: i32,
196-
pub target: AliasTarget,
197-
}
198-
199-
#[derive(Debug, Serialize)]
200-
#[serde(rename_all = "camelCase")]
201-
pub struct ApiAlias {
202-
pub name: String,
203-
pub major_version: i32,
204-
pub target: AliasTarget,
205-
pub updated_at: DateTime<Utc>,
206-
pub created_at: DateTime<Utc>,
207-
}
208-
209-
impl From<Alias> for ApiAlias {
210-
fn from(alias: Alias) -> Self {
211-
Self {
212-
name: alias.name,
213-
major_version: alias.major_version,
214-
target: alias.target,
215-
updated_at: alias.updated_at,
216-
created_at: alias.created_at,
217-
}
218-
}
219-
}
220-
221191
#[derive(Debug, Serialize, Deserialize)]
222192
#[serde(rename_all = "camelCase")]
223193
pub struct ApiScope {

0 commit comments

Comments
 (0)