From 17537b033d7a896848b3c00c5af4e638cbbcefb6 Mon Sep 17 00:00:00 2001
From: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Date: Thu, 9 Mar 2023 14:16:42 +0000
Subject: [PATCH] API keys: Add last_used_at and docs changes for migration
 (#64293)

* feat: last_used_at for apikeys

* add: docs and copy changes

* refactor: use br correctly

* remove docs

* removed more docs
---
 pkg/api/apikey.go                                        | 1 +
 pkg/api/dtos/apikey.go                                   | 1 +
 public/app/features/api-keys/ApiKeysTable.tsx            | 9 +++++++++
 .../features/api-keys/MigrateToServiceAccountsCard.tsx   | 9 ++++++---
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkg/api/apikey.go b/pkg/api/apikey.go
index 7a3372a78f9..dcabb191f95 100644
--- a/pkg/api/apikey.go
+++ b/pkg/api/apikey.go
@@ -47,6 +47,7 @@ func (hs *HTTPServer) GetAPIKeys(c *contextmodel.ReqContext) response.Response {
 			Name:       t.Name,
 			Role:       t.Role,
 			Expiration: expiration,
+			LastUsedAt: t.LastUsedAt,
 		}
 	}
 
diff --git a/pkg/api/dtos/apikey.go b/pkg/api/dtos/apikey.go
index 6540bf02dc5..eb7288771bd 100644
--- a/pkg/api/dtos/apikey.go
+++ b/pkg/api/dtos/apikey.go
@@ -22,5 +22,6 @@ type ApiKeyDTO struct {
 	Name          string                 `json:"name"`
 	Role          org.RoleType           `json:"role"`
 	Expiration    *time.Time             `json:"expiration,omitempty"`
+	LastUsedAt    *time.Time             `json:"lastUsedAt,omitempty"`
 	AccessControl accesscontrol.Metadata `json:"accessControl,omitempty"`
 }
diff --git a/public/app/features/api-keys/ApiKeysTable.tsx b/public/app/features/api-keys/ApiKeysTable.tsx
index fa449cc73b4..2b39ed5edd0 100644
--- a/public/app/features/api-keys/ApiKeysTable.tsx
+++ b/public/app/features/api-keys/ApiKeysTable.tsx
@@ -26,6 +26,7 @@ export const ApiKeysTable: FC<Props> = ({ apiKeys, timeZone, onDelete, onMigrate
           <th>Name</th>
           <th>Role</th>
           <th>Expires</th>
+          <th>Last used at</th>
           <th style={{ width: '34px' }} />
         </tr>
       </thead>
@@ -47,6 +48,7 @@ export const ApiKeysTable: FC<Props> = ({ apiKeys, timeZone, onDelete, onMigrate
                     </span>
                   )}
                 </td>
+                <td>{formatLastUsedAtDate(timeZone, key.lastUsedAt)}</td>
                 <td>
                   <HorizontalGroup justify="flex-end">
                     <Button size="sm" onClick={() => onMigrate(key)}>
@@ -69,6 +71,13 @@ export const ApiKeysTable: FC<Props> = ({ apiKeys, timeZone, onDelete, onMigrate
   );
 };
 
+function formatLastUsedAtDate(timeZone: TimeZone, lastUsedAt?: string): string {
+  if (!lastUsedAt) {
+    return 'Never';
+  }
+  return dateTimeFormat(lastUsedAt, { timeZone });
+}
+
 function formatDate(expiration: string | undefined, timeZone: TimeZone): string {
   if (!expiration) {
     return 'No expiration date';
diff --git a/public/app/features/api-keys/MigrateToServiceAccountsCard.tsx b/public/app/features/api-keys/MigrateToServiceAccountsCard.tsx
index 0f1d7e107b2..78a8d258104 100644
--- a/public/app/features/api-keys/MigrateToServiceAccountsCard.tsx
+++ b/public/app/features/api-keys/MigrateToServiceAccountsCard.tsx
@@ -26,8 +26,11 @@ export const MigrateToServiceAccountsCard = ({ onMigrate, apikeysCount, disabled
   );
   const migrationBoxDesc = (
     <span>
-      Are you sure you want to migrate all API keys to service accounts? {docsLink}
-      <br>This hides the API keys tab.</br>
+      Migrating all API keys will hide the API keys tab.
+      <br></br>
+      <br></br>
+      The API keys API will remain available for you to create new API keys, but we strongly encourage you to use
+      Service accounts instead.
     </span>
   );
 
@@ -44,7 +47,7 @@ export const MigrateToServiceAccountsCard = ({ onMigrate, apikeysCount, disabled
               Migrate all service accounts
             </Button>
             <ConfirmModal
-              title={'Migrate API keys to service accounts'}
+              title={'Migrate API keys to Service accounts'}
               isOpen={isModalOpen}
               body={migrationBoxDesc}
               confirmText={'Yes, migrate now'}