diff --git a/pkg/services/cloudmigration/api/api.go b/pkg/services/cloudmigration/api/api.go index 053b4c2bd7f..33af548859e 100644 --- a/pkg/services/cloudmigration/api/api.go +++ b/pkg/services/cloudmigration/api/api.go @@ -72,7 +72,7 @@ func (cma *CloudMigrationAPI) CreateToken(c *contextmodel.ReqContext) response.R return response.Error(http.StatusInternalServerError, "creating gcom access token", err) } - return response.JSON(http.StatusOK, cloudmigration.CreateAccessTokenResponseDTO(resp)) + return response.JSON(http.StatusOK, CreateAccessTokenResponseDTO(resp)) } // swagger:route GET /cloudmigration/migration migrations getMigrationList @@ -325,5 +325,9 @@ type CloudMigrationRunListResponse struct { // swagger:response cloudMigrationCreateTokenResponse type CloudMigrationCreateTokenResponse struct { // in: body - Body cloudmigration.CreateAccessTokenResponseDTO + Body CreateAccessTokenResponseDTO +} + +type CreateAccessTokenResponseDTO struct { + Token string `json:"token"` } diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_noop.go b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_noop.go index 46bf9107ba2..f95188f088c 100644 --- a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_noop.go +++ b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_noop.go @@ -11,10 +11,6 @@ type NoopServiceImpl struct{} var _ cloudmigration.Service = (*NoopServiceImpl)(nil) -func (s *NoopServiceImpl) MigrateDatasources(ctx context.Context, request *cloudmigration.MigrateDatasourcesRequest) (*cloudmigration.MigrateDatasourcesResponse, error) { - return nil, cloudmigration.ErrFeatureDisabledError -} - func (s *NoopServiceImpl) CreateToken(ctx context.Context) (cloudmigration.CreateAccessTokenResponse, error) { return cloudmigration.CreateAccessTokenResponse{}, cloudmigration.ErrFeatureDisabledError } diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go index 008a9b66add..73140be8b9d 100644 --- a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go +++ b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go @@ -10,6 +10,6 @@ import ( func Test_NoopServiceDoesNothing(t *testing.T) { s := &NoopServiceImpl{} - _, e := s.MigrateDatasources(context.Background(), &cloudmigration.MigrateDatasourcesRequest{}) + _, e := s.CreateToken(context.Background()) assert.ErrorIs(t, e, cloudmigration.ErrFeatureDisabledError) } diff --git a/pkg/services/cloudmigration/model.go b/pkg/services/cloudmigration/model.go index b9c78dca4a1..23642db4482 100644 --- a/pkg/services/cloudmigration/model.go +++ b/pkg/services/cloudmigration/model.go @@ -29,24 +29,6 @@ type CloudMigration struct { Updated time.Time `json:"updated"` } -type MigratedResourceResult struct { - Status string `json:"status"` - Message string `json:"message"` -} - -type MigrationResult struct { - Status string `json:"status"` - Message string `json:"message"` -} - -type MigratedResource struct { - Type string `json:"type"` - ID string `json:"id"` - RefID string `json:"refID"` - Name string `json:"name"` - Result MigratedResourceResult `json:"result"` -} - type CloudMigrationRun struct { ID int64 `json:"id" xorm:"pk autoincr 'id'"` UID string `json:"uid" xorm:"uid"` @@ -71,13 +53,6 @@ type CloudMigrationRunList struct { Runs []MigrateDataResponseListDTO `json:"runs"` } -// swagger:parameters createMigration -type CloudMigrationRequestParams struct { - // required: true - // in: body - Body CloudMigrationRequest `json:"body"` -} - type CloudMigrationRequest struct { AuthToken string `json:"authToken"` } @@ -93,34 +68,12 @@ type CloudMigrationListResponse struct { Migrations []CloudMigrationResponse `json:"migrations"` } -type MigrateDatasourcesRequest struct { - MigrateToPDC bool - MigrateCredentials bool -} - -type MigrateDatasourcesResponse struct { - DatasourcesMigrated int -} - -type MigrateDatasourcesRequestDTO struct { - MigrateToPDC bool `json:"migrateToPDC"` - MigrateCredentials bool `json:"migrateCredentials"` -} - -type MigrateDatasourcesResponseDTO struct { - DatasourcesMigrated int `json:"datasourcesMigrated"` -} - // access token type CreateAccessTokenResponse struct { Token string } -type CreateAccessTokenResponseDTO struct { - Token string `json:"token"` -} - type Base64EncodedTokenPayload struct { Token string Instance Base64HGInstance diff --git a/public/api-enterprise-spec.json b/public/api-enterprise-spec.json index aed0c6c4d92..e1e2b3f9504 100644 --- a/public/api-enterprise-spec.json +++ b/public/api-enterprise-spec.json @@ -3055,14 +3055,6 @@ } } }, - "CloudMigrationRequest": { - "type": "object", - "properties": { - "authToken": { - "type": "string" - } - } - }, "CloudMigrationResponse": { "type": "object", "properties": { diff --git a/public/api-merged.json b/public/api-merged.json index 17717dfe901..bea49171c9f 100644 --- a/public/api-merged.json +++ b/public/api-merged.json @@ -2322,16 +2322,6 @@ ], "summary": "Create a migration.", "operationId": "createMigration", - "parameters": [ - { - "name": "body", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/CloudMigrationRequest" - } - } - ], "responses": { "200": { "$ref": "#/responses/cloudMigrationResponse" @@ -13020,14 +13010,6 @@ } } }, - "CloudMigrationRequest": { - "type": "object", - "properties": { - "authToken": { - "type": "string" - } - } - }, "CloudMigrationResponse": { "type": "object", "properties": { diff --git a/public/openapi3.json b/public/openapi3.json index 40a0399bda3..8648f538b5d 100644 --- a/public/openapi3.json +++ b/public/openapi3.json @@ -3657,14 +3657,6 @@ }, "type": "object" }, - "CloudMigrationRequest": { - "properties": { - "authToken": { - "type": "string" - } - }, - "type": "object" - }, "CloudMigrationResponse": { "properties": { "created": { @@ -14962,17 +14954,6 @@ }, "post": { "operationId": "createMigration", - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CloudMigrationRequest" - } - } - }, - "required": true, - "x-originalParamName": "body" - }, "responses": { "200": { "$ref": "#/components/responses/cloudMigrationResponse"