Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version bump #490

Merged
merged 1 commit into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_bootstrap.md
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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
4 changes: 2 additions & 2 deletions docs/rain_build.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ rain build [<resource type>] or <prompt>
-h, --help help for build
-j, --json Output the template as JSON (default format: YAML)
-l, --list List all CloudFormation resource types with an optional name prefix
--model string The ID of the Bedrock model to use for --prompt. Shorthand: claude2, claude3haiku, claude3sonnet, claude3opus, claude3.5sonnet, (default "claude2")
--model string The ID of the Bedrock model to use for --prompt. Shorthand: claude2, claude3haiku, claude3sonnet, claude3opus, claude3.5sonnet (default "claude2")
--no-cache Do not used cached schema files
--omit-patches Omit patches and use the raw schema
-o, --output string Output to a file
Expand All @@ -41,4 +41,4 @@ rain build [<resource type>] or <prompt>

* [rain](index.md) -

###### Auto generated by spf13/cobra on 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_cat.md
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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_cc.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_cc_deploy.md
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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_cc_drift.md
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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_cc_rm.md
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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_cc_state.md
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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_console.md
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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_deploy.md
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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_diff.md
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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_fmt.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ rain fmt <filename>...

* [rain](index.md) -

###### Auto generated by spf13/cobra on 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_forecast.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ rain forecast --experimental <template> [stackName]

* [rain](index.md) -

###### Auto generated by spf13/cobra on 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_info.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ rain info

* [rain](index.md) -

###### Auto generated by spf13/cobra on 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_logs.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ rain logs <stack> (<resource>)

* [rain](index.md) -

###### Auto generated by spf13/cobra on 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_ls.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ rain ls <stack> [changeset]

* [rain](index.md) -

###### Auto generated by spf13/cobra on 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_merge.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ rain merge <template> <template> ...

* [rain](index.md) -

###### Auto generated by spf13/cobra on 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_module.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_module_bootstrap.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_module_install.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_module_publish.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_pkg.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ rain pkg <template>

* [rain](index.md) -

###### Auto generated by spf13/cobra on 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_rm.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ rain rm <stack> [changeset]

* [rain](index.md) -

###### Auto generated by spf13/cobra on 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_stackset.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_stackset_deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_stackset_ls.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_stackset_rm.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ rain stackset rm <stackset>

* [rain stackset](rain_stackset.md) - This command manipulates stack sets.

###### Auto generated by spf13/cobra on 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_tree.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ rain tree [template]

* [rain](index.md) -

###### Auto generated by spf13/cobra on 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
2 changes: 1 addition & 1 deletion docs/rain_watch.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ rain watch <stack>

* [rain](index.md) -

###### Auto generated by spf13/cobra on 26-Jul-2024
###### Auto generated by spf13/cobra on 7-Aug-2024
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
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.2
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/chzyer/readline v1.5.1
Expand All @@ -23,8 +23,8 @@ require (
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.22.0
golang.org/x/term v0.22.0
golang.org/x/sys v0.23.0
golang.org/x/term v0.23.0
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -34,8 +34,8 @@ require (
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.81.5
github.com/aws/aws-sdk-go-v2/service/sagemaker v1.151.0
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/fatih/color v1.17.0
Expand Down
10 changes: 10 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,20 @@ github.com/aws/aws-sdk-go-v2/service/rds v1.81.4 h1:tBtjOMKyEWLvsO6HaX6A+0A0V1gK
github.com/aws/aws-sdk-go-v2/service/rds v1.81.4/go.mod h1:j27FNXhbbHXC3ExFsJkoxq2Y+4dQypf8KFX1IkgwVvM=
github.com/aws/aws-sdk-go-v2/service/rds v1.81.5 h1:0vEV6OFcCInf/G98MIwwNJM21cd0g+8/jcxXNE40pJA=
github.com/aws/aws-sdk-go-v2/service/rds v1.81.5/go.mod h1:j27FNXhbbHXC3ExFsJkoxq2Y+4dQypf8KFX1IkgwVvM=
github.com/aws/aws-sdk-go-v2/service/rds v1.82.0 h1:+1qRsLNukmvIDNBjz5Osqy4dvIBLwpCeMhmrh9evOUw=
github.com/aws/aws-sdk-go-v2/service/rds v1.82.0/go.mod h1:j27FNXhbbHXC3ExFsJkoxq2Y+4dQypf8KFX1IkgwVvM=
github.com/aws/aws-sdk-go-v2/service/s3 v1.54.4 h1:4p9SCdZBO0PdEXLTF2fcQuxOEkEiqPQpK824cP2VKRo=
github.com/aws/aws-sdk-go-v2/service/s3 v1.54.4/go.mod h1:oSkRFuHVWmUY4Ssk16ErGzBqvYEbvORJFzFXzWhTB2s=
github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1 h1:wsg9Z/vNnCmxWikfGIoOlnExtEU459cR+2d+iDJ8elo=
github.com/aws/aws-sdk-go-v2/service/s3 v1.56.1/go.mod h1:8rDw3mVwmvIWWX/+LWY3PPIMZuwnQdJMCt0iVFVT3qw=
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2 h1:sZXIzO38GZOU+O0C+INqbH7C2yALwfMWpd64tONS/NE=
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2/go.mod h1:Lcxzg5rojyVPU/0eFwLtcyTaek/6Mtic5B1gJo7e/zE=
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 h1:hT8ZAZRIfqBqHbzKTII+CIiY8G2oC9OpLedkZ51DWl8=
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3/go.mod h1:Lcxzg5rojyVPU/0eFwLtcyTaek/6Mtic5B1gJo7e/zE=
github.com/aws/aws-sdk-go-v2/service/sagemaker v1.151.0 h1:zH7b/d8vOrOWdgluKEux2TAECYKhprH2eMztkpak/mI=
github.com/aws/aws-sdk-go-v2/service/sagemaker v1.151.0/go.mod h1:lDmK3DHWV6Y6hpzeUAaXq4w+ks6fFYXdkjavIe8STCE=
github.com/aws/aws-sdk-go-v2/service/sagemaker v1.152.0 h1:y3jRrFbGve0omxt5gDStki51bjYJ6gxhtXr7VFagVv4=
github.com/aws/aws-sdk-go-v2/service/sagemaker v1.152.0/go.mod h1:lDmK3DHWV6Y6hpzeUAaXq4w+ks6fFYXdkjavIe8STCE=
github.com/aws/aws-sdk-go-v2/service/servicequotas v1.21.9 h1:3o5zcwZYvte3CeaYpLaWafwCSkJpclPXI5KSH+lXB90=
github.com/aws/aws-sdk-go-v2/service/servicequotas v1.21.9/go.mod h1:QZpGkzlec0TPr8CA2Td5zRUJBC5+104ib0MusH5UVfI=
github.com/aws/aws-sdk-go-v2/service/servicequotas v1.22.1 h1:QsHvqtdy0mGzpg/A+1lZX1ilf05Vuh2rSBzNJ3f3T1I=
Expand Down Expand Up @@ -270,10 +276,14 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
Expand Down
9 changes: 9 additions & 0 deletions internal/aws/cfn/schemas/aws/acmpca/certificateauthority.json
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,15 @@
},
"CrlDistributionPointExtensionConfiguration": {
"$ref": "#/definitions/CrlDistributionPointExtensionConfiguration"
},
"RetainExpiredCertificates": {
"type": "boolean"
},
"PartitioningEnabled": {
"type": "boolean"
},
"CustomPath": {
"type": "string"
}
},
"required": [
Expand Down
48 changes: 48 additions & 0 deletions internal/aws/cfn/schemas/aws/bedrock/guardrail.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,51 @@
],
"additionalProperties": false
},
"ContextualGroundingFilterConfig": {
"type": "object",
"description": "A config for grounding filter.",
"properties": {
"Type": {
"$ref": "#/definitions/ContextualGroundingFilterType"
},
"Threshold": {
"type": "number",
"minimum": 0,
"description": "The threshold for this filter."
}
},
"required": [
"Threshold",
"Type"
],
"additionalProperties": false
},
"ContextualGroundingFilterType": {
"type": "string",
"description": "Type of contextual grounding filter",
"enum": [
"GROUNDING",
"RELEVANCE"
]
},
"ContextualGroundingPolicyConfig": {
"type": "object",
"description": "Contextual grounding policy config for a guardrail.",
"properties": {
"FiltersConfig": {
"type": "array",
"items": {
"$ref": "#/definitions/ContextualGroundingFilterConfig"
},
"minItems": 1,
"description": "List of contextual grounding filter configs."
}
},
"required": [
"FiltersConfig"
],
"additionalProperties": false
},
"FilterStrength": {
"type": "string",
"description": "Strength for filters",
Expand Down Expand Up @@ -447,6 +492,9 @@
"ContentPolicyConfig": {
"$ref": "#/definitions/ContentPolicyConfig"
},
"ContextualGroundingPolicyConfig": {
"$ref": "#/definitions/ContextualGroundingPolicyConfig"
},
"CreatedAt": {
"type": "string",
"description": "Time Stamp",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,12 @@
"tagOnCreate": true,
"tagUpdatable": true,
"cloudFormationSystemTags": true,
"tagProperty": "/properties/Tags"
"tagProperty": "/properties/Tags",
"permissions": [
"cleanrooms:ListTagsForResource",
"cleanrooms:UntagResource",
"cleanrooms:TagResource"
]
},
"sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cleanrooms",
"handlers": {
Expand Down
Loading
Loading