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.

Sign up for GitHub

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

Add validation for aws_s3_bucket_metric.name #25260

Merged
merged 4 commits into from
Jun 21, 2022
Merged

Add validation for aws_s3_bucket_metric.name #25260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
819549f
Add validation for aws_s3_bucket_metric.name
justinretzolk Jun 9, 2022
ed031dd
Add changelog entry
justinretzolk Jun 9, 2022
ebcb971
Initial Commit - fo aws-internal-review
Jun 12, 2022
2b1449f
r/s3_bucket_metric: remove validation from bucket; update name valida…
anGie44 Jun 21, 2022
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
3 changes: 3 additions & 0 deletions .changelog/25260.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3_bucket_metric: Add validation to ensure name is <= 64 characters.
```
8 changes: 5 additions & 3 deletions internal/service/s3/bucket_metric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/hashicorp/terraform-provider-aws/internal/conns"
tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
Expand Down Expand Up @@ -52,9 +53,10 @@ func ResourceBucketMetric() *schema.Resource {
},
},
"name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringLenBetween(1, 64),
},
},
}
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/s3_bucket_metric.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ resource "aws_s3_bucket_metric" "example-filtered" {
The following arguments are supported:

* `bucket` - (Required) The name of the bucket to put metric configuration.
* `name` - (Required) Unique identifier of the metrics configuration for the bucket.
* `name` - (Required) Unique identifier of the metrics configuration for the bucket. Must be less than or equal to 64 characters in length.
* `filter` - (Optional) [Object filtering](http://docs.aws.amazon.com/AmazonS3/latest/dev/metrics-configurations.html#metrics-configurations-filter) that accepts a prefix, tags, or a logical AND of prefix and tags (documented below).

The `filter` metric configuration supports the following:
Expand Down