From ad08dbf439cc9d82991775f57f0b233ec927c245 Mon Sep 17 00:00:00 2001 From: Douglas Thomson Date: Mon, 7 Apr 2025 10:53:02 +0100 Subject: [PATCH 1/2] Update name of default branch from master to main in CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ba87ece57..a5a6285b0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ reported the issue. Please try to include as much information as you can. Detail ## Contributing via Pull Requests Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that: -1. You are working against the latest source on the *master* branch. +1. You are working against the latest source on the *main* branch. 2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already. 3. You open an issue to discuss any significant work - we would hate for your time to be wasted. @@ -56,6 +56,6 @@ If you discover a potential security issue in this project we ask that you notif ## Licensing -See the [LICENSE](https://github.com/aws-cloudformation/rain/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution. +See the [LICENSE](https://github.com/aws-cloudformation/rain/blob/main/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution. We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes. From 75790aefc6e82fb061555a32fc7a7cd20ef4b210 Mon Sep 17 00:00:00 2001 From: Douglas Thomson Date: Mon, 7 Apr 2025 10:59:21 +0100 Subject: [PATCH 2/2] Update doe style docs and regenerate docs --- cft/format/transform.go | 2 +- docs/index.md | 2 +- docs/rain_bootstrap.md | 2 +- docs/rain_build.md | 2 +- docs/rain_cat.md | 2 +- docs/rain_cc.md | 2 +- docs/rain_cc_deploy.md | 2 +- docs/rain_cc_drift.md | 2 +- docs/rain_cc_rm.md | 2 +- docs/rain_cc_state.md | 2 +- docs/rain_console.md | 2 +- docs/rain_deploy.md | 4 ++-- docs/rain_diff.md | 2 +- docs/rain_fmt.md | 4 ++-- docs/rain_forecast.md | 2 +- docs/rain_info.md | 2 +- docs/rain_logs.md | 2 +- docs/rain_ls.md | 2 +- docs/rain_merge.md | 4 ++-- docs/rain_module.md | 2 +- docs/rain_module_bootstrap.md | 2 +- docs/rain_module_install.md | 2 +- docs/rain_module_publish.md | 2 +- docs/rain_pkg.md | 4 ++-- docs/rain_rm.md | 2 +- docs/rain_stackset.md | 2 +- docs/rain_stackset_deploy.md | 2 +- docs/rain_stackset_ls.md | 2 +- docs/rain_stackset_rm.md | 2 +- docs/rain_tree.md | 2 +- docs/rain_watch.md | 2 +- 31 files changed, 35 insertions(+), 35 deletions(-) diff --git a/cft/format/transform.go b/cft/format/transform.go index 4907e45f1..667ea69d0 100644 --- a/cft/format/transform.go +++ b/cft/format/transform.go @@ -11,7 +11,7 @@ import ( // Global, set by command arg --node-style var NodeStyle string -var NodeStyleDocs = "Set the node output style to tagged, doublequoted, singlequoted, literal, folded, quotescalars, original, or flow" +var NodeStyleDocs = "Set the node output style to tagged, doublequoted, singlequoted, literal, folded, strict-boolean, quotescalars, original, or flow" func mergeComments(comments []string) string { out := strings.Builder{} diff --git a/docs/index.md b/docs/index.md index 95a11d3a1..d95637255 100644 --- 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 3-Apr-2025 +###### Auto generated by spf13/cobra on 7-Apr-2025 diff --git a/docs/rain_bootstrap.md b/docs/rain_bootstrap.md index 3ae7154a6..c24646b64 100644 --- a/docs/rain_bootstrap.md +++ b/docs/rain_bootstrap.md @@ -33,4 +33,4 @@ rain bootstrap * [rain](index.md) - -###### Auto generated by spf13/cobra on 3-Apr-2025 +###### Auto generated by spf13/cobra on 7-Apr-2025 diff --git a/docs/rain_build.md b/docs/rain_build.md index 4b89b4f1d..42e4d3d38 100644 --- a/docs/rain_build.md +++ b/docs/rain_build.md @@ -42,4 +42,4 @@ rain build [] or * [rain](index.md) - -###### Auto generated by spf13/cobra on 3-Apr-2025 +###### Auto generated by spf13/cobra on 7-Apr-2025 diff --git a/docs/rain_cat.md b/docs/rain_cat.md index f1772e2aa..71601b858 100644 --- a/docs/rain_cat.md +++ b/docs/rain_cat.md @@ -35,4 +35,4 @@ rain cat * [rain](index.md) - -###### Auto generated by spf13/cobra on 3-Apr-2025 +###### Auto generated by spf13/cobra on 7-Apr-2025 diff --git a/docs/rain_cc.md b/docs/rain_cc.md index 1381310f7..8efc1ec34 100644 --- a/docs/rain_cc.md +++ b/docs/rain_cc.md @@ -33,4 +33,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 3-Apr-2025 +###### Auto generated by spf13/cobra on 7-Apr-2025 diff --git a/docs/rain_cc_deploy.md b/docs/rain_cc_deploy.md index 4be76a8a1..21bdaef0c 100644 --- a/docs/rain_cc_deploy.md +++ b/docs/rain_cc_deploy.md @@ -40,4 +40,4 @@ rain cc deploy