Skip to content

Commit

Permalink
Upstream v5.63.0 (#4378)
Browse files Browse the repository at this point in the history 
Upgrade upstream to
[5.63.0](https://github.com/hashicorp/terraform-provider-aws/releases/tag/v5.63.0)

Fixes #4373
Fixes #4372
Fixes #3713
Fixes #4369

There are some changes to patches:

- #4369 is removed as it is
part of upstream now

- #3713 is removed as there
was no clean conflict resolution; this patch is under test so if test
suite passes the removal is safe

- #2746 patch is edited to
remove rds/security_group resource code that got removed upstream but
was preserved in patches. This code appears to be dead / unused code but
continues to generate conflicts

- added a patch for gamelift.Matchmaking* resources; these are
[deprecated](#4375) but
remain supported until the next major release. Upstream moved gamelift
to Go SDK v2 so the patch is needed to preserve the Go SDK v1 code for
these resources without re-coding them.

- added a patch to fix tags for new PF-based resources; this can go away
once we land #4151

---------

Co-authored-by: Florian Stadler <[email protected]>
  • Loading branch information
@t0yv0 @flostadler
t0yv0 and flostadler authored Aug 21, 2024
1 parent db316a3 commit 198219a
Show file tree
Hide file tree
Showing 348 changed files with 35,151 additions and 1,260 deletions.
45 changes: 27 additions & 18 deletions examples/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/acm v1.28.4 // indirect
github.com/aws/aws-sdk-go-v2/service/acmpca v1.35.0 // indirect
github.com/aws/aws-sdk-go-v2/service/amp v1.27.3 // indirect
github.com/aws/aws-sdk-go-v2/service/amplify v1.23.3 // indirect
github.com/aws/aws-sdk-go-v2/service/amplify v1.24.0 // indirect
github.com/aws/aws-sdk-go-v2/service/apigateway v1.25.4 // indirect
github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.22.4 // indirect
github.com/aws/aws-sdk-go-v2/service/appconfig v1.31.3 // indirect
Expand All @@ -79,9 +79,9 @@ require (
github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.3.0 // indirect
github.com/aws/aws-sdk-go-v2/service/appmesh v1.27.3 // indirect
github.com/aws/aws-sdk-go-v2/service/apprunner v1.30.3 // indirect
github.com/aws/aws-sdk-go-v2/service/appstream v1.37.0 // indirect
github.com/aws/aws-sdk-go-v2/service/appstream v1.38.0 // indirect
github.com/aws/aws-sdk-go-v2/service/appsync v1.35.0 // indirect
github.com/aws/aws-sdk-go-v2/service/athena v1.44.3 // indirect
github.com/aws/aws-sdk-go-v2/service/athena v1.44.4 // indirect
github.com/aws/aws-sdk-go-v2/service/auditmanager v1.35.3 // indirect
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.43.3 // indirect
github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.22.4 // indirect
Expand All @@ -107,7 +107,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.40.3 // indirect
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.37.3 // indirect
github.com/aws/aws-sdk-go-v2/service/codeartifact v1.30.3 // indirect
github.com/aws/aws-sdk-go-v2/service/codebuild v1.40.3 // indirect
github.com/aws/aws-sdk-go-v2/service/codebuild v1.41.0 // indirect
github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.15.3 // indirect
github.com/aws/aws-sdk-go-v2/service/codecommit v1.25.0 // indirect
github.com/aws/aws-sdk-go-v2/service/codedeploy v1.27.3 // indirect
Expand All @@ -117,9 +117,9 @@ require (
github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.27.3 // indirect
github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.24.3 // indirect
github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.25.5 // indirect
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.42.0 // indirect
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.43.1 // indirect
github.com/aws/aws-sdk-go-v2/service/comprehend v1.33.3 // indirect
github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.37.3 // indirect
github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.37.4 // indirect
github.com/aws/aws-sdk-go-v2/service/configservice v1.48.3 // indirect
github.com/aws/aws-sdk-go-v2/service/connectcases v1.19.3 // indirect
github.com/aws/aws-sdk-go-v2/service/controltower v1.16.4 // indirect
Expand All @@ -144,12 +144,12 @@ require (
github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.11.3 // indirect
github.com/aws/aws-sdk-go-v2/service/drs v1.28.3 // indirect
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.4 // indirect
github.com/aws/aws-sdk-go-v2/service/ec2 v1.173.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ec2 v1.175.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.32.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.25.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ecs v1.44.3 // indirect
github.com/aws/aws-sdk-go-v2/service/efs v1.31.3 // indirect
github.com/aws/aws-sdk-go-v2/service/eks v1.47.0 // indirect
github.com/aws/aws-sdk-go-v2/service/eks v1.48.0 // indirect
github.com/aws/aws-sdk-go-v2/service/elasticache v1.40.5 // indirect
github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.26.2 // indirect
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.26.3 // indirect
Expand All @@ -162,15 +162,16 @@ require (
github.com/aws/aws-sdk-go-v2/service/evidently v1.21.3 // indirect
github.com/aws/aws-sdk-go-v2/service/finspace v1.26.3 // indirect
github.com/aws/aws-sdk-go-v2/service/firehose v1.32.0 // indirect
github.com/aws/aws-sdk-go-v2/service/fis v1.26.3 // indirect
github.com/aws/aws-sdk-go-v2/service/fis v1.27.0 // indirect
github.com/aws/aws-sdk-go-v2/service/fms v1.35.3 // indirect
github.com/aws/aws-sdk-go-v2/service/fsx v1.47.2 // indirect
github.com/aws/aws-sdk-go-v2/service/gamelift v1.33.3 // indirect
github.com/aws/aws-sdk-go-v2/service/glacier v1.24.3 // indirect
github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.27.0 // indirect
github.com/aws/aws-sdk-go-v2/service/glue v1.92.0 // indirect
github.com/aws/aws-sdk-go-v2/service/glue v1.94.0 // indirect
github.com/aws/aws-sdk-go-v2/service/grafana v1.24.3 // indirect
github.com/aws/aws-sdk-go-v2/service/greengrass v1.25.3 // indirect
github.com/aws/aws-sdk-go-v2/service/groundstation v1.29.3 // indirect
github.com/aws/aws-sdk-go-v2/service/groundstation v1.29.4 // indirect
github.com/aws/aws-sdk-go-v2/service/guardduty v1.45.3 // indirect
github.com/aws/aws-sdk-go-v2/service/healthlake v1.26.3 // indirect
github.com/aws/aws-sdk-go-v2/service/identitystore v1.25.3 // indirect
Expand All @@ -194,25 +195,27 @@ require (
github.com/aws/aws-sdk-go-v2/service/kinesis v1.29.3 // indirect
github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.23.3 // indirect
github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.28.2 // indirect
github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.25.3 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.35.3 // indirect
github.com/aws/aws-sdk-go-v2/service/lakeformation v1.35.3 // indirect
github.com/aws/aws-sdk-go-v2/service/lambda v1.56.3 // indirect
github.com/aws/aws-sdk-go-v2/service/launchwizard v1.6.3 // indirect
github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.46.0 // indirect
github.com/aws/aws-sdk-go-v2/service/licensemanager v1.27.3 // indirect
github.com/aws/aws-sdk-go-v2/service/lightsail v1.40.3 // indirect
github.com/aws/aws-sdk-go-v2/service/location v1.40.3 // indirect
github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.29.3 // indirect
github.com/aws/aws-sdk-go-v2/service/m2 v1.15.3 // indirect
github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.32.0 // indirect
github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.57.3 // indirect
github.com/aws/aws-sdk-go-v2/service/medialive v1.55.0 // indirect
github.com/aws/aws-sdk-go-v2/service/medialive v1.56.0 // indirect
github.com/aws/aws-sdk-go-v2/service/mediapackage v1.32.3 // indirect
github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.15.0 // indirect
github.com/aws/aws-sdk-go-v2/service/mediastore v1.22.3 // indirect
github.com/aws/aws-sdk-go-v2/service/memorydb v1.21.5 // indirect
github.com/aws/aws-sdk-go-v2/service/mq v1.25.3 // indirect
github.com/aws/aws-sdk-go-v2/service/mwaa v1.29.4 // indirect
github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.10.3 // indirect
github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.11.0 // indirect
github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.41.0 // indirect
github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.5.3 // indirect
github.com/aws/aws-sdk-go-v2/service/oam v1.13.4 // indirect
Expand All @@ -221,6 +224,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/osis v1.12.3 // indirect
github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.12.3 // indirect
github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.7.3 // indirect
github.com/aws/aws-sdk-go-v2/service/pinpoint v1.32.3 // indirect
github.com/aws/aws-sdk-go-v2/service/pipes v1.14.3 // indirect
github.com/aws/aws-sdk-go-v2/service/polly v1.42.3 // indirect
github.com/aws/aws-sdk-go-v2/service/pricing v1.30.3 // indirect
Expand All @@ -241,9 +245,14 @@ require (
github.com/aws/aws-sdk-go-v2/service/route53 v1.42.3 // indirect
github.com/aws/aws-sdk-go-v2/service/route53domains v1.25.3 // indirect
github.com/aws/aws-sdk-go-v2/service/route53profiles v1.2.3 // indirect
github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.23.3 // indirect
github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.19.3 // indirect
github.com/aws/aws-sdk-go-v2/service/route53resolver v1.30.3 // indirect
github.com/aws/aws-sdk-go-v2/service/rum v1.19.3 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 // indirect
github.com/aws/aws-sdk-go-v2/service/s3control v1.46.3 // indirect
github.com/aws/aws-sdk-go-v2/service/s3outposts v1.26.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sagemaker v1.153.0 // indirect
github.com/aws/aws-sdk-go-v2/service/scheduler v1.10.3 // indirect
github.com/aws/aws-sdk-go-v2/service/schemas v1.26.3 // indirect
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.4 // indirect
Expand All @@ -261,7 +270,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/signer v1.24.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sns v1.31.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sqs v1.34.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssm v1.52.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssm v1.52.4 // indirect
github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.24.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.32.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssmsap v1.15.3 // indirect
Expand All @@ -285,7 +294,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/workspaces v1.45.0 // indirect
github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.21.3 // indirect
github.com/aws/aws-sdk-go-v2/service/xray v1.27.3 // indirect
github.com/aws/smithy-go v1.20.3 // indirect
github.com/aws/smithy-go v1.20.4 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/beevik/etree v1.4.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
Expand Down Expand Up @@ -347,7 +356,7 @@ require (
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/hashicorp/hc-install v0.7.0 // indirect
github.com/hashicorp/hc-install v0.8.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/hcl/v2 v2.21.0 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
Expand All @@ -362,7 +371,7 @@ require (
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
github.com/hashicorp/terraform-plugin-mux v0.16.0 // indirect
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0 // indirect
github.com/hashicorp/terraform-plugin-testing v1.9.0 // indirect
github.com/hashicorp/terraform-plugin-testing v1.10.0 // indirect
github.com/hashicorp/terraform-provider-aws v1.60.1-0.20220923175450-ca71523cdc36 // indirect
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
Expand Down Expand Up @@ -435,7 +444,7 @@ require (
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/zclconf/go-cty v1.14.4 // indirect
github.com/zclconf/go-cty v1.15.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.52.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
Expand Down
Loading

0 comments on commit 198219a

Please sign in to comment.