diff --git a/pkg/services/cloudmigration/model.go b/pkg/services/cloudmigration/model.go index dc1d7cc58e3..d1ccafe3da7 100644 --- a/pkg/services/cloudmigration/model.go +++ b/pkg/services/cloudmigration/model.go @@ -58,6 +58,12 @@ type CloudMigrationRunList struct { } // swagger:parameters createMigration +type CloudMigrationRequestParams struct { + // required: true + // in: body + Body CloudMigrationRequest `json:"body"` +} + type CloudMigrationRequest struct { AuthToken string `json:"authToken"` } diff --git a/public/api-merged.json b/public/api-merged.json index 683d692ce1a..80ae39ac437 100644 --- a/public/api-merged.json +++ b/public/api-merged.json @@ -2319,9 +2319,12 @@ "operationId": "createMigration", "parameters": [ { - "type": "string", - "name": "authToken", - "in": "query" + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/CloudMigrationRequest" + } } ], "responses": { @@ -12751,6 +12754,14 @@ } } }, + "CloudMigrationRequest": { + "type": "object", + "properties": { + "authToken": { + "type": "string" + } + } + }, "CloudMigrationResponse": { "type": "object", "properties": { diff --git a/public/app/features/migrate-to-cloud/api/endpoints.gen.ts b/public/app/features/migrate-to-cloud/api/endpoints.gen.ts index 2ac2beb2898..110b4ae30b7 100644 --- a/public/app/features/migrate-to-cloud/api/endpoints.gen.ts +++ b/public/app/features/migrate-to-cloud/api/endpoints.gen.ts @@ -5,11 +5,7 @@ const injectedRtkApi = api.injectEndpoints({ query: () => ({ url: `/cloudmigration/migration` }), }), createMigration: build.mutation({ - query: (queryArg) => ({ - url: `/cloudmigration/migration`, - method: 'POST', - params: { authToken: queryArg.authToken }, - }), + query: (queryArg) => ({ url: `/cloudmigration/migration`, method: 'POST', body: queryArg.cloudMigrationRequest }), }), deleteCloudMigration: build.mutation({ query: (queryArg) => ({ url: `/cloudmigration/migration/${queryArg.id}`, method: 'DELETE' }), @@ -20,6 +16,9 @@ const injectedRtkApi = api.injectEndpoints({ getCloudMigrationRunList: build.query({ query: (queryArg) => ({ url: `/cloudmigration/migration/${queryArg.id}/run` }), }), + runCloudMigration: build.mutation({ + query: (queryArg) => ({ url: `/cloudmigration/migration/${queryArg.id}/run`, method: 'POST' }), + }), getCloudMigrationRun: build.query({ query: (queryArg) => ({ url: `/cloudmigration/migration/${queryArg.id}/run/${queryArg.runId}` }), }), @@ -34,7 +33,7 @@ export type GetMigrationListApiResponse = /** status 200 (empty) */ CloudMigrati export type GetMigrationListApiArg = void; export type CreateMigrationApiResponse = /** status 200 (empty) */ CloudMigrationResponse; export type CreateMigrationApiArg = { - authToken?: string; + cloudMigrationRequest: CloudMigrationRequest; }; export type DeleteCloudMigrationApiResponse = unknown; export type DeleteCloudMigrationApiArg = { @@ -51,7 +50,12 @@ export type GetCloudMigrationRunListApiArg = { /** ID of an migration */ id: number; }; -export type GetCloudMigrationRunApiResponse = /** status 200 (empty) */ CloudMigrationRun; +export type RunCloudMigrationApiResponse = /** status 200 (empty) */ MigrateDataResponseDto; +export type RunCloudMigrationApiArg = { + /** ID of an migration */ + id: number; +}; +export type GetCloudMigrationRunApiResponse = /** status 200 (empty) */ MigrateDataResponseDto; export type GetCloudMigrationRunApiArg = { /** ID of an migration */ id: number; @@ -79,32 +83,21 @@ export type ErrorResponseBody = { For example, a 412 Precondition Failed error may include additional information of why that error happened. */ status?: string; }; -export type MigratedResourceResult = { - message?: string; - status?: string; +export type CloudMigrationRequest = { + authToken?: string; }; -export type MigratedResource = { - id?: string; - name?: string; - refID?: string; - result?: MigratedResourceResult; - type?: string; +export type ItemStatus = string; +export type MigrateDataResponseItemDto = { + error?: string; + refId?: string; + status?: ItemStatus; }; -export type MigrationResult = { - message?: string; - status?: string; -}; -export type CloudMigrationRun = { - created?: string; - finished?: string; +export type MigrateDataResponseDto = { id?: number; - items?: MigratedResource[]; - result?: MigrationResult; - uid?: string; - updated?: string; + items?: MigrateDataResponseItemDto[]; }; export type CloudMigrationRunList = { - runs?: CloudMigrationRun[]; + runs?: MigrateDataResponseDto[]; }; export type CreateAccessTokenResponseDto = { token?: string; @@ -115,6 +108,7 @@ export const { useDeleteCloudMigrationMutation, useGetCloudMigrationQuery, useGetCloudMigrationRunListQuery, + useRunCloudMigrationMutation, useGetCloudMigrationRunQuery, useCreateCloudMigrationTokenMutation, } = injectedRtkApi; diff --git a/public/openapi3.json b/public/openapi3.json index 9189689cfe4..fbc17b006c7 100644 --- a/public/openapi3.json +++ b/public/openapi3.json @@ -3532,6 +3532,14 @@ }, "type": "object" }, + "CloudMigrationRequest": { + "properties": { + "authToken": { + "type": "string" + } + }, + "type": "object" + }, "CloudMigrationResponse": { "properties": { "created": { @@ -14799,15 +14807,17 @@ }, "post": { "operationId": "createMigration", - "parameters": [ - { - "in": "query", - "name": "authToken", - "schema": { - "type": "string" + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CloudMigrationRequest" + } } - } - ], + }, + "required": true, + "x-originalParamName": "body" + }, "responses": { "200": { "$ref": "#/components/responses/cloudMigrationResponse"