Use the merged template instead of the base one for parameters (#23)

* use the merged template instead of the base one for parameters

* return json instead of re-reading from file

* removing trying to read env from template params

* always return something from template merging

Co-authored-by: Dave Steinberg <dave@steinbergcomputing.com>
Co-authored-by: gpoitch <garth22@gmail.com>

Author: 3 people

src/commands/package.js

@@ -40,35 +40,35 @@ async function mergeEnvTemplate(baseTemplatePath, baseTemplateJson, environment)
   try {
     enviromentTemplateString = await readFileAsync(environmentTemplatePath, 'utf8')
   } catch (e) {
-    return
+    return [baseTemplatePath, baseTemplateJson]
   }
   log.info(`Merging ${environment} template (${environmentTemplatePath}) with base template (${baseTemplatePath})`)
   const enviromentTemplateJson = parseTemplate(enviromentTemplateString, templateExt)
   const mergedTemplateJson = deepmerge(baseTemplateJson, enviromentTemplateJson)
   const mergedTemplateString = serializeTemplate(mergedTemplateJson, templateExt)
   const mergedTemplatePath = filePathWithSuffix(baseTemplatePath, `-${environment}-merged`)
   await writeFileAsync(mergedTemplatePath, mergedTemplateString)
-  return mergedTemplatePath
+  return [mergedTemplatePath, mergedTemplateJson]
 }
 
 module.exports = async function packageProject(input) {
   const templatePath = findTemplatePath(input)
   const templateString = await readFileAsync(templatePath, 'utf8')
   const templateExt = extname(templatePath)
   const templateJson = parseTemplate(templateString, templateExt)
-  const parameters = templateJson.Parameters
-  const environment = input.environment || (parameters.environment && parameters.environment.Default) || 'development'
+  const environment = input.environment || 'development'
+  const [templatePathEnvMerged, mergedTemplateJson] = await mergeEnvTemplate(templatePath, templateJson, environment)
+  const templatePathPackaged = filePathWithSuffix(templatePath, '-packaged')
+  const parameters = mergedTemplateJson.Parameters
   const stackName = input['stack-name'] || `${parameters.stackName && parameters.stackName.Default}-${environment}`
   const bucketName = input['s3-bucket'] || (parameters.bucketName && parameters.bucketName.Default)
   const s3Prefix =
     input['s3-prefix'] ||
     (parameters.s3Prefix && parameters.s3Prefix.Default) ||
     `${stackName}/${new Date().getFullYear()}`
-  const templatePathEnvMerged = await mergeEnvTemplate(templatePath, templateJson, environment)
-  const templatePathPackaged = filePathWithSuffix(templatePath, '-packaged')
   const command =
     `aws cloudformation package ` +
-    `--template-file ${templatePathEnvMerged || templatePath} ` +
+    `--template-file ${templatePathEnvMerged} ` +
     `--output-template-file ${templatePathPackaged} ` +
     `--s3-bucket ${bucketName}` +
     `${s3Prefix ? ' --s3-prefix ' + s3Prefix : ''}` +