Upstream v5.68.0

.ci-mgmt.yaml

@@ -113,7 +113,7 @@ extraTests:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: "1.22.x"
+        go-version: "1.23.x"
         cache: false
     - name: Make upstream
       run: make upstream

.github/workflows/run-acceptance-tests.yml

@@ -393,7 +393,7 @@ jobs:
             uses: actions/setup-go@v5
             with:
               cache: false
-              go-version: 1.22.x
+              go-version: 1.23.x
           - name: Make upstream
             run: make upstream
           - name: upstream lint

examples/go.mod

@@ -239,6 +239,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.7.4 // indirect
 	github.com/aws/aws-sdk-go-v2/service/pcs v1.0.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/pinpoint v1.32.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.12.9 // indirect
 	github.com/aws/aws-sdk-go-v2/service/pipes v1.14.4 // indirect
 	github.com/aws/aws-sdk-go-v2/service/polly v1.42.4 // indirect
 	github.com/aws/aws-sdk-go-v2/service/pricing v1.30.4 // indirect
@@ -386,7 +387,7 @@ require (
 	github.com/hashicorp/terraform-exec v0.21.0 // indirect
 	github.com/hashicorp/terraform-json v0.22.1 // indirect
 	github.com/hashicorp/terraform-plugin-framework v1.12.0 // indirect
-	github.com/hashicorp/terraform-plugin-framework-jsontypes v0.1.0 // indirect
+	github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0 // indirect
 	github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1 // indirect
 	github.com/hashicorp/terraform-plugin-framework-timetypes v0.5.0 // indirect
 	github.com/hashicorp/terraform-plugin-framework-validators v0.13.0 // indirect

examples/go.sum

@@ -1603,6 +1603,8 @@ github.com/aws/aws-sdk-go-v2/service/pcs v1.0.2 h1:+PSbd/wTgCueA9agqNNeSmVoOgcgA
 github.com/aws/aws-sdk-go-v2/service/pcs v1.0.2/go.mod h1:acm3akB4exauzjZeKNonTwkxCPIdWT1LWLRM09eZP7c=
 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.32.4 h1:2bJrgP5iz3yVzqVBGSL0UigyyJklo3xkYusu8cfJJOo=
 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.32.4/go.mod h1:Y7+679QPvkNHVJZuVNdoGVUMViwbTsZn7HgOTxcB5lA=
+github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.12.9 h1:mnLwmW4bo8scdYo58rxEmpWfdpd+AKEKh9f+k8lWZxQ=
+github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.12.9/go.mod h1:Ek88Y1SlTvTDgX9L7DWUPfQIYtT++3eqK7cMK0TdW8Q=
 github.com/aws/aws-sdk-go-v2/service/pipes v1.14.4 h1:2fwqaGPD7PKUYKLqeoyEiqYykZE9c/WxuVLUOdPmbEo=
 github.com/aws/aws-sdk-go-v2/service/pipes v1.14.4/go.mod h1:IcjocBWL1l0Z1RiLycZYvSGSSbFiZlOxn/ZWt8Pin9E=
 github.com/aws/aws-sdk-go-v2/service/polly v1.42.4 h1:aFD49SdTdSj5Mqijyw9g3pkX8BlB4uY9PUQutouOZCA=
@@ -2168,8 +2170,8 @@ github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7
 github.com/hashicorp/terraform-json v0.22.1/go.mod h1:JbWSQCLFSXFFhg42T7l9iJwdGXBYV8fmmD6o/ML4p3A=
 github.com/hashicorp/terraform-plugin-framework v1.12.0 h1:7HKaueHPaikX5/7cbC1r9d1m12iYHY+FlNZEGxQ42CQ=
 github.com/hashicorp/terraform-plugin-framework v1.12.0/go.mod h1:N/IOQ2uYjW60Jp39Cp3mw7I/OpC/GfZ0385R0YibmkE=
-github.com/hashicorp/terraform-plugin-framework-jsontypes v0.1.0 h1:b8vZYB/SkXJT4YPbT3trzE6oJ7dPyMy68+9dEDKsJjE=
-github.com/hashicorp/terraform-plugin-framework-jsontypes v0.1.0/go.mod h1:tP9BC3icoXBz72evMS5UTFvi98CiKhPdXF6yLs1wS8A=
+github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0 h1:SJXL5FfJJm17554Kpt9jFXngdM6fXbnUnZ6iT2IeiYA=
+github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0/go.mod h1:p0phD0IYhsu9bR4+6OetVvvH59I6LwjXGnTVEr8ox6E=
 github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1 h1:gm5b1kHgFFhaKFhm4h2TgvMUlNzFAtUqlcOWnWPm+9E=
 github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1/go.mod h1:MsjL1sQ9L7wGwzJ5RjcI6FzEMdyoBnw+XK8ZnOvQOLY=
 github.com/hashicorp/terraform-plugin-framework-timetypes v0.5.0 h1:v3DapR8gsp3EM8fKMh6up9cJUFQ2iRaFsYLP8UJnCco=

patches/0002-Add-S3-legacy-bucket-to-resources.patch

@@ -14,7 +14,7 @@ scheme for registration: see
 https://github.com/hashicorp/terraform-provider-aws/pull/29717.
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index dd2f71e069..9021034f68 100644
+index 3c84cda7e1..abb89bb34d 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -13,6 +13,8 @@ import (

patches/0009-Add-ECR-credentials_data_source.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add ECR credentials_data_source
 
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index 9021034f68..0180f63582 100644
+index abb89bb34d..7e0afbe60d 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -13,6 +13,8 @@ import (

patches/0014-add-matchmaking-configuration-72.patch

@@ -10,7 +10,7 @@ Subject: [PATCH] add matchmaking configuration (#72)
 * add resource docs
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index 0180f63582..c455ac3206 100644
+index 7e0afbe60d..46be10bc97 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -15,6 +15,7 @@ import (

patches/0026-Restore-S3ConnURICleaningDisabled.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Restore S3ConnURICleaningDisabled
 
 
 diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go
-index 4818e47550..665a6004d3 100644
+index 326b051480..c98bc7fc2f 100644
 --- a/internal/conns/awsclient.go
 +++ b/internal/conns/awsclient.go
 @@ -17,6 +17,7 @@ import (

patches/0027-Do-not-compute-tags_all-at-TF-level.patch

@@ -21,7 +21,7 @@ index 6e3610bc82..594f516660 100644
  	if request.Plan.Raw.IsNull() {
  		return
 diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
-index efd99ae8c8..1876032e5c 100644
+index 4a805bf285..3a654af572 100644
 --- a/internal/provider/fwprovider/provider.go
 +++ b/internal/provider/fwprovider/provider.go
 @@ -430,8 +430,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
@@ -36,7 +36,7 @@ index efd99ae8c8..1876032e5c 100644
  					}
  				} else {
 diff --git a/internal/service/appconfig/environment.go b/internal/service/appconfig/environment.go
-index b915d62263..88c9459280 100644
+index cb03ee76b7..81f90a7e70 100644
 --- a/internal/service/appconfig/environment.go
 +++ b/internal/service/appconfig/environment.go
 @@ -104,7 +104,7 @@ func (r *resourceEnvironment) Schema(ctx context.Context, request resource.Schem
@@ -49,7 +49,7 @@ index b915d62263..88c9459280 100644
  		Blocks: map[string]schema.Block{
  			"monitor": schema.SetNestedBlock{
 diff --git a/internal/service/auditmanager/assessment.go b/internal/service/auditmanager/assessment.go
-index f1a73744d4..538a353401 100644
+index 459438b54d..05a49d1f51 100644
 --- a/internal/service/auditmanager/assessment.go
 +++ b/internal/service/auditmanager/assessment.go
 @@ -95,7 +95,7 @@ func (r *resourceAssessment) Schema(ctx context.Context, req resource.SchemaRequ
@@ -62,7 +62,7 @@ index f1a73744d4..538a353401 100644
  		Blocks: map[string]schema.Block{
  			"assessment_reports_destination": schema.ListNestedBlock{
 diff --git a/internal/service/auditmanager/control.go b/internal/service/auditmanager/control.go
-index 2c9e89000a..14855e58b0 100644
+index 2204efea5a..7c4d78f993 100644
 --- a/internal/service/auditmanager/control.go
 +++ b/internal/service/auditmanager/control.go
 @@ -67,7 +67,7 @@ func (r *resourceControl) Schema(ctx context.Context, req resource.SchemaRequest
@@ -75,7 +75,7 @@ index 2c9e89000a..14855e58b0 100644
  				Optional: true,
  			},
 diff --git a/internal/service/auditmanager/framework.go b/internal/service/auditmanager/framework.go
-index 282506089a..3b7a31e7e0 100644
+index bd15eca435..1733d9a441 100644
 --- a/internal/service/auditmanager/framework.go
 +++ b/internal/service/auditmanager/framework.go
 @@ -69,7 +69,7 @@ func (r *resourceFramework) Schema(ctx context.Context, req resource.SchemaReque
@@ -140,7 +140,7 @@ index 1d3452cb18..6e9fbce878 100644
  				Optional: true,
  				Validators: []validator.Int64{
 diff --git a/internal/service/lexv2models/bot.go b/internal/service/lexv2models/bot.go
-index 3931a5ecb6..407c5eae54 100644
+index eb9c6f256f..912546358c 100644
 --- a/internal/service/lexv2models/bot.go
 +++ b/internal/service/lexv2models/bot.go
 @@ -83,7 +83,7 @@ func (r *resourceBot) Schema(ctx context.Context, req resource.SchemaRequest, re
@@ -153,7 +153,7 @@ index 3931a5ecb6..407c5eae54 100644
  				ElementType: types.StringType,
  				Optional:    true,
 diff --git a/internal/service/opensearchserverless/collection.go b/internal/service/opensearchserverless/collection.go
-index 89d6bd4b3c..b2ddf2954f 100644
+index 53e6636756..e9cd945e10 100644
 --- a/internal/service/opensearchserverless/collection.go
 +++ b/internal/service/opensearchserverless/collection.go
 @@ -123,7 +123,7 @@ func (r *resourceCollection) Schema(ctx context.Context, req resource.SchemaRequ
@@ -179,7 +179,7 @@ index a3ad529129..8d2e1d913e 100644
  		Blocks: map[string]schema.Block{
  			names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{
 diff --git a/internal/service/quicksight/vpc_connection.go b/internal/service/quicksight/vpc_connection.go
-index 73509e4d42..0dc1d90384 100644
+index 93acb145ca..31e333e700 100644
 --- a/internal/service/quicksight/vpc_connection.go
 +++ b/internal/service/quicksight/vpc_connection.go
 @@ -139,7 +139,7 @@ func (r *vpcConnectionResource) Schema(ctx context.Context, req resource.SchemaR
@@ -218,10 +218,10 @@ index 793580c0ad..5c173c826c 100644
  		Blocks: map[string]schema.Block{
  			"filters": schema.ListNestedBlock{
 diff --git a/internal/service/workspaces/connection_alias.go b/internal/service/workspaces/connection_alias.go
-index 382a71bdae..3dfe615fd5 100644
+index caff637895..7567a77160 100644
 --- a/internal/service/workspaces/connection_alias.go
 +++ b/internal/service/workspaces/connection_alias.go
-@@ -82,7 +82,7 @@ func (r *resourceConnectionAlias) Schema(ctx context.Context, req resource.Schem
+@@ -81,7 +81,7 @@ func (r *resourceConnectionAlias) Schema(ctx context.Context, req resource.Schem
  				},
  			},
  			names.AttrTags:    tftags.TagsAttribute(),

patches/0030-Optimize-startup-performance.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize startup performance
 
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index c455ac3206..d4a9465a4a 100644
+index 46be10bc97..e49e7ea69d 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -314,7 +314,7 @@ func New(ctx context.Context) (*schema.Provider, error) {

patches/0031-DisableTagSchemaCheck-for-PF-provider.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] DisableTagSchemaCheck for PF provider
 
 
 diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
-index 1876032e5c..b715492b90 100644
+index 3a654af572..5fe2a71b55 100644
 --- a/internal/provider/fwprovider/provider.go
 +++ b/internal/provider/fwprovider/provider.go
 @@ -417,8 +417,7 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {

patches/0032-Run-scripts-patch_computed_only.sh-to-patch-eks-pod_.patch

@@ -32,7 +32,7 @@ index ce583fa5c4..9fdeea49d8 100644
  	}
  }
 diff --git a/internal/service/s3control/access_grant.go b/internal/service/s3control/access_grant.go
-index a6d2a07e8f..7a34c4fede 100644
+index ce4d1a042d..f91e56ba64 100644
 --- a/internal/service/s3control/access_grant.go
 +++ b/internal/service/s3control/access_grant.go
 @@ -103,7 +103,7 @@ func (r *accessGrantResource) Schema(ctx context.Context, request resource.Schem
@@ -58,7 +58,7 @@ index 5f13ed2859..5a0e3e931b 100644
  	}
  }
 diff --git a/internal/service/s3control/access_grants_location.go b/internal/service/s3control/access_grants_location.go
-index 6e9a31f5fe..a47a337aa0 100644
+index ca060273a1..1189fbc20c 100644
 --- a/internal/service/s3control/access_grants_location.go
 +++ b/internal/service/s3control/access_grants_location.go
 @@ -84,7 +84,7 @@ func (r *accessGrantsLocationResource) Schema(ctx context.Context, request resou

patches/0033-Fail-fast-when-PF-resources-are-dropped.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fail fast when PF resources are dropped
 
 
 diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
-index b715492b90..26c1dbadd0 100644
+index 5fe2a71b55..107f224ab0 100644
 --- a/internal/provider/fwprovider/provider.go
 +++ b/internal/provider/fwprovider/provider.go
 @@ -448,9 +448,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {

patches/0034-Fix-tags_all-Computed-for-PF-resources.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix tags_all Computed for PF resources
 
 
 diff --git a/internal/service/amp/scraper.go b/internal/service/amp/scraper.go
-index 33be2171d4..f2f5610ca7 100644
+index b6d8c71ef7..f78c4502b0 100644
 --- a/internal/service/amp/scraper.go
 +++ b/internal/service/amp/scraper.go
 @@ -84,7 +84,7 @@ func (r *scraperResource) Schema(ctx context.Context, req resource.SchemaRequest
@@ -31,7 +31,7 @@ index e0606306fd..61981ae7fb 100644
  				CustomType: fwtypes.NewListNestedObjectTypeOf[customModelTrainingMetricsModel](ctx),
  				Computed:   true,
 diff --git a/internal/service/codeguruprofiler/profiling_group.go b/internal/service/codeguruprofiler/profiling_group.go
-index 8d4b3113e0..ceb385067c 100644
+index 6e8d8de302..af48127242 100644
 --- a/internal/service/codeguruprofiler/profiling_group.go
 +++ b/internal/service/codeguruprofiler/profiling_group.go
 @@ -73,7 +73,7 @@ func (r *resourceProfilingGroup) Schema(ctx context.Context, req resource.Schema
@@ -109,7 +109,7 @@ index 65e308761c..e3660e9b72 100644
  				Required: true,
  			},
 diff --git a/internal/service/ssoadmin/application.go b/internal/service/ssoadmin/application.go
-index a95da86dff..be96fdebb6 100644
+index 63a02f6ed6..ae5c3b3b8a 100644
 --- a/internal/service/ssoadmin/application.go
 +++ b/internal/service/ssoadmin/application.go
 @@ -96,7 +96,7 @@ func (r *resourceApplication) Schema(ctx context.Context, req resource.SchemaReq
@@ -122,7 +122,7 @@ index a95da86dff..be96fdebb6 100644
  		Blocks: map[string]schema.Block{
  			"portal_options": schema.ListNestedBlock{
 diff --git a/internal/service/ssoadmin/trusted_token_issuer.go b/internal/service/ssoadmin/trusted_token_issuer.go
-index 815c50fb5a..bc084e6a9c 100644
+index c54807a8eb..b34e6641c7 100644
 --- a/internal/service/ssoadmin/trusted_token_issuer.go
 +++ b/internal/service/ssoadmin/trusted_token_issuer.go
 @@ -86,7 +86,7 @@ func (r *resourceTrustedTokenIssuer) Schema(ctx context.Context, req resource.Sc