From f0b97f5ff98657b37d69989c885fefb99e755e42 Mon Sep 17 00:00:00 2001 From: nikek Date: Thu, 14 May 2020 15:04:18 +0200 Subject: [PATCH] make env string 'false' set cors to false --- plugins/catalog-backend/package.json | 1 + plugins/catalog-backend/src/run.ts | 7 +++---- yarn.lock | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json index c0c8f0b396..629f4c6d18 100644 --- a/plugins/catalog-backend/package.json +++ b/plugins/catalog-backend/package.json @@ -24,6 +24,7 @@ "uuid": "^8.0.0", "winston": "^3.2.1", "yaml": "^1.9.2", + "yn": "^4.0.0", "yup": "^0.28.5" }, "devDependencies": { diff --git a/plugins/catalog-backend/src/run.ts b/plugins/catalog-backend/src/run.ts index 0d5c3a5c12..a2c2601258 100644 --- a/plugins/catalog-backend/src/run.ts +++ b/plugins/catalog-backend/src/run.ts @@ -14,16 +14,15 @@ * limitations under the License. */ +import yn from 'yn'; import { getRootLogger } from '@backstage/backend-common'; import { startStandaloneServer } from './service/standaloneServer'; const port = process.env.PLUGIN_PORT ? Number(process.env.PLUGIN_PORT) : 3003; -const enableCors = process.env.PLUGIN_CORS - ? Boolean(process.env.PLUGIN_CORS) - : false; +const enableCors = yn(process.env.PLUGIN_CORS, { default: false }); const logger = getRootLogger(); -startStandaloneServer({ port, enableCors, logger }).catch((err) => { +startStandaloneServer({ port, enableCors, logger }).catch(err => { logger.error(err); process.exit(1); }); diff --git a/yarn.lock b/yarn.lock index 0231237bc7..c1316ada9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22537,6 +22537,11 @@ yn@3.1.1: resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== +yn@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/yn/-/yn-4.0.0.tgz#611480051ea43b510da1dfdbe177ed159f00a979" + integrity sha512-huWiiCS4TxKc4SfgmTwW1K7JmXPPAmuXWYy4j9qjQo4+27Kni8mGhAAi1cloRWmBe2EqcLgt3IGqQoRL/MtPgg== + yup@^0.28.5: version "0.28.5" resolved "https://registry.npmjs.org/yup/-/yup-0.28.5.tgz#85cabb4000d3623ef69be81551190692e631a8a5"