From e79b485aa8d8f39e2682404c29956f1904ce387e Mon Sep 17 00:00:00 2001
From: Alex Auvolat <lx@deuxfleurs.fr>
Date: Thu, 17 Apr 2025 17:38:20 +0200
Subject: [PATCH] fix panic in ListAdminTokens

---
 src/api/admin/admin_token.rs | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/api/admin/admin_token.rs b/src/api/admin/admin_token.rs
index 082d942a..ac937eea 100644
--- a/src/api/admin/admin_token.rs
+++ b/src/api/admin/admin_token.rs
@@ -36,6 +36,20 @@ impl RequestHandler for ListAdminTokensRequest {
 			.map(|t| admin_token_info_results(t, now))
 			.collect::<Vec<_>>();
 
+		if garage.config.admin.metrics_token.is_some() {
+			res.insert(
+				0,
+				GetAdminTokenInfoResponse {
+					id: None,
+					created: None,
+					name: "metrics_token (from daemon configuration)".into(),
+					expiration: None,
+					expired: false,
+					scope: vec!["Metrics".into()],
+				},
+			);
+		}
+
 		if garage.config.admin.admin_token.is_some() {
 			res.insert(
 				0,
@@ -50,20 +64,6 @@ impl RequestHandler for ListAdminTokensRequest {
 			);
 		}
 
-		if garage.config.admin.metrics_token.is_some() {
-			res.insert(
-				1,
-				GetAdminTokenInfoResponse {
-					id: None,
-					created: None,
-					name: "metrics_token (from daemon configuration)".into(),
-					expiration: None,
-					expired: false,
-					scope: vec!["Metrics".into()],
-				},
-			);
-		}
-
 		Ok(ListAdminTokensResponse(res))
 	}
 }