From e5ed8f95d1e318044eff61f967fe1fd3b8a8a4b9 Mon Sep 17 00:00:00 2001
From: Ivan Shmidt <bahoc47@gmail.com>
Date: Mon, 27 Jul 2020 14:38:07 +0200
Subject: [PATCH] fix(cli): e2e backend PR adjustments

---
 .github/workflows/cli.yml                              |  2 +-
 packages/backend/src/index.ts                          | 10 +++++-----
 packages/cli/e2e-test/cli-e2e-test.js                  |  6 ++++--
 .../templates/default-app/packages/backend/README.md   |  2 --
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index 13b84a555f..32fb15d329 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -15,7 +15,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:10.8
+        image: postgres:latest
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index 0da700d205..9d2d89a049 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -50,7 +50,7 @@ function makeCreateEnv(loadedConfigs: AppConfig[]) {
       'POSTGRES_USER',
       'POSTGRES_HOST',
       'POSTGRES_PASSWORD',
-    ].every(key => Object.keys(process.env).includes(key));
+    ].every(key => config.getOptional(`backend.${key}`));
 
     let knexConfig;
 
@@ -59,10 +59,10 @@ function makeCreateEnv(loadedConfigs: AppConfig[]) {
         client: 'pg',
         useNullAsDefault: true,
         connection: {
-          port: process.env.POSTGRES_PORT,
-          host: process.env.POSTGRES_HOST,
-          user: process.env.POSTGRES_USER,
-          password: process.env.POSTGRES_PASSWORD,
+          port: config.getOptionalNumber('backend.POSTGRES_PORT'),
+          host: config.getString('backend.POSTGRES_HOST'),
+          user: config.getString('backend.POSTGRES_USER'),
+          password: config.getString('backend.POSTGRES_PASSWORD'),
           database: `backstage_plugin_${plugin}`,
         } as PgConnectionConfig,
       };
diff --git a/packages/cli/e2e-test/cli-e2e-test.js b/packages/cli/e2e-test/cli-e2e-test.js
index 37c1904b6d..6bab97f66b 100644
--- a/packages/cli/e2e-test/cli-e2e-test.js
+++ b/packages/cli/e2e-test/cli-e2e-test.js
@@ -318,7 +318,7 @@ async function testBackendStart(appDir, isPostgres) {
     await waitFor(() => stdout.includes('Listening on ') || stderr !== '');
     if (stderr !== '') {
       // Skipping the whole block
-      throw new Error();
+      throw new Error(stderr);
     }
 
     print('Try to fetch entities from the backend');
@@ -328,6 +328,8 @@ async function testBackendStart(appDir, isPostgres) {
     );
     print('Entities fetched successfully');
     successful = true;
+  } catch (error) {
+    throw new Error(`Backend failed to startup: ${error}`);
   } finally {
     print('Stopping the child process');
     // Kill entire process group, otherwise we'll end up with hanging serve processes
@@ -338,7 +340,7 @@ async function testBackendStart(appDir, isPostgres) {
     await waitForExit(child);
   } catch (error) {
     if (!successful) {
-      throw error;
+      throw new Error(`Backend failed to startup: ${stderr}`);
     }
     print('Backend startup test finished successfully');
   }
diff --git a/packages/cli/templates/default-app/packages/backend/README.md b/packages/cli/templates/default-app/packages/backend/README.md
index 90c70912f0..f94904a930 100644
--- a/packages/cli/templates/default-app/packages/backend/README.md
+++ b/packages/cli/templates/default-app/packages/backend/README.md
@@ -29,8 +29,6 @@ AUTH_GOOGLE_CLIENT_ID=x AUTH_GOOGLE_CLIENT_SECRET=x \
 AUTH_GITHUB_CLIENT_ID=x AUTH_GITHUB_CLIENT_SECRET=x \
 AUTH_OAUTH2_CLIENT_ID=x AUTH_OAUTH2_CLIENT_SECRET=x \
 AUTH_OAUTH2_AUTH_URL=x AUTH_OAUTH2_TOKEN_URL=x \
-ROLLBAR_ACCOUNT_TOKEN=x \
-SENTRY_TOKEN=x \
 LOG_LEVEL=debug \
 yarn start
 ```