Merge pull request #452 from ericzbeard/fix-448

Add option to name a change set on creation

internal/aws/cfn/cfn.go

@@ -272,7 +272,16 @@ func GetStackEvents(stackName string) ([]types.StackEvent, error) {
 }
 
 // CreateChangeSet creates a changeset
-func CreateChangeSet(template cft.Template, params []types.Parameter, tags map[string]string, stackName string, roleArn string) (string, error) {
+//
+// changeSetName is optional, if "" is passed in, the name will be the stack name plus a timestamp
+func CreateChangeSet(
+	template cft.Template,
+	params []types.Parameter,
+	tags map[string]string,
+	stackName string,
+	changeSetName string,
+	roleArn string) (string, error) {
+
 	templateBody, err := checkTemplate(template)
 	if err != nil {
 		return "", err
@@ -289,7 +298,9 @@ func CreateChangeSet(template cft.Template, params []types.Parameter, tags map[s
 		changeSetType = "UPDATE"
 	}
 
-	changeSetName := stackName + "-" + fmt.Sprint(time.Now().Unix())
+	if changeSetName == "" {
+		changeSetName = stackName + "-" + fmt.Sprint(time.Now().Unix())
+	}
 
 	input := &cloudformation.CreateChangeSetInput{
 		ChangeSetType:       types.ChangeSetType(changeSetType),

internal/cmd/deploy/deploy.go

@@ -67,17 +67,17 @@ YAML:
     TagKey: TagValue
     ...
 
-To create a changeset:
+To create a changeset (with optional stackName and changeSetName):
 
-rain deploy --no-exec <template> [stackName]
+rain deploy --no-exec <template> [stackName] [changeSetName]
 
 To execute a changeset:
 
 rain deploy --changeset <stackName> <changeSetName>
 
 To list and delete changesets, use the ls and rm commands.
 `,
-	Args:                  cobra.RangeArgs(1, 2),
+	Args:                  cobra.RangeArgs(1, 3),
 	DisableFlagsInUseLine: true,
 	Run: func(cmd *cobra.Command, args []string) {
 
@@ -107,6 +107,11 @@ To list and delete changesets, use the ls and rm commands.
 				suppliedStackName = ""
 			}
 
+			// Optionally name the change set
+			if len(args) == 3 {
+				changeSetName = args[2]
+			}
+
 			// Package template
 			if experimental {
 				cftpkg.Experimental = true
@@ -135,7 +140,7 @@ To list and delete changesets, use the ls and rm commands.
 			// Create change set
 			spinner.Push("Creating change set")
 			var createErr error
-			changeSetName, createErr = cfn.CreateChangeSet(template, dc.Params, dc.Tags, stackName, roleArn)
+			changeSetName, createErr = cfn.CreateChangeSet(template, dc.Params, dc.Tags, stackName, changeSetName, roleArn)
 			if createErr != nil {
 				if changeSetHasNoChanges(createErr.Error()) {
 					spinner.Pop()