chore: #629 migrate to config of json (#673)

Changes - Migrate for web-components - Migrate for smb - Migrate for cognito custom mail lambda - Migrate for cognito auth
reapit · Mar 20, 2020 · 4970058 · 4970058
1 parent eb3f5c7
commit 4970058
Show file tree

Hide file tree

Showing 34 changed files with 67 additions and 103 deletions.
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "lint:fix": "lerna run --parallel --stream lint:fix --",
     "release:dev": "lerna run --parallel release:dev",
     "release:prod": "lerna run --parallel release:prod",
-    "test": "lerna run --parallel test:ci -- --runInBand",
+    "test": "lerna run --parallel test:ci -- --runInBand --detectOpenHandles",
     "test-e2e:ci": "lerna run --parallel test-e2e:ci"
   },
   "husky": {

diff --git a/packages/cognito-auth/src/utils/cognito.test.ts b/packages/cognito-auth/src/utils/cognito.test.ts
@@ -244,7 +244,7 @@ describe('Session utils', () => {
   describe('redirectToLogout', () => {
     it('should redirect to the OAuth endpoint for logout', () => {
       window.location.href = ''
-      process.env.COGNITO_OAUTH_URL = ''
+      window.reapit.config.cognitoOAuthUrl = ''
       redirectToLogout('cognitoClientId', 'redirectUri', 'DEVELOPER')
       expect(window.location.href).toEqual('/logout?client_id=cognitoClientId&logout_uri=redirectUri&state=DEVELOPER')
     })

diff --git a/packages/cognito-custom-mail-lambda/config.example.json b/packages/cognito-custom-mail-lambda/config.example.json
@@ -0,0 +1,4 @@
+{
+  "MARKET_PLACE_URL": "",
+  "COGNITO_USERPOOL_ID": ""
+}
diff --git a/packages/cognito-custom-mail-lambda/package.json b/packages/cognito-custom-mail-lambda/package.json
@@ -14,7 +14,8 @@
     "release:prod": "node ../../scripts/release/release-serverless.js cognito-custom-mail-lambda",
     "test:update-badges": "yarn test:ci && jest-coverage-badges --input src/tests/coverage/coverage-summary.json --output src/tests/badges",
     "lint": "concurrently \"tsc --noEmit\" \"eslint --cache --ext=ts,tsx,js src\"",
-    "lint:fix": "eslint --cache --ext=ts,tsx,js src --fix"
+    "lint:fix": "eslint --cache --ext=ts,tsx,js src --fix",
+    "fetch-config": "yarn config-manager fetchConfig cognito-custom-mail-lambda"
   },
   "repository": {
     "type": "git",

diff --git a/packages/cognito-custom-mail-lambda/serverless.yml b/packages/cognito-custom-mail-lambda/serverless.yml
@@ -1,5 +1,5 @@
 service: cognito-mailer
-custom: ${file(../../reapit-config.json)}
+custom: ${file(./config.json)}
 provider:
   name: aws
   runtime: nodejs10.x
@@ -9,8 +9,8 @@ provider:
     name: cognito.mailer.${self:provider.stage}
     blockPublicAccess: false
   environment:
-    COGNITO_USERPOOL_ID: ${self:custom.${file(./yml-helpers.js):provider.stage.uppercase}.COGNITO_USERPOOL_ID}
-    MARKET_PLACE_URL: ${self:custom.${file(./yml-helpers.js):provider.stage.uppercase}.MARKET_PLACE_URL}
+    COGNITO_USERPOOL_ID: ${self:custom.COGNITO_USERPOOL_ID}
+    MARKET_PLACE_URL: ${self:custom.MARKET_PLACE_URL}
 package:
   include:
     - dist/**
@@ -37,6 +37,6 @@ functions:
     handler: dist/app.cognitoCustomMailerHandler
     events:
       - cognitoUserPool:
-        pool: ${self:custom.${file(./yml-helpers.js):provider.stage.uppercase}.COGNITO_USERPOOL_ID}
+        pool: ${self:custom.COGNITO_USERPOOL_ID}
         trigger: CustomMessage
         existing: true
diff --git a/packages/cognito-custom-mail-lambda/yml-helpers.js b/packages/cognito-custom-mail-lambda/yml-helpers.js
diff --git a/packages/elements/.storybook/webpack.config.js b/packages/elements/.storybook/webpack.config.js
@@ -1,6 +1,6 @@
 const { EnvironmentPlugin } = require('webpack')
 const path = require('path')
-const envConfig = require('../../../reapit-config.json')
+const configEnv = require('../config.json')
 const { getVersionTag } = require('../../../scripts/release/utils')
 
 module.exports = ({ config }) => {
@@ -49,7 +49,7 @@ module.exports = ({ config }) => {
   )
   config.resolve.extensions.push('.ts', '.tsx')
   config.plugins.push(new EnvironmentPlugin({
-    ...envConfig[process.env.REAPIT_ENV || 'LOCAL'],
+    ...configEnv,
       APP_VERSION: `${getVersionTag().version}`,
   }))
   return config

diff --git a/packages/elements/config.example.json b/packages/elements/config.example.json
@@ -0,0 +1,4 @@
+{
+  "ELEMENTS_DOCUMENT_URL": "",
+  "GOOGLE_MAPS_API_KEY": ""
+}
diff --git a/packages/elements/package.json b/packages/elements/package.json
@@ -29,7 +29,8 @@
     "start:prod": "cross-env NODE_ENV=development tsdx watch",
     "test:ci": "cross-env TZ=UTC jest --ci --colors --coverage --silent --forceExit",
     "test:dev": "cross-env TZ=UTC jest --watch --verbose",
-    "test:update-badges": "yarn test:ci && jest-coverage-badges --input src/tests/coverage/coverage-summary.json --output src/tests/badges"
+    "test:update-badges": "yarn test:ci && jest-coverage-badges --input src/tests/coverage/coverage-summary.json --output src/tests/badges",
+    "fetch-config": "yarn config-manager fetchConfig elements"
   },
   "browserslist": [
     "> 1%",

diff --git a/packages/elements/src/components/Map/map.stories.tsx b/packages/elements/src/components/Map/map.stories.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { storiesOf } from '@storybook/react'
 import { Map } from './index'
 
-const MAP_API_KEY = process.env.MAP_API_KEY || ''
+const GOOGLE_MAPS_API_KEY = process.env.GOOGLE_MAPS_API_KEY || ''
 
 const onLoadedDirection = response => {
   console.log(response)
@@ -33,7 +33,7 @@ const onLoaded = response => {
 storiesOf('Map', module).add('Map', () => {
   return (
     <Map
-      apiKey={MAP_API_KEY}
+      apiKey={GOOGLE_MAPS_API_KEY}
       libraries="places,drawing"
       autoFitBounds={true}
       coordinates={[

diff --git a/packages/elements/src/tests/badges/badge-functions.svg b/packages/elements/src/tests/badges/badge-functions.svg
diff --git a/packages/elements/src/tests/badges/badge-lines.svg b/packages/elements/src/tests/badges/badge-lines.svg
diff --git a/packages/elements/src/tests/badges/badge-statements.svg b/packages/elements/src/tests/badges/badge-statements.svg
diff --git a/packages/graphql-server/config.example.json b/packages/graphql-server/config.example.json
@@ -0,0 +1,5 @@
+{
+  "PLATFORM_API_BASE_URL": "",
+  "MARKETPLACE_API_BASE_URL": "",
+  "COGNITO_USERPOOL_ID": ""
+}
diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json
@@ -19,7 +19,8 @@
     "start:prod": "node ./dist/app.js",
     "test:ci": "cross-env TZ=UTC jest --ci --colors --coverage --silent --forceExit",
     "test:dev": "cross-env TZ=UTC jest --watch --verbose",
-    "fetch-ts-definitions": "node scripts/fetch-ts-definitions.js"
+    "fetch-ts-definitions": "node scripts/fetch-ts-definitions.js",
+    "fetch-config": "yarn config-manager fetchConfig graphql-server"
   },
   "dependencies": {
     "@reapit/cognito-auth": "^2.0.19",

diff --git a/packages/graphql-server/serverless.yml b/packages/graphql-server/serverless.yml
@@ -2,7 +2,7 @@ service: graphql-server
 plugins:
   - serverless-webpack
 custom:
-  env: ${file(../../reapit-config.json)}
+  env: ${file(./config.json)}
   webpack:
     webpackConfig: 'webpack.config.js'
     includeModules: true
@@ -22,9 +22,9 @@ provider:
     blockPublicAccess: false
   environment:
     NODE_ENV: 'production'
-    COGNITO_USERPOOL_ID: ${self:custom.env.${file(./yml-helpers.js):provider.stage.uppercase}.COGNITO_USERPOOL_ID}
-    MARKETPLACE_API_BASE_URL: ${self:custom.env.${file(./yml-helpers.js):provider.stage.uppercase}.MARKETPLACE_API_BASE_URL}
-    PLATFORM_API_BASE_URL: ${self:custom.env.${file(./yml-helpers.js):provider.stage.uppercase}.PLATFORM_API_BASE_URL}
+    COGNITO_USERPOOL_ID: ${self:custom.env.COGNITO_USERPOOL_ID}
+    MARKETPLACE_API_BASE_URL: ${self:custom.env.MARKETPLACE_API_BASE_URL}
+    PLATFORM_API_BASE_URL: ${self:custom.env.PLATFORM_API_BASE_URL}
 
 package:
   individually: true

diff --git a/packages/graphql-server/src/app.ts b/packages/graphql-server/src/app.ts
@@ -13,7 +13,7 @@ import resolvers from './resolvers'
 const typeDefs = importSchema('./src/schema.graphql')
 
 if (process.env.NODE_ENV === 'development') {
-  const envConfig = require(path.resolve(__dirname, '../../..', 'reapit-config.json'))
+  const envConfig = require(path.resolve(__dirname, '..', 'config.json'))
   const configs = envConfig[process.env.REAPIT_ENV || 'LOCAL']
   for (const k in configs) {
     process.env[k] = configs[k]

diff --git a/packages/graphql-server/yml-helpers.js b/packages/graphql-server/yml-helpers.js
diff --git a/packages/marketplace/src/tests/cypress/plugins/index.js b/packages/marketplace/src/tests/cypress/plugins/index.js
@@ -3,7 +3,7 @@ const wp = require('@cypress/webpack-preprocessor')
 const ResolveTSPathsToWebpackAlias = require('ts-paths-to-webpack-alias')
 const tsConfigPath = path.resolve(__dirname, '../../tsconfig.json')
 
-const reapitConfig = require('../../../../reapit-config.json')
+const reapitConfig = require('../../config.json')
 
 module.exports = (on, config) => {
   // https://basarat.gitbooks.io/typescript/docs/testing/cypress.html
@@ -46,7 +46,7 @@ module.exports = (on, config) => {
   const reapitEnv = process.env.REAPIT_ENV || 'LOCAL'
 
   if (typeof reapitConfig !== 'object') {
-    throw new Error("reapit-config.json's content is invalid. Its type should be an object")
+    throw new Error("config.json's content is invalid. Its type should be an object")
   }
 
   const reapitConfigMatchedEnv = reapitConfig[reapitEnv]

diff --git a/packages/smb/src/tests/badges/badge-lines.svg b/packages/smb/src/tests/badges/badge-lines.svg
diff --git a/packages/smb/src/tests/badges/badge-statements.svg b/packages/smb/src/tests/badges/badge-statements.svg
diff --git a/packages/smb/src/tests/cypress/plugins/index.js b/packages/smb/src/tests/cypress/plugins/index.js
@@ -3,7 +3,7 @@ const wp = require('@cypress/webpack-preprocessor')
 const ResolveTSPathsToWebpackAlias = require('ts-paths-to-webpack-alias')
 const tsConfigPath = path.resolve(__dirname, '../../tsconfig.json')
 
-const reapitConfig = require('../../../../reapit-config.json')
+const reapitConfig = require('../../../../config.json')
 
 module.exports = (on, config) => {
   // https://basarat.gitbooks.io/typescript/docs/testing/cypress.html

diff --git a/packages/web-components/config.example.json b/packages/web-components/config.example.json
@@ -0,0 +1,7 @@
+{
+  "APP_ENV": "local",
+  "PLATFORM_API_BASE_URL": "",
+  "COGNITO_CLIENT_SECRET_SEARCH_WIDGET": "",
+  "COGNITO_CLIENT_ID_SEARCH_WIDGET": "",
+  "COGNITO_OAUTH_URL": ""
+}
diff --git a/packages/web-components/package.json b/packages/web-components/package.json
@@ -46,6 +46,7 @@
     "test:dev": "jest --watch --color",
     "test:ci": "cross-env TZ=UTC jest --ci --colors --coverage --silent --forceExit",
     "lint": "concurrently \"tsc --noEmit\" \"eslint --cache --ext=ts,tsx,js src\"",
-    "lint:fix": "eslint --cache --ext=ts,tsx,js src --fix"
+    "lint:fix": "eslint --cache --ext=ts,tsx,js src --fix",
+    "fetch-config": "yarn config-manager fetchConfig web-components"
   }
 }