From 0f2534537f7ee86ec37613aa6aee4605938baa5e Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 16 Aug 2022 09:42:30 +0200 Subject: [PATCH] chore: cleanup lint errors Signed-off-by: blam --- plugins/sonarqube-backend/package.json | 2 ++ plugins/sonarqube-backend/src/service/router.ts | 2 +- .../src/service/sonarqubeInfoProvider.test.ts | 4 ++-- plugins/sonarqube/src/components/useProjectKey.test.ts | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/sonarqube-backend/package.json b/plugins/sonarqube-backend/package.json index e4d87147b3..c9b281621c 100644 --- a/plugins/sonarqube-backend/package.json +++ b/plugins/sonarqube-backend/package.json @@ -25,6 +25,7 @@ "dependencies": { "@backstage/backend-common": "^0.15.0-next.1", "@backstage/config": "^1.0.1", + "@backstage/errors": "^1.1.0", "@types/express": "*", "express": "^4.18.1", "express-promise-router": "^4.1.0", @@ -34,6 +35,7 @@ }, "devDependencies": { "@backstage/cli": "^0.18.1-next.0", + "@backstage/test-utils": "^1.1.3-next.0", "@types/supertest": "^2.0.12", "msw": "^0.44.2", "supertest": "^6.2.4" diff --git a/plugins/sonarqube-backend/src/service/router.ts b/plugins/sonarqube-backend/src/service/router.ts index 45cdcb64c3..f244ae5ce3 100644 --- a/plugins/sonarqube-backend/src/service/router.ts +++ b/plugins/sonarqube-backend/src/service/router.ts @@ -19,7 +19,7 @@ import express from 'express'; import Router from 'express-promise-router'; import { Logger } from 'winston'; import { SonarqubeInfoProvider } from './sonarqubeInfoProvider'; -import { InputError } from '../../../../packages/errors'; +import { InputError } from '@backstage/errors'; /** * Dependencies needed by the router diff --git a/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.test.ts b/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.test.ts index e617324555..64313e8fd2 100644 --- a/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.test.ts +++ b/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.test.ts @@ -14,13 +14,13 @@ * limitations under the License. */ -import { ConfigReader } from '../../../../packages/config'; +import { ConfigReader } from '@backstage/config'; import { DefaultSonarqubeInfoProvider, SonarqubeConfig, } from './sonarqubeInfoProvider'; import { setupServer } from 'msw/node'; -import { setupRequestMockHandlers } from '../../../../packages/test-utils'; +import { setupRequestMockHandlers } from '@backstage/test-utils'; import { rest, RestRequest } from 'msw'; describe('SonarqubeConfig', () => { diff --git a/plugins/sonarqube/src/components/useProjectKey.test.ts b/plugins/sonarqube/src/components/useProjectKey.test.ts index be83c236df..921e9455c0 100644 --- a/plugins/sonarqube/src/components/useProjectKey.test.ts +++ b/plugins/sonarqube/src/components/useProjectKey.test.ts @@ -19,7 +19,7 @@ import { SONARQUBE_PROJECT_KEY_ANNOTATION, useProjectInfo, } from './useProjectKey'; -import { Entity } from '../../../../packages/catalog-model'; +import { Entity } from '@backstage/catalog-model'; const createDummyEntity = (sonarqubeAnnotationValue: string): Entity => { return {