run deconfigure on pre-config; clean up post-configure

Author: Andrews

package.json

@@ -24,7 +24,6 @@
     "package": "aws cloudformation package --template cloudformation/base.yaml --s3-bucket $npm_package_config_artifactsS3Bucket --output-template packaged-sam.yaml --region $npm_package_config_primaryAwsRegion",
     "deploy": "aws cloudformation deploy --template-file packaged-sam.yaml --stack-name $npm_package_config_cloudFormationStackName --capabilities CAPABILITY_IAM CAPABILITY_NAMED_IAM --parameter-overrides ArtifactsS3Bucket=$npm_package_config_artifactsS3Bucket DevPortalSiteS3Bucket=$npm_package_config_siteS3Bucket MarketplaceSubscriptionTopic=$npm_package_config_marketplaceSubscriptionTopic CognitoIdentityPoolName=$npm_package_config_identityPoolName DevPortalCustomersTableName=$npm_package_config_customersTableName --region $npm_package_config_primaryAwsRegion",
     "package-deploy": "npm run package && npm run deploy",
-    "config": "node scripts/configure.js",
     "pre-config": "node scripts/pre-configure.js",
     "post-config": "node scripts/post-configure.js",
     "deconfig": "node -e \"require('./scripts/deconfigure.js')()\"",

scripts/configure.js

@@ -6,41 +6,13 @@ const path = require('path')
 const AWS = require('aws-sdk')
 const rootDir = path.resolve(__dirname, '..')
 const packageJson = require(`${rootDir}/package.json`)
-AWS.config.update({region:'us-east-1'})//packageJson.primaryAwsRegion
-
-const cloudformation = new AWS.CloudFormation();
-// const inquirer = require('inquirer')
 const primaryAwsRegion = packageJson.config.primaryAwsRegion
 
-/*const questions = [{
-    name: 'apiGatewayApiId',
-    message: 'API ID:',
-    type: 'input'
-}/*, {
-    name: 'cognitoRegion',
-    message: 'Cognito region:',
-    type: 'list',
-    choices: ['us-east-1', 'us-west-2'],
-    default: 'us-east-1'
-}* /, {
-    name: 'cognitoUserPoolId',
-    message: 'Cognito User Pool ID:',
-    type: 'input'
-}, {
-    name: 'cognitoUserPoolClientId',
-    message: 'Cognito Client ID:',
-    type: 'input'
-}, {
-    name: 'cognitoIdentityPoolId',
-    message: 'Cognito Identity Pool ID:',
-    type: 'input'
-}]
-
-inquirer.prompt(questions).then(answers => {
-*/
+AWS.config.update({ region:primaryAwsRegion })
+const cloudformation = new AWS.CloudFormation();
 
 cloudformation.describeStacks({
-  StackName: 'DevPortalStack'//packageJson.config.cloudFormationStackName
+  StackName: packageJson.config.cloudFormationStackName
 })
 .promise()
 .then(data => {
@@ -58,6 +30,7 @@ cloudformation.describeStacks({
 function getOutputValue(outputs, key) {
   return outputs.find(o => o.OutputKey === key).OutputValue
 }
+
 function modifyPackageFile(apiGatewayApiId, cognitoRegion, cognitoUserPoolId, cognitoUserPoolClientId, cognitoIdentityPoolId) {
     const packageJsonPath = `${rootDir}/package.json`
     const packageJson = fs.readFileSync(packageJsonPath, 'utf8')

scripts/post-configure.js

@@ -4,6 +4,7 @@
 const fs = require('fs')
 const path = require('path')
 const inquirer = require('inquirer')
+const deconfigure = require('./deconfigure')
 const rootDir = path.resolve(__dirname, '..')
 
 const questions = [{
@@ -46,10 +47,11 @@ const questions = [{
 }*/]
 
 inquirer.prompt(questions).then((answers) => {
-    modifyPackageFile(answers.artifactsS3BucketName, answers.clientS3BucketName, answers.primaryAwsRegion, answers.apiGatewayApiName, answers.cloudFormationStackName/*, answers.expressLambdaFunctionName*/, answers.accountId)
-    modifyUiPackageFile(answers.clientS3BucketName, answers.primaryAwsRegion)
-    modifyExpressServer(answers.clientS3BucketName, answers.primaryAwsRegion)
-    modifySwaggerFile(answers.accountId, answers.primaryAwsRegion, answers.apiGatewayApiName/*, answers.expressLambdaFunctionName*/)
+  deconfigure()
+  modifyPackageFile(answers.artifactsS3BucketName, answers.clientS3BucketName, answers.primaryAwsRegion, answers.apiGatewayApiName, answers.cloudFormationStackName/*, answers.expressLambdaFunctionName*/, answers.accountId)
+  modifyUiPackageFile(answers.clientS3BucketName, answers.primaryAwsRegion)
+  modifyExpressServer(answers.clientS3BucketName, answers.primaryAwsRegion)
+  modifySwaggerFile(answers.accountId, answers.primaryAwsRegion, answers.apiGatewayApiName/*, answers.expressLambdaFunctionName*/)
 }).catch(e => {console.log(e)})
 
 function modifyPackageFile(artifactsS3BucketName, clientS3BucketName, primaryAwsRegion, apiGatewayApiName, cloudFormationStackName/*, expressLambdaFunctionName*/, accountId) {