fix: merge errors

plugins/catalog-backend/src/database/Database.test.ts

@@ -19,16 +19,16 @@ import {
   getVoidLogger,
   NotFoundError,
 } from '@backstage/backend-common';
-import { Entity } from '@backstage/catalog-model';
 import Knex from 'knex';
 import path from 'path';
-import { Database } from './Database';
 import {
-  AddDatabaseLocation,
   DbEntityRequest,
   DbEntityResponse,
+  Database,
+  AddDatabaseLocation,
   DbLocationsRow,
-} from './types';
+} from '.';
+import { Entity } from '@backstage/catalog-model';
 
 describe('Database', () => {
   let database: Knex;

plugins/catalog-backend/src/database/DatabaseManager.test.ts

@@ -15,12 +15,12 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import { Entity, EntityPolicy } from '@backstage/catalog-model';
 import Knex from 'knex';
-import { IngestionModel } from '../ingestion/types';
 import { Database } from './Database';
 import { DatabaseManager } from './DatabaseManager';
 import { DatabaseLocationUpdateLogStatus, DbLocationsRow } from './types';
+import { EntityPolicy, Entity } from '@backstage/catalog-model';
+import { IngestionModel } from '..';
 
 describe('DatabaseManager', () => {
   describe('refreshLocations', () => {

plugins/catalog/src/api/types.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { createApiRef } from '@backstage/core';
-import { DescriptorEnvelope } from '../types';
+import { Entity } from '@backstage/catalog-model';
 
 export const catalogApiRef = createApiRef<CatalogApi>({
   id: 'plugin.catalog.service',
@@ -23,6 +23,6 @@ export const catalogApiRef = createApiRef<CatalogApi>({
 });
 
 export interface CatalogApi {
-  getEntities(): Promise<DescriptorEnvelope[]>;
-  getEntityByName(name: string): Promise<DescriptorEnvelope>;
+  getEntities(): Promise<Entity[]>;
+  getEntityByName(name: string): Promise<Entity>;
 }

plugins/catalog/src/data/utils.ts

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { DescriptorEnvelope } from '../api/types';
 import { Component } from './component';
+import { Entity } from '@backstage/catalog-model';
 
-export function envelopeToComponent(envelope: DescriptorEnvelope): Component {
+export function envelopeToComponent(envelope: Entity): Component {
   return {
     name: envelope.metadata?.name ?? '',
     kind: envelope.kind ?? 'unknown',
-    description: envelope.metadata?.description ?? 'placeholder',
+    description: envelope.metadata?.annotations?.description ?? 'placeholder',
   };
 }

yarn.lock

@@ -4290,15 +4290,7 @@
     "@types/passport" "*"
     "@types/passport-oauth2" "*"
 
-"@types/passport-oauth2-refresh@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/@types/passport-oauth2-refresh/-/passport-oauth2-refresh-1.1.1.tgz#cbe466d4fcac36182fd75bf55279c0b1e953c382"
-  integrity sha512-Tw0JvfDPv9asgFPACd9oOGCaD/0/Uyi+QF7fmrJC74cJKC6I8N8wwhJJHyfd1N2E/qaLgTh431lhOa9jicpNdg==
-  dependencies:
-    "@types/oauth" "*"
-    "@types/passport-oauth2" "*"
-
-"@types/passport-oauth2@*", "@types/passport-oauth2@^1.4.9":
+"@types/passport-oauth2@*":
   version "1.4.9"
   resolved "https://registry.npmjs.org/@types/passport-oauth2/-/passport-oauth2-1.4.9.tgz#134007c4b505a82548c9cb19094c5baeb2205c92"
   integrity sha512-QP0q+NVQOaIu2r0e10QWkiUA0Ya5mOBHRJN0UrI+LolMLOP1/VN4EVIpJ3xVwFo+xqNFRoFvFwJhBvKnk7kpUA==
@@ -16110,12 +16102,7 @@ passport-google-oauth20@^2.0.0:
   dependencies:
     passport-oauth2 "1.x.x"
 
-passport-oauth2-refresh@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/passport-oauth2-refresh/-/passport-oauth2-refresh-2.0.0.tgz#7b19c77ff3cc000819c69f6ad9e318450f57b85e"
-  integrity sha512-yXvCB6nem/O+WThhiyI3TlPXpzSGY+9+hy9OTx9QF8e9GInplyRHxHaaOhFylKvnof9UmWHAufQFZk8cO1Fb2g==
-
-passport-oauth2@1.x.x, passport-oauth2@^1.5.0:
+passport-oauth2@1.x.x:
   version "1.5.0"
   resolved "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.5.0.tgz#64babbb54ac46a4dcab35e7f266ed5294e3c4108"
   integrity sha512-kqBt6vR/5VlCK8iCx1/KpY42kQ+NEHZwsSyt4Y6STiNjU+wWICG1i8ucc1FapXDGO15C5O5VZz7+7vRzrDPXXQ==