From 10728dffc6e385604526a0ea96574c9d5ab17beb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 9 Sep 2024 14:01:03 -0400 Subject: [PATCH 1/3] r/aws_quicksight_vpc_connection: Remove 'vpc_connection_id' regex validator. --- .changelog/#####.txt | 3 +++ internal/service/quicksight/vpc_connection.go | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 .changelog/#####.txt diff --git a/.changelog/#####.txt b/.changelog/#####.txt new file mode 100644 index 00000000000..984eb759f9e --- /dev/null +++ b/.changelog/#####.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_quicksight_vpc_connection: Remove `vpc_connection_id` regular expression validator. This fixes a regression introduced in [v5.66.0](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md#5660-september--5-2024) +``` \ No newline at end of file diff --git a/internal/service/quicksight/vpc_connection.go b/internal/service/quicksight/vpc_connection.go index 48ad5dba45f..73509e4d42c 100644 --- a/internal/service/quicksight/vpc_connection.go +++ b/internal/service/quicksight/vpc_connection.go @@ -38,6 +38,7 @@ import ( // @Tags(identifierAttribute="arn") func newVPCConnectionResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &vpcConnectionResource{} + r.SetDefaultCreateTimeout(5 * time.Minute) r.SetDefaultUpdateTimeout(5 * time.Minute) r.SetDefaultDeleteTimeout(5 * time.Minute) @@ -78,10 +79,7 @@ func (r *vpcConnectionResource) Schema(ctx context.Context, req resource.SchemaR stringplanmodifier.RequiresReplace(), }, Validators: []validator.String{ - stringvalidator.All( - stringvalidator.LengthAtMost(1000), - stringvalidator.RegexMatches(regexache.MustCompile(`[\\w\\-]+`), ""), - ), + stringvalidator.LengthAtMost(1000), }, }, names.AttrName: schema.StringAttribute{ From 9c4851f9650addb2aefc4ea587f067705e205199 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 9 Sep 2024 14:03:43 -0400 Subject: [PATCH 2/3] Tweak CHANGELOG entry. --- .changelog/39220.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/39220.txt b/.changelog/39220.txt index c50a50bf71d..57ddd9a5dac 100644 --- a/.changelog/39220.txt +++ b/.changelog/39220.txt @@ -1,3 +1,3 @@ -```release-note:note +```release-note:enhancement resource/aws_quicksight_user: Add `READER_PRO`, `AUTHOR_PRO`, and `ADMIN_PRO` as valid values for the `user_role` argument ``` From 55c19e9945b5b4acfb1d56b7536db530d379a825 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 9 Sep 2024 14:05:59 -0400 Subject: [PATCH 3/3] Correct CHANGELOG entry file name. --- .changelog/{#####.txt => 39231.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changelog/{#####.txt => 39231.txt} (100%) diff --git a/.changelog/#####.txt b/.changelog/39231.txt similarity index 100% rename from .changelog/#####.txt rename to .changelog/39231.txt