[v10.0.x] Service accounts: API key migration refactoring to parse as json object of the results (#69776)

Service accounts: API key migration refactoring to parse as json object of the results (#69771)

refactoring to parse as json object of the results

(cherry picked from commit 5dceb5dff3)

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
This commit is contained in:
Grot (@grafanabot)
2023-06-09 11:21:08 +02:00
committed by GitHub
co-authored by Eric Leijonmarck
parent f3fab4078d
commit 2c7f295cf4
3 changed files with 7 additions and 8 deletions
+5 -5
View File
@@ -38,11 +38,11 @@ var (
)
type MigrationResult struct {
Total int
Migrated int
Failed int
FailedApikeyIDs []int64
FailedDetails []string
Total int `json:"total"`
Migrated int `json:"migrated"`
Failed int `json:"failed"`
FailedApikeyIDs []int64 `json:"failedApikeyIDs"`
FailedDetails []string `json:"failedDetails"`
}
type ServiceAccount struct {
@@ -36,7 +36,7 @@ export function migrateAll(): ThunkResult<void> {
return async (dispatch) => {
try {
const payload = await getBackendSrv().post('/api/serviceaccounts/migrate');
dispatch(setMigrationResult({ payload }));
dispatch(setMigrationResult(payload));
} finally {
dispatch(loadApiKeys());
}
@@ -39,8 +39,7 @@ const apiKeysSlice = createSlice({
return { ...state, hasFetched: false };
},
setMigrationResult: (state, action): ApiKeysState => {
const { migrationResult } = action.payload;
return { ...state, migrationResult: migrationResult };
return { ...state, migrationResult: action.payload };
},
},
});