Add s3 bucket/prefix flags (#20)

* Add s3 bucket/prefix flags

* add template support too

* tweak docs

Author: gpoitch

README.md

@@ -43,9 +43,9 @@ _Options:_
 `-t, --template`: Path to a SAM template. Defaults to `sam.(json|yaml)` in the current directory.  
 `-e, --environment`: An environment name to deploy. Defaults to "development".  
 `-p, --parameters`: A list of parameters to override in your template.  
-`-s, --stack-name`: Option to override the auto-generated environment stack name.
-
-sammie will automatically create an s3 bucket to upload your code. To change this to a different bucket, change `bucketName` in your `sam.json` template.
+`-s, --stack-name`: Option to override the auto-generated environment stack name.  
+`--s3-bucket`: S3 bucket where code is uploaded. Defaults to Parameters.bucketName in template.  
+`--s3-prefix`: S3 path prefix added to the packaged code file.
 
 ---
 

src/commands/package.js

@@ -60,13 +60,15 @@ module.exports = async function packageProject(input) {
   const environment = input.environment || (parameters.environment && parameters.environment.Default) || 'development'
   const templatePathEnvMerged = await mergeEnvTemplate(templatePath, templateJson, environment)
   const templatePathPackaged = filePathWithSuffix(templatePath, '-packaged')
-  const bucketName = parameters.bucketName.Default
+  const bucketName = input['s3-bucket'] || (parameters.bucketName && parameters.bucketName.Default)
+  const bucketPrefix = input['s3-prefix'] || (parameters.s3Prefix && parameters.s3Prefix.Default)
   const command =
     `aws cloudformation package ` +
     `--template-file ${templatePathEnvMerged || templatePath} ` +
     `--output-template-file ${templatePathPackaged} ` +
-    `--s3-bucket ${bucketName} ` +
-    `${templateExt === '.json' ? '--use-json' : ''}`
+    `--s3-bucket ${bucketName}` +
+    `${bucketPrefix ? ' --s3-prefix ' + bucketPrefix : ''}` +
+    `${templateExt === '.json' ? ' --use-json' : ''}`
 
   checkCliVersion()
   await createS3Bucket(bucketName)

src/index.js

@@ -18,34 +18,44 @@ cli.version(packageJson.version)
 cli
   .command('init <name>')
   .describe('Initialize a project with a <name>')
-  .option('-y, --yaml', 'Generate yaml for SAM template. Defaults to json, because javascript.')
+  .option('-y, --yaml', 'Generate yaml for SAM template. Defaults to json, because javascript')
   .example('init my-app')
   .action(init)
 
 cli
   .command('deploy')
   .describe('Deploy a SAM project')
-  .option('-t, --template', 'Path to a SAM template. Defaults to `sam.(json|yaml)` in the current directory.')
-  .option('-e, --environment', 'An environment name to deploy. Defaults to "development".')
+  .option('-t, --template', 'Path to a SAM template. Defaults to `sam.(json|yaml)` in the current directory')
+  .option('-e, --environment', 'An environment name to deploy. Defaults to "development"')
   .option('-p, --parameters', 'A list of parameters to override in your template.')
-  .option('-s, --stack-name', 'Option to override the auto-generated environment stack name.')
+  .option('-s, --stack-name', 'Option to override the auto-generated environment stack name')
+  .option('--s3-bucket', 'S3 bucket where code is uploaded. Defaults to Parameters.bucketName in template')
+  .option('--s3-prefix', 'S3 path prefix added to the packaged code file')
+  .option('--capabilities', 'See `aws cloudformation deploy`. Defaults to CAPABILITY_IAM')
   .example('deploy')
   .example('deploy --template ./configs/sam.json --environment production --parameters key1=val1 key2=val2')
   .action(deploy)
 
+// ---------------------------------------------------------------------
+// "Private" i.e. not promoting in README to keep the project focused.
+//  Still discoverable via --help
+// ---------------------------------------------------------------------
+
 cli
   .command('validate')
-  .describe('Validate a SAM template [private - runs on `deploy`]')
+  .describe('[private] Validate a SAM template')
   .option('-t, --template', 'Path to a SAM template. Defaults to `sam.(json|yaml)` in the current directory')
   .example('validate')
   .example('validate --template ./config/sam.json')
   .action(validate)
 
 cli
   .command('package')
-  .describe('Package & upload code [private - runs on `deploy`]')
+  .describe('[private] Package & upload code')
   .option('-t, --template', 'Path to a SAM template. Defaults to `sam.(json|yaml)` in the current directory')
-  .option('-e, --environment', 'An environment name to package. Defaults to "development".')
+  .option('-e, --environment', 'An environment name to package. Defaults to "development"')
+  .option('--s3-bucket', 'S3 bucket where code is uploaded. Defaults to Parameters.bucketName in template')
+  .option('--s3-prefix', 'S3 path prefix added to the packaged code file')
   .example('package')
   .example('package --template ./config/sam.json --environment production')
   .action(packageProject)