Merge pull request #505 from ericzbeard/v-1-15-0

Version bump
aws-cloudformation · Aug 21, 2024 · b5685eb · b5685eb
2 parents e8f03e1 + fc7dc9b
commit b5685eb
Show file tree

Hide file tree

Showing 108 changed files with 3,936 additions and 2,416 deletions.
diff --git a/docs/bash_completion.sh b/docs/bash_completion.sh
@@ -1136,6 +1136,12 @@ _rain_forecast()
     two_word_flags+=("--params")
     local_nonpersistent_flags+=("--params")
     local_nonpersistent_flags+=("--params=")
+    flags+=("--plugin=")
+    two_word_flags+=("--plugin")
+    local_nonpersistent_flags+=("--plugin")
+    local_nonpersistent_flags+=("--plugin=")
+    flags+=("--plugin-only")
+    local_nonpersistent_flags+=("--plugin-only")
     flags+=("--profile=")
     two_word_flags+=("--profile")
     two_word_flags+=("-p")
@@ -1363,6 +1369,10 @@ _rain_merge()
     flags+=("-h")
     local_nonpersistent_flags+=("--help")
     local_nonpersistent_flags+=("-h")
+    flags+=("--node-style=")
+    two_word_flags+=("--node-style")
+    local_nonpersistent_flags+=("--node-style")
+    local_nonpersistent_flags+=("--node-style=")
     flags+=("--output=")
     two_word_flags+=("--output")
     two_word_flags+=("-o")

diff --git a/docs/index.md b/docs/index.md
@@ -36,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-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
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-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_build.md b/docs/rain_build.md
@@ -41,4 +41,4 @@ rain build [<resource type>] or <prompt>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_cat.md b/docs/rain_cat.md
@@ -35,4 +35,4 @@ rain cat <stack>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_cc.md b/docs/rain_cc.md
@@ -32,4 +32,4 @@ You must pass the --experimental (-x) flag to use this command, to acknowledge t
 * [rain cc rm](rain_cc_rm.md)	 - Delete a deployment created by cc deploy (Experimental!)
 * [rain cc state](rain_cc_state.md)	 - Download the state file for a template deployed with cc deploy
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_cc_deploy.md b/docs/rain_cc_deploy.md
@@ -40,4 +40,4 @@ rain cc deploy <template> <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_cc_drift.md b/docs/rain_cc_drift.md
@@ -33,4 +33,4 @@ rain cc drift <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_cc_rm.md b/docs/rain_cc_rm.md
@@ -33,4 +33,4 @@ rain cc rm <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_cc_state.md b/docs/rain_cc_state.md
@@ -33,4 +33,4 @@ rain cc state <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_console.md b/docs/rain_console.md
@@ -39,4 +39,4 @@ rain console [stack]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_deploy.md b/docs/rain_deploy.md
@@ -85,4 +85,4 @@ rain deploy <template> [stack]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
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-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_fmt.md b/docs/rain_fmt.md
@@ -37,4 +37,4 @@ rain fmt <filename>...
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_forecast.md b/docs/rain_forecast.md
@@ -36,6 +36,8 @@ rain forecast --experimental <template> [stackName]
       --ignore strings    Resource types and specific codes to ignore, separated by commas, for example, AWS::S3::Bucket,F0002
       --include-iam       Include permissions checks, which can take a long time
       --params strings    set parameter values; use the format key1=value1,key2=value2
+      --plugin string     Path to a forecast plugin .so
+      --plugin-only       If set, none of the built in prediction functions will be run
   -p, --profile string    AWS profile name; read from the AWS CLI configuration file
   -r, --region string     AWS region to use
       --role-arn string   An optional execution role arn to use for predicting IAM failures
@@ -53,4 +55,4 @@ rain forecast --experimental <template> [stackName]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
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-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_logs.md b/docs/rain_logs.md
@@ -37,4 +37,4 @@ rain logs <stack> (<resource>)
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_ls.md b/docs/rain_ls.md
@@ -31,4 +31,4 @@ rain ls <stack> [changeset]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_merge.md b/docs/rain_merge.md
@@ -13,9 +13,10 @@ rain merge <template> <template> ...
 ### Options
 
 ```
-  -f, --force           Don't warn on clashing attributes; rename them instead. Note: this will not rename Refs, GetAtts, etc.
-  -h, --help            help for merge
-  -o, --output string   Output merged template to a file
+  -f, --force               Don't warn on clashing attributes; rename them instead. Note: this will not rename Refs, GetAtts, etc.
+  -h, --help                help for merge
+      --node-style string   Set the node output style to tagged, doublequoted, singlequoted, literal, folded, quotescalars, original, or flow
+  -o, --output string       Output merged template to a file
 ```
 
 ### Options inherited from parent commands
@@ -29,4 +30,4 @@ rain merge <template> <template> ...
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_module.md b/docs/rain_module.md
@@ -31,4 +31,4 @@ The rain module command can be used to publish modules to CodeArtifact, and to i
 * [rain module install](rain_module_install.md)	 - Install a package of Rain modules from CodeArtifact
 * [rain module publish](rain_module_publish.md)	 - Publish a directory of Rain modules to CodeArtifact
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_module_bootstrap.md b/docs/rain_module_bootstrap.md
@@ -29,4 +29,4 @@ rain module bootstrap [flags]
 
 * [rain module](rain_module.md)	 - Interact with Rain modules in CodeArtifact
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_module_install.md b/docs/rain_module_install.md
@@ -30,4 +30,4 @@ rain module install <name> [flags]
 
 * [rain module](rain_module.md)	 - Interact with Rain modules in CodeArtifact
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_module_publish.md b/docs/rain_module_publish.md
@@ -30,4 +30,4 @@ rain module publish <name> [flags]
 
 * [rain module](rain_module.md)	 - Interact with Rain modules in CodeArtifact
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_pkg.md b/docs/rain_pkg.md
@@ -68,4 +68,4 @@ rain pkg <template>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_rm.md b/docs/rain_rm.md
@@ -33,4 +33,4 @@ rain rm <stack> [changeset]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
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-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_stackset_deploy.md b/docs/rain_stackset_deploy.md
@@ -65,4 +65,4 @@ rain stackset deploy <template> [stackset] [flags]
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_stackset_ls.md b/docs/rain_stackset_ls.md
@@ -31,4 +31,4 @@ rain stackset ls <stack set>
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/docs/rain_stackset_rm.md b/docs/rain_stackset_rm.md
@@ -31,4 +31,4 @@ rain stackset rm <stackset>
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 7-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
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-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
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-Aug-2024
+###### Auto generated by spf13/cobra on 21-Aug-2024
diff --git a/go.mod b/go.mod
@@ -7,46 +7,46 @@ toolchain go1.22.4
 require (
 	//github.com/ake-persson/mapslice-json v0.0.0-20210720081907-22c8edf57807
 	github.com/appscode/jsonpatch v1.0.1
-	github.com/aws/aws-sdk-go-v2 v1.30.3
-	github.com/aws/aws-sdk-go-v2/config v1.27.27
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.27
-	github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.15.0
-	github.com/aws/aws-sdk-go-v2/service/cloudformation v1.53.3
-	github.com/aws/aws-sdk-go-v2/service/ec2 v1.173.0
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3
-	github.com/aws/aws-sdk-go-v2/service/sts v1.30.3
-	github.com/aws/smithy-go v1.20.3
+	github.com/aws/aws-sdk-go-v2 v1.30.4
+	github.com/aws/aws-sdk-go-v2/config v1.27.28
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.28
+	github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.15.1
+	github.com/aws/aws-sdk-go-v2/service/cloudformation v1.53.4
+	github.com/aws/aws-sdk-go-v2/service/ec2 v1.175.1
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.60.0
+	github.com/aws/aws-sdk-go-v2/service/sts v1.30.4
+	github.com/aws/smithy-go v1.20.4
 	github.com/chzyer/readline v1.5.1
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0
 	github.com/gookit/color v1.5.4
 	github.com/nathan-fiscaletti/consolesize-go v0.0.0-20220204101620-317176b6684d
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/sys v0.23.0
+	golang.org/x/sys v0.24.0
 	golang.org/x/term v0.23.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/apple/pkl-go v0.8.0
-	github.com/aws/aws-sdk-go-v2/service/acm v1.28.4
-	github.com/aws/aws-sdk-go-v2/service/codeartifact v1.30.3
-	github.com/aws/aws-sdk-go-v2/service/kms v1.35.3
-	github.com/aws/aws-sdk-go-v2/service/lightsail v1.40.3
-	github.com/aws/aws-sdk-go-v2/service/rds v1.82.0
-	github.com/aws/aws-sdk-go-v2/service/sagemaker v1.152.0
-	github.com/aws/aws-sdk-go-v2/service/servicequotas v1.23.3
-	github.com/aws/aws-sdk-go-v2/service/ssm v1.52.3
+	github.com/aws/aws-sdk-go-v2/service/acm v1.28.5
+	github.com/aws/aws-sdk-go-v2/service/codeartifact v1.30.4
+	github.com/aws/aws-sdk-go-v2/service/kms v1.35.4
+	github.com/aws/aws-sdk-go-v2/service/lightsail v1.40.4
+	github.com/aws/aws-sdk-go-v2/service/rds v1.82.1
+	github.com/aws/aws-sdk-go-v2/service/sagemaker v1.154.0
+	github.com/aws/aws-sdk-go-v2/service/servicequotas v1.23.4
+	github.com/aws/aws-sdk-go-v2/service/ssm v1.52.5
 	github.com/fatih/color v1.17.0
 	github.com/manifoldco/promptui v0.9.0
 	github.com/mattn/go-runewidth v0.0.15
 	github.com/stretchr/testify v1.9.0
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -57,23 +57,23 @@ require (
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.20.3
-	github.com/aws/aws-sdk-go-v2/service/iam v1.34.3
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.20.4
+	github.com/aws/aws-sdk-go-v2/service/iam v1.35.0
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
+	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
 	gopkg.in/yaml.v2 v2.4.0
 )
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,4 +30,4 @@ rain bootstrap

		* [rain](index.md) -

		###### Auto generated by spf13/cobra on 7-Aug-2024
		###### Auto generated by spf13/cobra on 21-Aug-2024
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,4 +41,4 @@ rain build [<resource type>] or <prompt>

		* [rain](index.md) -

		###### Auto generated by spf13/cobra on 7-Aug-2024
		###### Auto generated by spf13/cobra on 21-Aug-2024
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,4 +35,4 @@ rain cat <stack>

		* [rain](index.md) -

		###### Auto generated by spf13/cobra on 7-Aug-2024
		###### Auto generated by spf13/cobra on 21-Aug-2024
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,4 +40,4 @@ rain cc deploy <template> <name>

		* [rain cc](rain_cc.md) - Interact with templates using Cloud Control API instead of CloudFormation

		###### Auto generated by spf13/cobra on 7-Aug-2024
		###### Auto generated by spf13/cobra on 21-Aug-2024
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,4 @@ rain cc drift <name>

		* [rain cc](rain_cc.md) - Interact with templates using Cloud Control API instead of CloudFormation

		###### Auto generated by spf13/cobra on 7-Aug-2024
		###### Auto generated by spf13/cobra on 21-Aug-2024
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,4 @@ rain cc rm <name>

		* [rain cc](rain_cc.md) - Interact with templates using Cloud Control API instead of CloudFormation

		###### Auto generated by spf13/cobra on 7-Aug-2024
		###### Auto generated by spf13/cobra on 21-Aug-2024
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,4 @@ rain cc state <name>

		* [rain cc](rain_cc.md) - Interact with templates using Cloud Control API instead of CloudFormation

		###### Auto generated by spf13/cobra on 7-Aug-2024
		###### Auto generated by spf13/cobra on 21-Aug-2024
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,4 +39,4 @@ rain console [stack]

		* [rain](index.md) -

		###### Auto generated by spf13/cobra on 7-Aug-2024
		###### Auto generated by spf13/cobra on 21-Aug-2024
Original file line number	Diff line number	Diff line change
Expand Up		@@ -85,4 +85,4 @@ rain deploy <template> [stack]

		* [rain](index.md) -

		###### Auto generated by spf13/cobra on 7-Aug-2024
		###### Auto generated by spf13/cobra on 21-Aug-2024
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,4 @@ rain diff <from> <to>

		* [rain](index.md) -

		###### Auto generated by spf13/cobra on 7-Aug-2024
		###### Auto generated by spf13/cobra on 21-Aug-2024