Merge pull request #223 from ericzbeard/v1-7

v1.7.0
aws-cloudformation · Dec 11, 2023 · ef91ff3 · ef91ff3
2 parents a65c915 + 1d34cec
commit ef91ff3
Show file tree

Hide file tree

Showing 27 changed files with 1,306 additions and 70 deletions.
diff --git a/README.md b/README.md
@@ -51,6 +51,8 @@ Usage:
 
 Stack commands:
   cat         Get the CloudFormation template from a running stack
+  ccdeploy    Deploy a local template directly using the Cloud Control API (Experimental!)
+  ccrm        Delete a deployment created by ccdeploy (Experimental!)
   deploy      Deploy a CloudFormation stack from a local template
   logs        Show the event log for the named stack
   ls          List running CloudFormation stacks

diff --git a/cft/spec/cfn.go b/cft/spec/cfn.go
diff --git a/docs/bash_completion.sh b/docs/bash_completion.sh
@@ -486,6 +486,133 @@ _rain_cat()
     noun_aliases=()
 }
 
+_rain_ccdeploy()
+{
+    last_command="rain_ccdeploy"
+
+    command_aliases=()
+
+    commands=()
+
+    flags=()
+    two_word_flags=()
+    local_nonpersistent_flags=()
+    flags_with_completion=()
+    flags_completion=()
+
+    flags+=("--config=")
+    two_word_flags+=("--config")
+    two_word_flags+=("-c")
+    local_nonpersistent_flags+=("--config")
+    local_nonpersistent_flags+=("--config=")
+    local_nonpersistent_flags+=("-c")
+    flags+=("--debug")
+    local_nonpersistent_flags+=("--debug")
+    flags+=("--experimental")
+    flags+=("-x")
+    local_nonpersistent_flags+=("--experimental")
+    local_nonpersistent_flags+=("-x")
+    flags+=("--help")
+    flags+=("-h")
+    local_nonpersistent_flags+=("--help")
+    local_nonpersistent_flags+=("-h")
+    flags+=("--params=")
+    two_word_flags+=("--params")
+    local_nonpersistent_flags+=("--params")
+    local_nonpersistent_flags+=("--params=")
+    flags+=("--profile=")
+    two_word_flags+=("--profile")
+    two_word_flags+=("-p")
+    local_nonpersistent_flags+=("--profile")
+    local_nonpersistent_flags+=("--profile=")
+    local_nonpersistent_flags+=("-p")
+    flags+=("--region=")
+    two_word_flags+=("--region")
+    two_word_flags+=("-r")
+    local_nonpersistent_flags+=("--region")
+    local_nonpersistent_flags+=("--region=")
+    local_nonpersistent_flags+=("-r")
+    flags+=("--s3-bucket=")
+    two_word_flags+=("--s3-bucket")
+    local_nonpersistent_flags+=("--s3-bucket")
+    local_nonpersistent_flags+=("--s3-bucket=")
+    flags+=("--s3-prefix=")
+    two_word_flags+=("--s3-prefix")
+    local_nonpersistent_flags+=("--s3-prefix")
+    local_nonpersistent_flags+=("--s3-prefix=")
+    flags+=("--tags=")
+    two_word_flags+=("--tags")
+    local_nonpersistent_flags+=("--tags")
+    local_nonpersistent_flags+=("--tags=")
+    flags+=("--no-colour")
+
+    must_have_one_flag=()
+    must_have_one_noun=()
+    noun_aliases=()
+}
+
+_rain_ccrm()
+{
+    last_command="rain_ccrm"
+
+    command_aliases=()
+
+    commands=()
+
+    flags=()
+    two_word_flags=()
+    local_nonpersistent_flags=()
+    flags_with_completion=()
+    flags_completion=()
+
+    flags+=("--detach")
+    flags+=("-d")
+    local_nonpersistent_flags+=("--detach")
+    local_nonpersistent_flags+=("-d")
+    flags+=("--experimental")
+    flags+=("-x")
+    local_nonpersistent_flags+=("--experimental")
+    local_nonpersistent_flags+=("-x")
+    flags+=("--help")
+    flags+=("-h")
+    local_nonpersistent_flags+=("--help")
+    local_nonpersistent_flags+=("-h")
+    flags+=("--profile=")
+    two_word_flags+=("--profile")
+    two_word_flags+=("-p")
+    local_nonpersistent_flags+=("--profile")
+    local_nonpersistent_flags+=("--profile=")
+    local_nonpersistent_flags+=("-p")
+    flags+=("--region=")
+    two_word_flags+=("--region")
+    two_word_flags+=("-r")
+    local_nonpersistent_flags+=("--region")
+    local_nonpersistent_flags+=("--region=")
+    local_nonpersistent_flags+=("-r")
+    flags+=("--role-arn=")
+    two_word_flags+=("--role-arn")
+    local_nonpersistent_flags+=("--role-arn")
+    local_nonpersistent_flags+=("--role-arn=")
+    flags+=("--s3-bucket=")
+    two_word_flags+=("--s3-bucket")
+    local_nonpersistent_flags+=("--s3-bucket")
+    local_nonpersistent_flags+=("--s3-bucket=")
+    flags+=("--s3-prefix=")
+    two_word_flags+=("--s3-prefix")
+    local_nonpersistent_flags+=("--s3-prefix")
+    local_nonpersistent_flags+=("--s3-prefix=")
+    flags+=("--yes")
+    flags+=("-y")
+    local_nonpersistent_flags+=("--yes")
+    local_nonpersistent_flags+=("-y")
+    flags+=("--debug")
+    flags+=("--no-colour")
+
+    must_have_one_flag=()
+    must_have_one_noun=()
+    noun_aliases=()
+}
+
 _rain_console()
 {
     last_command="rain_console"
@@ -1396,6 +1523,16 @@ _rain_root_command()
     fi
     commands+=("build")
     commands+=("cat")
+    commands+=("ccdeploy")
+    commands+=("ccrm")
+    if [[ -z "${BASH_VERSION:-}" || "${BASH_VERSINFO[0]:-}" -gt 3 ]]; then
+        command_aliases+=("ccdel")
+        aliashash["ccdel"]="ccrm"
+        command_aliases+=("ccdelete")
+        aliashash["ccdelete"]="ccrm"
+        command_aliases+=("ccremove")
+        aliashash["ccremove"]="ccrm"
+    fi
     commands+=("console")
     commands+=("deploy")
     commands+=("diff")

diff --git a/docs/index.md b/docs/index.md
@@ -19,6 +19,8 @@ Rain is a command line tool for working with AWS CloudFormation templates and st
 * [rain bootstrap](rain_bootstrap.md)	 - Creates the artifacts bucket
 * [rain build](rain_build.md)	 - Create CloudFormation templates
 * [rain cat](rain_cat.md)	 - Get the CloudFormation template from a running stack
+* [rain ccdeploy](rain_ccdeploy.md)	 - Deploy a local template directly using the Cloud Control API (Experimental!)
+* [rain ccrm](rain_ccrm.md)	 - Delete a deployment created by ccdeploy (Experimental!)
 * [rain console](rain_console.md)	 - Login to the AWS console
 * [rain deploy](rain_deploy.md)	 - Deploy a CloudFormation stack from a local template
 * [rain diff](rain_diff.md)	 - Compare CloudFormation templates
@@ -34,4 +36,4 @@ Rain is a command line tool for working with AWS CloudFormation templates and st
 * [rain tree](rain_tree.md)	 - Find dependencies of Resources and Outputs in a local template
 * [rain watch](rain_watch.md)	 - Display an updating view of a CloudFormation stack
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_bootstrap.md b/docs/rain_bootstrap.md
@@ -30,4 +30,4 @@ rain bootstrap
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_build.md b/docs/rain_build.md
@@ -30,4 +30,4 @@ rain build [<resource type>...]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_cat.md b/docs/rain_cat.md
@@ -31,4 +31,4 @@ rain cat <stack>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_ccdeploy.md b/docs/rain_ccdeploy.md
@@ -0,0 +1,40 @@
+## rain ccdeploy
+
+Deploy a local template directly using the Cloud Control API (Experimental!)
+
+### Synopsis
+
+Creates or updates resources directly using Cloud Control API from the template file <template>.
+You must pass the --experimental (-x) flag to use this command, to acknowledge that it is experimental and likely to be unstable!
+
+
+```
+rain ccdeploy <template> <name>
+```
+
+### Options
+
+```
+  -c, --config string      YAML or JSON file to set tags and parameters
+      --debug              Output debugging information
+  -x, --experimental       Acknowledge that this is an experimental feature
+  -h, --help               help for ccdeploy
+      --params strings     set parameter values; use the format key1=value1,key2=value2
+  -p, --profile string     AWS profile name; read from the AWS CLI configuration file
+  -r, --region string      AWS region to use
+      --s3-bucket string   Name of the S3 bucket that is used to upload assets
+      --s3-prefix string   Prefix to add to objects uploaded to S3 bucket
+      --tags strings       add tags to the stack; use the format key1=value1,key2=value2
+```
+
+### Options inherited from parent commands
+
+```
+      --no-colour   Disable colour output
+```
+
+### SEE ALSO
+
+* [rain](index.md)	 - 
+
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_ccrm.md b/docs/rain_ccrm.md
@@ -0,0 +1,38 @@
+## rain ccrm
+
+Delete a deployment created by ccdeploy (Experimental!)
+
+### Synopsis
+
+Deletes the resources in the ccdeploy deployment named <name> and waits for all CloudControl API calls to complete. This is an experimental feature that requires the -x flag to run.
+
+```
+rain ccrm <name>
+```
+
+### Options
+
+```
+  -d, --detach             once removal has started, don't wait around for it to finish
+  -x, --experimental       Acknowledge that this is an experimental feature
+  -h, --help               help for ccrm
+  -p, --profile string     AWS profile name; read from the AWS CLI configuration file
+  -r, --region string      AWS region to use
+      --role-arn string    ARN of an IAM role that CloudFormation should assume to remove the stack
+      --s3-bucket string   Name of the S3 bucket that is used to upload assets
+      --s3-prefix string   Prefix to add to objects uploaded to S3 bucket
+  -y, --yes                don't ask questions; just delete
+```
+
+### Options inherited from parent commands
+
+```
+      --debug       Output debugging information
+      --no-colour   Disable colour output
+```
+
+### SEE ALSO
+
+* [rain](index.md)	 - 
+
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_console.md b/docs/rain_console.md
@@ -38,4 +38,4 @@ rain console [stack]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_deploy.md b/docs/rain_deploy.md
@@ -70,4 +70,4 @@ rain deploy <template> [stack]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_diff.md b/docs/rain_diff.md
@@ -28,4 +28,4 @@ rain diff <from> <to>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_fmt.md b/docs/rain_fmt.md
@@ -32,4 +32,4 @@ rain fmt <filename>...
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_forecast.md b/docs/rain_forecast.md
@@ -59,4 +59,4 @@ rain forecast --experimental <template> [stackName]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_info.md b/docs/rain_info.md
@@ -30,4 +30,4 @@ rain info
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_logs.md b/docs/rain_logs.md
@@ -36,4 +36,4 @@ rain logs <stack> (<resource>)
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_ls.md b/docs/rain_ls.md
@@ -30,4 +30,4 @@ rain ls <stack>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_merge.md b/docs/rain_merge.md
@@ -29,4 +29,4 @@ rain merge <template> <template> ...
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_pkg.md b/docs/rain_pkg.md
@@ -66,4 +66,4 @@ rain pkg <template>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_rm.md b/docs/rain_rm.md
@@ -32,4 +32,4 @@ rain rm <stack>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_stackset.md b/docs/rain_stackset.md
@@ -28,4 +28,4 @@ This command manipulates stack sets. It has no action if specific stack set comm
 * [rain stackset ls](rain_stackset_ls.md)	 - List a CloudFormation stack sets in a given region
 * [rain stackset rm](rain_stackset_rm.md)	 - Delete a CloudFormation stack set and/or its instances.
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_stackset_deploy.md b/docs/rain_stackset_deploy.md
@@ -64,4 +64,4 @@ rain stackset deploy <template> [stackset] [flags]
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_stackset_ls.md b/docs/rain_stackset_ls.md
@@ -30,4 +30,4 @@ rain stackset ls <stack set>
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_stackset_rm.md b/docs/rain_stackset_rm.md
@@ -30,4 +30,4 @@ rain stackset rm <stackset>
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_tree.md b/docs/rain_tree.md
@@ -30,4 +30,4 @@ rain tree [template]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/docs/rain_watch.md b/docs/rain_watch.md
@@ -30,4 +30,4 @@ rain watch <stack>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Dec-2023
+###### Auto generated by spf13/cobra on 11-Dec-2023
diff --git a/internal/config/version.go b/internal/config/version.go
@@ -5,5 +5,5 @@ const (
 	NAME = "Rain"
 
 	// VERSION is the application's version string
-	VERSION = "v1.6.0"
+	VERSION = "v1.7.0"
 )