Skip to content

Commit

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

## Patches

- [0085-Remove-ephemeral-resources.patch]: Fixes an issue where code was
accidentally removed that sets the `master_password` (re #5288) (affects
both `docdb.Cluster` & `redshiftserverless.Namespace`)
- [0089-disable-plan-modifications-for-tags-in-PF-resources.patch]:
Upstream code was refactored to to run the `setTagsAll` func through a
new `mondifyPlanFuncs`
- [0090-restore-conns-to-awsclient.patch]: Upstream removed this code
because the aws-sdk-go-v1 code has been removed, but we still need it


## Upstream Tests

I've updated the upstream tests workflow to run tests for `docdb` and
`redshiftserverless` based on the patch fixes. I've also enhanced it to
allow for specifying specific test filters.


fixes #5285, fixes #5276, fixes #5288
  • Loading branch information
@corymhall
corymhall authored Mar 11, 2025
1 parent 8da86ae commit 1d8553e
Show file tree
Hide file tree
Showing 1,924 changed files with 69,512 additions and 11,853 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/aws-upstream-tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@ jobs:
matrix:
service:
- sqs
- docdb
- redshiftserverless
include:
- service: sqs
tests: TestAccSQSQueue
- service: docdb
tests: TestAccDocDBCluster_basic
- service: redshiftserverless
tests: TestAccRedshiftServerlessNamespace_basic
steps:
- name: Checkout Repo
uses: actions/checkout@v4
Expand All @@ -68,7 +77,8 @@ jobs:
role-duration-seconds: 7200
role-session-name: aws@githubActions
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
- name: Test ${{ matrix.service }}
- if: ${{ matrix.tests }}
name: Test ${{ matrix.service }}
run: |
cd upstream
TF_ACC=1 make testacc GO_VER=go PKG=${{ matrix.service }} ACCTEST_PARALLELISM=6 TESTARGS="-skip 'tags|.*/.*/Tags'"
TF_ACC=1 make testacc GO_VER=go PKG=${{ matrix.service }} ACCTEST_PARALLELISM=6 TESTS="${{ matrix.tests }}" TESTARGS="-skip 'tags|.*/.*/Tags'"
566 changes: 283 additions & 283 deletions examples/go.mod
View file

Large diffs are not rendered by default.

1,136 changes: 568 additions & 568 deletions examples/go.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion patches/0002-Add-S3-legacy-bucket-to-resources.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 19c9cd7190..3ad50b93e8 100644
index 061b275d56..a4e6635364 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -14,6 +14,8 @@ import (
Expand Down
6 changes: 3 additions & 3 deletions patches/0004-De-deprecate-bucket_object.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ Subject: [PATCH] De-deprecate bucket_object


diff --git a/internal/service/s3/bucket_object.go b/internal/service/s3/bucket_object.go
index 6ebd16412c..53794a2d43 100644
index 85729aea89..53794a2d43 100644
--- a/internal/service/s3/bucket_object.go
+++ b/internal/service/s3/bucket_object.go
@@ -66,7 +66,7 @@ func resourceBucketObject() *schema.Resource {
Computed: true,
},
names.AttrBucket: {
- Deprecated: "Use the aws_s3_object resource instead",
- Deprecated: "bucket is deprecated. Use the aws_s3_object resource instead.",
+ // FORK: Stack72 removed the deprecation warning as it was misleading for Pulumi users
Type: schema.TypeString,
Required: true,
Expand All @@ -21,7 +21,7 @@ index 6ebd16412c..53794a2d43 100644
Default: false,
},
names.AttrKey: {
- Deprecated: "Use the aws_s3_object resource instead",
- Deprecated: "key is deprecated. Use the aws_s3_object resource instead.",
+ // FORK: Stack72 removed the deprecation warning as it was misleading for Pulumi users
Type: schema.TypeString,
Required: true,
Expand Down
2 changes: 1 addition & 1 deletion patches/0006-Workaround-SSM-Parameter-tier-bug.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Subject: [PATCH] Workaround SSM Parameter tier bug
- Disable diff suppression & counteractions

diff --git a/internal/service/ssm/parameter.go b/internal/service/ssm/parameter.go
index e605c7ea1e..b5fccc0112 100644
index 17253be86c..9c4666ea58 100644
--- a/internal/service/ssm/parameter.go
+++ b/internal/service/ssm/parameter.go
@@ -102,15 +102,17 @@ func resourceParameter() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion patches/0009-Add-ECR-credentials_data_source.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Add ECR credentials_data_source


diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index 3ad50b93e8..af639c4dbf 100644
index a4e6635364..8d1281bbbc 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -14,6 +14,8 @@ import (
Expand Down
2 changes: 1 addition & 1 deletion patches/0012-Revert-WAF-schema-changes.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: [PATCH] Revert WAF schema changes
- This causes far too many types to be generated downstream.

diff --git a/internal/service/wafv2/schemas.go b/internal/service/wafv2/schemas.go
index 8ac8b8d534..65f810be49 100644
index 01769b9a1f..6f18fdc297 100644
--- a/internal/service/wafv2/schemas.go
+++ b/internal/service/wafv2/schemas.go
@@ -56,14 +56,14 @@ func ruleGroupRootStatementSchema(level int) *schema.Schema {
Expand Down
2 changes: 1 addition & 1 deletion patches/0014-add-matchmaking-configuration-72.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 af639c4dbf..8629a299bb 100644
index 8d1281bbbc..d3bcfba57c 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -16,6 +16,7 @@ import (
Expand Down
8 changes: 4 additions & 4 deletions patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ index f3e5480366..f348cb1e8e 100644
"expires": {
Type: schema.TypeString,
diff --git a/internal/service/cloudfront/origin_access_control.go b/internal/service/cloudfront/origin_access_control.go
index 3be91ca669..c406d9a83f 100644
index d09fe1f1bb..49cbcf8377 100644
--- a/internal/service/cloudfront/origin_access_control.go
+++ b/internal/service/cloudfront/origin_access_control.go
@@ -38,7 +38,7 @@ func resourceOriginAccessControl() *schema.Resource {
@@ -42,7 +42,7 @@ func resourceOriginAccessControl() *schema.Resource {
names.AttrDescription: {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -309,10 +309,10 @@ index c3170d4965..f13dada174 100644
HostedZoneId: aws.String(zoneID),
}
diff --git a/internal/service/route53/zone.go b/internal/service/route53/zone.go
index f44f0b5190..6a5a76267a 100644
index b9b6d12eb5..298937cd14 100644
--- a/internal/service/route53/zone.go
+++ b/internal/service/route53/zone.go
@@ -51,7 +51,7 @@ func resourceZone() *schema.Resource {
@@ -50,7 +50,7 @@ func resourceZone() *schema.Resource {
names.AttrComment: {
Type: schema.TypeString,
Optional: true,
Expand Down
4 changes: 2 additions & 2 deletions patches/0027-Do-not-compute-tags_all-at-TF-level.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Do not compute tags_all at TF level


diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
index 4605783c71..c06189571b 100644
index ba02c7346f..625c5ca7d1 100644
--- a/internal/provider/fwprovider/provider.go
+++ b/internal/provider/fwprovider/provider.go
@@ -418,8 +418,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
@@ -422,8 +422,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
continue
}
if v, ok := schemaResponse.Schema.Attributes[names.AttrTagsAll]; ok {
Expand Down
6 changes: 3 additions & 3 deletions patches/0030-Optimize-startup-performance.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize startup performance


diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index 8629a299bb..e2052ffe8a 100644
index d3bcfba57c..7b816b3be1 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -306,7 +306,7 @@ func New(ctx context.Context) (*schema.Provider, error) {
Expand All @@ -17,8 +17,8 @@ index 8629a299bb..e2052ffe8a 100644

// The data source has opted in to transparent tagging.
// Ensure that the schema look OK.
@@ -374,7 +374,7 @@ func New(ctx context.Context) (*schema.Provider, error) {

@@ -377,7 +377,7 @@ func New(ctx context.Context) (*schema.Provider, error) {
var customizeDiffFuncs []schema.CustomizeDiffFunc
interceptors := interceptorItems{}
if v.Tags != nil {
- schema := r.SchemaMap()
Expand Down
4 changes: 2 additions & 2 deletions patches/0031-DisableTagSchemaCheck-for-PF-provider.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] DisableTagSchemaCheck for PF provider


diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
index c06189571b..a254695b90 100644
index 625c5ca7d1..9e3bd14d55 100644
--- a/internal/provider/fwprovider/provider.go
+++ b/internal/provider/fwprovider/provider.go
@@ -405,8 +405,7 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
@@ -409,8 +409,7 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
if v.Tags != nil {
// The resource has opted in to transparent tagging.
// Ensure that the schema look OK.
Expand Down
4 changes: 2 additions & 2 deletions patches/0033-Fail-fast-when-PF-resources-are-dropped.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Fail fast when PF resources are dropped


diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
index a254695b90..1ad7f61576 100644
index 9e3bd14d55..4448d0bce0 100644
--- a/internal/provider/fwprovider/provider.go
+++ b/internal/provider/fwprovider/provider.go
@@ -452,9 +452,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
@@ -459,9 +459,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
}

if err := errors.Join(errs...); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion patches/0037-Restore-legacy-bucket.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Restore legacy bucket


diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index e2052ffe8a..4f7e3b5a37 100644
index 7b816b3be1..8cf17f7846 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -17,7 +17,6 @@ import (
Expand Down
4 changes: 2 additions & 2 deletions patches/0038-Patch-osis_pipeline-tags-flags.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Patch osis_pipeline tags flags


diff --git a/internal/service/osis/pipeline.go b/internal/service/osis/pipeline.go
index 2d3e729e43..7b75875f5b 100644
index a478507aae..c91cd9fa94 100644
--- a/internal/service/osis/pipeline.go
+++ b/internal/service/osis/pipeline.go
@@ -96,7 +96,7 @@ func (r *pipelineResource) Schema(ctx context.Context, request resource.SchemaRe
@@ -97,7 +97,7 @@ func (r *pipelineResource) Schema(ctx context.Context, request resource.SchemaRe
},
},
names.AttrTags: tftags.TagsAttribute(),
Expand Down
2 changes: 1 addition & 1 deletion patches/0047-update-apn-info.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] update apn info


diff --git a/internal/conns/config.go b/internal/conns/config.go
index 771456c71f..2f807a732e 100644
index 0613c797f8..9db7b383b2 100644
--- a/internal/conns/config.go
+++ b/internal/conns/config.go
@@ -23,7 +23,6 @@ import (
Expand Down
4 changes: 2 additions & 2 deletions patches/0056-Fix-tags_all-Computed-for-PF-resources.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Fix tags_all Computed for PF resources


diff --git a/internal/service/paymentcryptography/key.go b/internal/service/paymentcryptography/key.go
index c9e4cc77ec..c7b69214a1 100644
index ed8f19735e..53eccda79f 100644
--- a/internal/service/paymentcryptography/key.go
+++ b/internal/service/paymentcryptography/key.go
@@ -113,7 +113,7 @@ func (r *resourceKey) Schema(ctx context.Context, request resource.SchemaRequest
Expand All @@ -16,4 +16,4 @@ index c9e4cc77ec..c7b69214a1 100644
+ names.AttrTagsAll: tftags.TagsAttribute(),
},
Blocks: map[string]schema.Block{
"key_attributes": schema.SingleNestedBlock{
"key_attributes": schema.SingleNestedBlock{ // nosemgrep:ci.avoid-SingleNestedBlock pre-existing, will be converted
4 changes: 2 additions & 2 deletions patches/0059-Patch-tags-ComputedOnly-for-appfabric-networkmonitor.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ index 8d52e9bf6e..97df3a2c79 100644
Blocks: map[string]schema.Block{
"destination_configuration": schema.ListNestedBlock{
diff --git a/internal/service/networkfirewall/tls_inspection_configuration.go b/internal/service/networkfirewall/tls_inspection_configuration.go
index 0139e9aeae..d32c36b22a 100644
index 0139e9aeae..2c94a643c2 100644
--- a/internal/service/networkfirewall/tls_inspection_configuration.go
+++ b/internal/service/networkfirewall/tls_inspection_configuration.go
@@ -114,7 +114,7 @@ func (r *tlsInspectionConfigurationResource) Schema(ctx context.Context, request
},
},
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
"tls_inspection_configuration_id": framework.IDAttribute(),
"update_token": schema.StringAttribute{
Computed: true,
Expand Down
2 changes: 1 addition & 1 deletion patches/0061-Patch-ComputedOnly-for-rekognition-stream_processor.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Patch ComputedOnly for rekognition/stream_processor


diff --git a/internal/service/rekognition/stream_processor.go b/internal/service/rekognition/stream_processor.go
index 1654119563..e121f767c3 100644
index e7a070f9a4..0e25e4259a 100644
--- a/internal/service/rekognition/stream_processor.go
+++ b/internal/service/rekognition/stream_processor.go
@@ -134,7 +134,7 @@ func (r *resourceStreamProcessor) Schema(ctx context.Context, req resource.Schem
Expand Down
2 changes: 1 addition & 1 deletion patches/0064-Adapt-gamelift-matchmaking-resources.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ index 4295987ae6..7554a3029c 100644
return nil
}
diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl
index 503aab4f89..b6155a3185 100644
index d7ec30f738..ee47511138 100644
--- a/names/data/names_data.hcl
+++ b/names/data/names_data.hcl
@@ -3665,7 +3665,8 @@ service "fsx" {
Expand Down
4 changes: 2 additions & 2 deletions patches/0072-Patch-imagebuilder-and-resiliencehub-tagging.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ index 00d0567a29..0b4142a476 100644
Blocks: map[string]schema.Block{
"policy_detail": schema.SetNestedBlock{
diff --git a/internal/service/resiliencehub/resiliency_policy.go b/internal/service/resiliencehub/resiliency_policy.go
index cccdd2a608..8313d71791 100644
index 38c67dcced..823c917fa7 100644
--- a/internal/service/resiliencehub/resiliency_policy.go
+++ b/internal/service/resiliencehub/resiliency_policy.go
@@ -126,7 +126,7 @@ func (r *resourceResiliencyPolicy) Schema(ctx context.Context, req resource.Sche
Expand All @@ -29,4 +29,4 @@ index cccdd2a608..8313d71791 100644
+ names.AttrTagsAll: tftags.TagsAttribute(),
},
Blocks: map[string]schema.Block{
names.AttrPolicy: schema.SingleNestedBlock{
names.AttrPolicy: schema.SingleNestedBlock{ // nosemgrep:ci.avoid-SingleNestedBlock pre-existing, will be converted
4 changes: 2 additions & 2 deletions patches/0073-Restore-AWS-Go-SDK-v1-session.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Restore AWS Go SDK v1 session


diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go
index 932e5dff77..ff1bdc73d1 100644
index a71e98c2ab..2b6de1c8cc 100644
--- a/internal/conns/awsclient.go
+++ b/internal/conns/awsclient.go
@@ -321,6 +321,7 @@ func (c *AWSClient) apiClientConfig(ctx context.Context, servicePackageName stri
@@ -330,6 +330,7 @@ func (c *AWSClient) apiClientConfig(ctx context.Context, servicePackageName stri
"aws_sdkv2_config": c.awsConfig,
"endpoint": c.endpoints[servicePackageName],
"partition": c.Partition(ctx),
Expand Down
13 changes: 13 additions & 0 deletions patches/0078-Fix-tags_all-Computed-for-PF-resources.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@ index f797ba7013..fee74d9e3c 100644
},
Blocks: map[string]schema.Block{
"model_source": schema.ListNestedBlock{
diff --git a/internal/service/drs/replication_configuration_template.go b/internal/service/drs/replication_configuration_template.go
index c3f407f845..6d68b9719b 100644
--- a/internal/service/drs/replication_configuration_template.go
+++ b/internal/service/drs/replication_configuration_template.go
@@ -99,7 +99,7 @@ func (r *replicationConfigurationTemplateResource) Schema(ctx context.Context, r

"staging_area_tags": tftags.TagsAttributeRequired(),
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttribute(),
+ names.AttrTagsAll: tftags.TagsAttribute(),

"use_dedicated_replication_server": schema.BoolAttribute{
Required: true,
diff --git a/internal/service/logs/anomaly_detector.go b/internal/service/logs/anomaly_detector.go
index d69e4e44c8..d1a6eae711 100644
--- a/internal/service/logs/anomaly_detector.go
Expand Down
4 changes: 2 additions & 2 deletions patches/0081-Patch-tags-for-logs-cleanrooms-vpclattice.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ index ee4f03039e..991000a637 100644
CustomType: timetypes.RFC3339Type{},
Computed: true,
diff --git a/internal/service/logs/delivery.go b/internal/service/logs/delivery.go
index d749138f74..24b91ea5ea 100644
index d749138f74..29e6891331 100644
--- a/internal/service/logs/delivery.go
+++ b/internal/service/logs/delivery.go
@@ -93,7 +93,7 @@ func (r *deliveryResource) Schema(ctx context.Context, request resource.SchemaRe
},
"s3_delivery_configuration": framework.ResourceOptionalComputedListOfObjectsAttribute[s3DeliveryConfigurationModel](ctx, 1, s3DeliveryConfigurationListOptions, listplanmodifier.UseStateForUnknown()),
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
},
}
}
Expand Down
Loading

0 comments on commit 1d8553e

Please sign in to comment.