From 93ee33bf7eb3c42a1dc47d7c3596b2473c82aa3d Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 12 Aug 2020 19:25:56 +0200
Subject: [PATCH 1/3] cli: fix stdout not being logged in e2e test cmd failures

---
 packages/cli/e2e-test/helpers.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/cli/e2e-test/helpers.js b/packages/cli/e2e-test/helpers.js
index 84807119c3..580f53cbe8 100644
--- a/packages/cli/e2e-test/helpers.js
+++ b/packages/cli/e2e-test/helpers.js
@@ -60,6 +60,9 @@ async function runPlain(cmd, options) {
     });
     return stdout.trim();
   } catch (error) {
+    if (error.stdout) {
+      process.stdout.write(error.stdout);
+    }
     if (error.stderr) {
       process.stderr.write(error.stderr);
     }

From 4a58445d338dbc5f35987ae657cb0a6960c87251 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 12 Aug 2020 19:39:42 +0200
Subject: [PATCH 2/3] create-app: update backend catalog setup

---
 .../default-app/packages/backend/src/plugins/catalog.ts        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts
index 9df4570963..aa0538a6d8 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts
@@ -12,9 +12,10 @@ import { useHotCleanup } from '@backstage/backend-common';
 
 export default async function createPlugin({
   logger,
+  config,
   database,
 }: PluginEnvironment) {
-  const locationReader = new LocationReaders(logger);
+  const locationReader = new LocationReaders({ logger, config });
 
   const db = await DatabaseManager.createDatabase(database, { logger });
   const entitiesCatalog = new DatabaseEntitiesCatalog(db);

From aea535b0aafc2d4d77059f1297db360e7fae8040 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 13 Aug 2020 01:02:44 +0200
Subject: [PATCH 3/3] catalog-backend: fix migration script not using uuid for
 ID

---
 .../migrations/20200809202832_add_bootstrap_location.js      | 5 +++--
 .../src/catalog/DatabaseLocationsCatalog.test.ts             | 2 +-
 plugins/catalog-backend/src/database/CommonDatabase.test.ts  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/catalog-backend/migrations/20200809202832_add_bootstrap_location.js b/plugins/catalog-backend/migrations/20200809202832_add_bootstrap_location.js
index 3d13a4219a..379928493d 100644
--- a/plugins/catalog-backend/migrations/20200809202832_add_bootstrap_location.js
+++ b/plugins/catalog-backend/migrations/20200809202832_add_bootstrap_location.js
@@ -23,7 +23,7 @@ exports.up = async function up(knex) {
   // Adds a single 'bootstrap' location that can be used to trigger work in processors.
   // This is primarily here to fulfill foreign key constraints.
   await knex('locations').insert({
-    id: 'bootstrap',
+    id: require('uuid').v4(),
     type: 'bootstrap',
     target: 'bootstrap',
   });
@@ -35,7 +35,8 @@ exports.up = async function up(knex) {
 exports.down = async function down(knex) {
   await knex('locations')
     .where({
-      id: 'bootstrap',
+      type: 'bootstrap',
+      target: 'bootstrap',
     })
     .del();
 };
diff --git a/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.test.ts b/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.test.ts
index 456f06b334..958e864a8e 100644
--- a/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.test.ts
+++ b/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.test.ts
@@ -18,7 +18,7 @@ import { DatabaseManager } from '../database';
 import { DatabaseLocationsCatalog } from './DatabaseLocationsCatalog';
 
 const bootstrapLocation = {
-  id: 'bootstrap',
+  id: expect.any(String),
   type: 'bootstrap',
   target: 'bootstrap',
 };
diff --git a/plugins/catalog-backend/src/database/CommonDatabase.test.ts b/plugins/catalog-backend/src/database/CommonDatabase.test.ts
index 94dfc25aa4..b86b4ef959 100644
--- a/plugins/catalog-backend/src/database/CommonDatabase.test.ts
+++ b/plugins/catalog-backend/src/database/CommonDatabase.test.ts
@@ -25,7 +25,7 @@ import type {
 } from './types';
 
 const bootstrapLocation = {
-  id: 'bootstrap',
+  id: expect.any(String),
   type: 'bootstrap',
   target: 'bootstrap',
   message: null,
@@ -98,7 +98,7 @@ describe('CommonDatabase', () => {
       expect.arrayContaining([output, bootstrapLocation]),
     );
     const location = await db.location(
-      locations.find(l => l.id !== 'bootstrap')!.id,
+      locations.find(l => l.type !== 'bootstrap')!.id,
     );
     expect(location).toEqual(output);