Fix stage

kdcio · Jun 27, 2021 · 00afa24 · 00afa24
1 parent bd59aa1
commit 00afa24
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 30 deletions.
diff --git a/scripts/cdk-to-config-local.js b/scripts/cdk-to-config-local.js
@@ -5,7 +5,7 @@ const dotenv = require("dotenv");
 const yaml = require("yaml");
 const cdkOutput = require("../infra/.infra-output.json");
 
-const STAGE = "local";
+const ABU_STAGE = "local";
 
 /**
  * Update config yaml for API
@@ -14,13 +14,13 @@ let fileName = path.join(__dirname, `../config/local.yml`);
 let file = fs.readFileSync(fileName, "utf8");
 let configs = yaml.parse(file);
 
-const stack = cdkOutput[`AbuStack-${STAGE}`];
-configs.COG_POOL_ID = stack[`COGPOOLID${STAGE}`];
-configs.COG_POOL_ARN = stack[`COGPOOLARN${STAGE}`];
-configs.COG_POOL_CLIENT_ID = stack[`COGPOOLCLIENTID${STAGE}`];
-configs.COG_POOL_CLIENT_DOMAIN = stack[`COGPOOLCLIENTDOMAIN${STAGE}`];
-configs.COG_ACCESS_KEY_ID = stack[`COGACCESSKEYID${STAGE}`];
-configs.COG_SECRET_ACCESS_KEY = stack[`COGSECRETACCESSKEY${STAGE}`];
+const stack = cdkOutput[`AbuStack-${ABU_STAGE}`];
+configs.COG_POOL_ID = stack[`COGPOOLID${ABU_STAGE}`];
+configs.COG_POOL_ARN = stack[`COGPOOLARN${ABU_STAGE}`];
+configs.COG_POOL_CLIENT_ID = stack[`COGPOOLCLIENTID${ABU_STAGE}`];
+configs.COG_POOL_CLIENT_DOMAIN = stack[`COGPOOLCLIENTDOMAIN${ABU_STAGE}`];
+configs.COG_ACCESS_KEY_ID = stack[`COGACCESSKEYID${ABU_STAGE}`];
+configs.COG_SECRET_ACCESS_KEY = stack[`COGSECRETACCESSKEY${ABU_STAGE}`];
 configs.COG_OAUTH_CALLBACK = "http://localhost:8060";
 configs.PAGINATION_SECRET = crypto.randomBytes(32).toString("hex");
 configs.DDB_TABLE = "abu-local";
@@ -41,10 +41,10 @@ try {
 }
 
 configs.REACT_APP_AUTH_AWS_REGION = process.env.AWS_REGION;
-configs.REACT_APP_AUTH_POOL_ID = stack[`COGPOOLID${STAGE}`];
-configs.REACT_APP_AUTH_CLIENT_ID = stack[`COGPOOLCLIENTID${STAGE}`];
+configs.REACT_APP_AUTH_POOL_ID = stack[`COGPOOLID${ABU_STAGE}`];
+configs.REACT_APP_AUTH_CLIENT_ID = stack[`COGPOOLCLIENTID${ABU_STAGE}`];
 configs.REACT_APP_AUTH_OAUTH_DOMAIN = `${
-  stack[`COGPOOLCLIENTDOMAIN${STAGE}`]
+  stack[`COGPOOLCLIENTDOMAIN${ABU_STAGE}`]
 }.auth.${process.env.AWS_REGION}.amazoncognito.com`;
 configs.REACT_APP_AUTH_OAUTH_SIGNIN = "http://localhost:8060";
 configs.REACT_APP_AUTH_OAUTH_SIGNOUT = "http://localhost:8060";

diff --git a/scripts/cdk-to-config.js b/scripts/cdk-to-config.js
@@ -5,22 +5,24 @@ const dotenv = require("dotenv");
 const yaml = require("yaml");
 const cdkOutput = require("../infra/.infra-output.json");
 
+const { ABU_STAGE } = process.env;
+
 /**
  * Update config yaml for API
  */
-let fileName = path.join(__dirname, `../config/${process.env.ABU_STAGE}.yml`);
+let fileName = path.join(__dirname, `../config/${ABU_STAGE}.yml`);
 let file = fs.readFileSync(fileName, "utf8");
 let configs = yaml.parse(file);
 
-const stack = cdkOutput[`AbuStack-${process.env.ABU_STAGE}`];
-configs.COG_POOL_ID = stack.COGPOOLID;
-configs.COG_POOL_ARN = stack.COGPOOLARN;
-configs.COG_POOL_CLIENT_ID = stack.COGPOOLCLIENTID;
-configs.COG_POOL_CLIENT_DOMAIN = stack.COGPOOLCLIENTDOMAIN;
-configs.COG_ACCESS_KEY_ID = stack.COGACCESSKEYID;
-configs.COG_SECRET_ACCESS_KEY = stack.COGSECRETACCESSKEY;
-configs.COG_OAUTH_CALLBACK = `https://${stack.CFURL}`;
-configs.CF_ID = stack.CFID;
+const stack = cdkOutput[`AbuStack-${ABU_STAGE}`];
+configs.COG_POOL_ID = stack[`COGPOOLID${ABU_STAGE}`];
+configs.COG_POOL_ARN = stack[`COGPOOLARN${ABU_STAGE}`];
+configs.COG_POOL_CLIENT_ID = stack[`COGPOOLCLIENTID${ABU_STAGE}`];
+configs.COG_POOL_CLIENT_DOMAIN = stack[`COGPOOLCLIENTDOMAIN${ABU_STAGE}`];
+configs.COG_ACCESS_KEY_ID = stack[`COGACCESSKEYID${ABU_STAGE}`];
+configs.COG_SECRET_ACCESS_KEY = stack[`COGSECRETACCESSKEY${ABU_STAGE}`];
+configs.COG_OAUTH_CALLBACK = `https://${stack[`CFURL${ABU_STAGE}`]}`;
+configs.CF_ID = stack[`CFID${ABU_STAGE}`];
 configs.PAGINATION_SECRET = crypto.randomBytes(32).toString("hex");
 configs.DDB_TABLE = process.env.PROJECT;
 
@@ -30,10 +32,7 @@ fs.writeFileSync(fileName, newConfigs, { encoding: "utf8" });
 /**
  * Update env for CMS
  */
-fileName = path.join(
-  __dirname,
-  `../packages/cms/.env.production.${process.env.ABU_STAGE}`
-);
+fileName = path.join(__dirname, `../packages/cms/.env.production.${ABU_STAGE}`);
 try {
   file = fs.readFileSync(fileName, "utf8");
   configs = dotenv.parse(file);
@@ -42,11 +41,13 @@ try {
 }
 
 configs.REACT_APP_AUTH_AWS_REGION = process.env.AWS_REGION;
-configs.REACT_APP_AUTH_POOL_ID = stack.COGPOOLID;
-configs.REACT_APP_AUTH_CLIENT_ID = stack.COGPOOLCLIENTID;
-configs.REACT_APP_AUTH_OAUTH_DOMAIN = `${stack.COGPOOLCLIENTDOMAIN}.auth.${process.env.AWS_REGION}.amazoncognito.com`;
-configs.REACT_APP_AUTH_OAUTH_SIGNIN = `https://${stack.CFURL}`;
-configs.REACT_APP_AUTH_OAUTH_SIGNOUT = `https://${stack.CFURL}`;
+configs.REACT_APP_AUTH_POOL_ID = stack[`COGPOOLID${ABU_STAGE}`];
+configs.REACT_APP_AUTH_CLIENT_ID = stack[`COGPOOLCLIENTID${ABU_STAGE}`];
+configs.REACT_APP_AUTH_OAUTH_DOMAIN = `${
+  stack[`COGPOOLCLIENTDOMAIN${ABU_STAGE}`]
+}.auth.${process.env.AWS_REGION}.amazoncognito.com`;
+configs.REACT_APP_AUTH_OAUTH_SIGNIN = `https://${stack[`CFURL${ABU_STAGE}`]}`;
+configs.REACT_APP_AUTH_OAUTH_SIGNOUT = `https://${stack[`CFURL${ABU_STAGE}`]}`;
 configs.REACT_APP_UPLOAD_ENDPOINT = configs.REACT_APP_UPLOAD_ENDPOINT || "";
 configs.REACT_APP_API_ENDPOINT = configs.REACT_APP_API_ENDPOINT || "";