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',
   };
 }