fix pre-config

Author: Andrews

package.json

@@ -27,14 +27,14 @@
     "pre-config": "node scripts/pre-configure.js",
     "post-config": "node scripts/post-configure.js",
     "deconfig": "node -e \"require('./scripts/deconfigure.js')()\"",
-    "create-artifacts-bucket": "aws s3 mb s3://$npm_package_config_artifactsS3Bucket --region $npm_package_config_primaryAwsRegion",
+    "create-artifacts-bucket": "aws s3api get-bucket-location --bucket $npm_package_config_artifactsS3Bucket --region $npm_package_config_primaryAwsRegion || aws s3 mb s3://$npm_package_config_artifactsS3Bucket --region $npm_package_config_primaryAwsRegion",
     "delete-artifacts-bucket": "aws s3 rm s3://$npm_package_config_artifactsS3Bucket/lambda-function.zip --region $npm_package_config_primaryAwsRegion; aws s3 rm s3://$npm_package_config_artifactsS3Bucket/dev-portal-express-proxy-api.yaml --region $npm_package_config_primaryAwsRegion; aws s3 rb s3://$npm_package_config_artifactsS3Bucket --region $npm_package_config_primaryAwsRegion",
     "upload-site": "cd ./dev-portal && npm run build && aws s3 sync ./build s3://$npm_package_config_siteS3Bucket --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --region $npm_package_config_primaryAwsRegion && cd ..",
     "delete-stack": "aws cloudformation delete-stack --stack-name $npm_package_config_cloudFormationStackName --region $npm_package_config_primaryAwsRegion",
     "lambdas-npm-install": "cd lambdas/backend && npm install && cd meteringservice-preview-sdk-js-06-23-2016 && npm install && cd ../../listener && npm install && cd ../cognito-cloudformation-custom-resource && npm install && cd ../..",
     "subscribe-listener": "aws sns subscribe --topic-arn $npm_package_config_marketplaceSubscriptionTopic --protocol lambda --notification-endpoint arn:aws:lambda:$npm_package_config_primaryAwsRegion:$npm_package_config_accountId:function:$npm_package_config_listenerLambdaFunctionName --region us-east-1",
-    "setup": "aws s3api get-bucket-location --bucket $npm_package_config_artifactsS3Bucket --region $npm_package_config_primaryAwsRegion || npm run create-artifacts-bucket && npm run lambdas-npm-install && npm run package-deploy",
-    "post-setup": "npm run post-config && cd dev-portal && npm install && cd .. && npm run upload-site && cd dev-portal && npm home",
+    "setup": "npm install && npm run pre-config && npm run create-artifacts-bucket && npm run lambdas-npm-install && npm run package-deploy && npm run post-setup",
+    "post-setup": "npm run post-config && cd dev-portal && npm install && npm run upload-site && npm home",
     "clean": "npm run delete-artifacts-bucket && npm run delete-stack"
   },
   "license": "Apache-2.0",

scripts/pre-configure.js

@@ -55,7 +55,7 @@ inquirer.prompt(questions).then((answers) => {
 }).catch(e => {console.log(e)})
 
 function modifyPackageFile(artifactsS3BucketName, clientS3BucketName, primaryAwsRegion, apiGatewayApiName, cloudFormationStackName/*, expressLambdaFunctionName*/, accountId) {
-    const packageJsonPath = `${rootDir}./package.json`
+    const packageJsonPath = `${rootDir}/package.json`
     const packageJson = fs.readFileSync(packageJsonPath, 'utf8')
     const packageJsonModified = packageJson
         .replace(/YOUR_ARTIFACTS_BUCKET_NAME/g, artifactsS3BucketName)
@@ -70,7 +70,7 @@ function modifyPackageFile(artifactsS3BucketName, clientS3BucketName, primaryAws
 }
 
 function modifyUiPackageFile(clientS3BucketName, primaryAwsRegion) {
-    const packageJsonPath = `${rootDir}./dev-portal/package.json`
+    const packageJsonPath = `${rootDir}/dev-portal/package.json`
     const packageJson = fs.readFileSync(packageJsonPath, 'utf8')
     const packageJsonModified = packageJson
         .replace(/YOUR_CLIENT_BUCKET_NAME/g, clientS3BucketName)
@@ -80,7 +80,7 @@ function modifyUiPackageFile(clientS3BucketName, primaryAwsRegion) {
 }
 
 function modifyExpressServer(clientS3BucketName, primaryAwsRegion) {
-    const expressServerPath = `${rootDir}./lambdas/backend/express-server.js`
+    const expressServerPath = `${rootDir}/lambdas/backend/express-server.js`
     const expressServer = fs.readFileSync(expressServerPath, 'utf8')
     const expressServerModified = expressServer
         .replace(/YOUR_CLIENT_BUCKET_NAME/g, clientS3BucketName)
@@ -90,7 +90,7 @@ function modifyExpressServer(clientS3BucketName, primaryAwsRegion) {
 }
 
 function modifySwaggerFile(accountId, primaryAwsRegion, apiGatewayApiName/*, expressLambdaFunctionName*/) {
-    const swaggerDefinitionPath = `${rootDir}./lambdas/backend/dev-portal-express-proxy-api.yaml`
+    const swaggerDefinitionPath = `${rootDir}/lambdas/backend/dev-portal-express-proxy-api.yaml`
     const swaggerDefinition = fs.readFileSync(swaggerDefinitionPath, 'utf8')
     const simpleProxyApiModified = swaggerDefinition
         .replace(/YOUR_ACCOUNT_ID/g, accountId)