upstream v5.55.0 #4102

flostadler · 2024-06-24T10:55:51Z

Moving ./upstream to v5.55.0
Update patches
./scripts/tidy-all.sh
Make scripts/patch_computed_only.sh honor whitespaces
./script/patch_computed_only.sh
Add mod mappings for new resources
Regenerate schema
Regenerate SDK

flostadler · 2024-06-24T10:57:38Z

patches/0036-Disable-retry-for-KMS-access-denied-in-lambda.patch

-+		}
-+		o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws_sdkv2.RetryerV2), retry)
-+	}), nil
+	return lambda_sdkv2.NewFromConfig(cfg,


There's multiple similar changes to patches in this PR.
Upstream introduces some helpers for configuring the endpoint: https://github.com/hashicorp/terraform-provider-aws/pull/38057/files

flostadler · 2024-06-24T11:01:43Z

scripts/patch_computed_only.sh

@@ -29,6 +29,6 @@ FILES=$(cd upstream && git grep TagsAttributeComputedOnly |


 for f in $FILES; do
-    replace="s/names.AttrTagsAll: tftags.TagsAttributeComputedOnly/names.AttrTagsAll: tftags.TagsAttribute/g"
+    replace="s/names.AttrTagsAll:\s+tftags.TagsAttributeComputedOnly/names.AttrTagsAll: tftags.TagsAttribute/g"


This now supports different amounts of whitespaces

github-actions · 2024-06-24T11:32:39Z

Does the PR have any schema changes?

Found 6 breaking changes:

Resources

🟢 "aws:ec2/networkInsightsPath:NetworkInsightsPath": required: "destination" property is no longer Required

Types

🟢 "aws:autoscaling/getGroupMixedInstancesPolicyLaunchTemplateOverrideInstanceRequirement:getGroupMixedInstancesPolicyLaunchTemplateOverrideInstanceRequirement": required: "maxSpotPriceAsPercentageOfOptimalOnDemandPrice" property has changed to Required
🟢 "aws:dynamodb/TableTtl:TableTtl": required: "attributeName" property is no longer Required
🟢 "aws:ec2/getLaunchTemplateInstanceRequirement:getLaunchTemplateInstanceRequirement": required: "maxSpotPriceAsPercentageOfOptimalOnDemandPrice" property has changed to Required
🟢 "aws:glue/getCatalogTableStorageDescriptor:getCatalogTableStorageDescriptor": required: "additionalLocations" property has changed to Required
🟢 "aws:networkmanager/getCoreNetworkPolicyDocumentAttachmentPolicyAction:getCoreNetworkPolicyDocumentAttachmentPolicyAction": required: "associationMethod" property is no longer Required

New resources:

drs/replicationConfigurationTemplate.ReplicationConfigurationTemplate

Maintainer note: consult the runbook for dealing with any breaking changes.

Previously you could set the TTL attribute's name even though TTL was disabled. This resulted in permadiffs. Upstream introduced added validation in this PR: hashicorp/terraform-provider-aws#37991

t0yv0 · 2024-06-24T14:48:45Z

patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch

 --- a/internal/service/appsync/api_key.go
 +++ b/internal/service/appsync/api_key.go
-@@ -36,7 +36,7 @@ func ResourceAPIKey() *schema.Resource {
+@@ -49,7 +49,7 @@ func resourceAPIKey() *schema.Resource {
 			names.AttrDescription: {
 				Type:     schema.TypeString,
 				Optional: true,
 -				Default:  "Managed by Terraform",
 +				Default:  "Managed by Pulumi",


A bit tedious but we could move this from a patch some Go code running on provider init. Fewer patches, less busywork.

Do we have a ticket for this already?

t0yv0 · 2024-06-24T14:49:43Z

patches/0036-Disable-retry-for-KMS-access-denied-in-lambda.patch

- kms,kms,kms,kms,,kms,,,KMS,KMS,,,2,,aws_kms_,,kms_,KMS (Key Management),AWS,,,,,,,KMS,ListKeys,,,
- lakeformation,lakeformation,lakeformation,lakeformation,,lakeformation,,,LakeFormation,LakeFormation,,,2,,aws_lakeformation_,,lakeformation_,Lake Formation,AWS,,,,,,,LakeFormation,ListResources,,,
-lambda,lambda,lambda,lambda,,lambda,,,Lambda,Lambda,,,2,,aws_lambda_,,lambda_,Lambda,AWS,,,,,,,Lambda,ListFunctions,,,
-+lambda,lambda,lambda,lambda,,lambda,,,Lambda,Lambda,x,,2,,aws_lambda_,,lambda_,Lambda,AWS,,,,,,,Lambda,ListFunctions,,,


Wish GitHub knew how to display CSV diffs properly.. This is terrible.

t0yv0

LGTM

stevenolen · 2024-06-25T12:59:43Z

is there documentation about when this will be available in a release?

pulumi-bot · 2024-06-27T15:27:01Z

This PR has been shipped in release v6.42.0.

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@pulumi/aws](https://pulumi.io) ([source](https://togithub.com/pulumi/pulumi-aws)) | dependencies | minor | [`6.41.0` -> `6.42.0`](https://renovatebot.com/diffs/npm/@pulumi%2faws/6.41.0/6.42.0) | --- ### Release Notes <details> <summary>pulumi/pulumi-aws (@pulumi/aws)</summary> ### [`v6.42.0`](https://togithub.com/pulumi/pulumi-aws/releases/tag/v6.42.0) [Compare Source](https://togithub.com/pulumi/pulumi-aws/compare/v6.41.0...v6.42.0) ##### What's Changed - Add extra notes to critical resource properties by [@guineveresaenger](https://togithub.com/guineveresaenger) in [https://github.com/pulumi/pulumi-aws/pull/4088](https://togithub.com/pulumi/pulumi-aws/pull/4088) - upstream v5.55.0 by [@flostadler](https://togithub.com/flostadler) in [https://github.com/pulumi/pulumi-aws/pull/4102](https://togithub.com/pulumi/pulumi-aws/pull/4102) - Upgrade pulumi-terraform-bridge to v3.85.0 by [@pulumi-bot](https://togithub.com/pulumi-bot) in [https://github.com/pulumi/pulumi-aws/pull/4103](https://togithub.com/pulumi/pulumi-aws/pull/4103) - Enable TypedDict input types for the Python SDK by [@julienp](https://togithub.com/julienp) in [https://github.com/pulumi/pulumi-aws/pull/4108](https://togithub.com/pulumi/pulumi-aws/pull/4108) - fix!: unable to create fsx for OpenZfs Multi-AZ file system by [@corymhall](https://togithub.com/corymhall) in [https://github.com/pulumi/pulumi-aws/pull/4095](https://togithub.com/pulumi/pulumi-aws/pull/4095) - Fix unexpected alb.Listener target group refresh by [@t0yv0](https://togithub.com/t0yv0) in [https://github.com/pulumi/pulumi-aws/pull/4083](https://togithub.com/pulumi/pulumi-aws/pull/4083) ##### ⚠ BREAKING CHANGES - fsx.OpenZfsFileSystem - The `subnetIds` argument now accepts a list instead of a string ##### New Contributors - [@julienp](https://togithub.com/julienp) made their first contribution in [https://github.com/pulumi/pulumi-aws/pull/4108](https://togithub.com/pulumi/pulumi-aws/pull/4108) **Full Changelog**: pulumi/pulumi-aws@v6.41.0...v6.42.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate).  Co-authored-by: lumiere-bot[bot] <98047013+lumiere-bot[bot]@users.noreply.github.com>

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@pulumi/aws](https://pulumi.io) ([source](https://togithub.com/pulumi/pulumi-aws)) | dependencies | minor | [`6.41.0` -> `6.42.0`](https://renovatebot.com/diffs/npm/@pulumi%2faws/6.41.0/6.42.0) | --- ### Release Notes <details> <summary>pulumi/pulumi-aws (@pulumi/aws)</summary> ### [`v6.42.0`](https://togithub.com/pulumi/pulumi-aws/releases/tag/v6.42.0) [Compare Source](https://togithub.com/pulumi/pulumi-aws/compare/v6.41.0...v6.42.0) ##### What's Changed - Add extra notes to critical resource properties by [@guineveresaenger](https://togithub.com/guineveresaenger) in [https://github.com/pulumi/pulumi-aws/pull/4088](https://togithub.com/pulumi/pulumi-aws/pull/4088) - upstream v5.55.0 by [@flostadler](https://togithub.com/flostadler) in [https://github.com/pulumi/pulumi-aws/pull/4102](https://togithub.com/pulumi/pulumi-aws/pull/4102) - Upgrade pulumi-terraform-bridge to v3.85.0 by [@pulumi-bot](https://togithub.com/pulumi-bot) in [https://github.com/pulumi/pulumi-aws/pull/4103](https://togithub.com/pulumi/pulumi-aws/pull/4103) - Enable TypedDict input types for the Python SDK by [@julienp](https://togithub.com/julienp) in [https://github.com/pulumi/pulumi-aws/pull/4108](https://togithub.com/pulumi/pulumi-aws/pull/4108) - fix!: unable to create fsx for OpenZfs Multi-AZ file system by [@corymhall](https://togithub.com/corymhall) in [https://github.com/pulumi/pulumi-aws/pull/4095](https://togithub.com/pulumi/pulumi-aws/pull/4095) - Fix unexpected alb.Listener target group refresh by [@t0yv0](https://togithub.com/t0yv0) in [https://github.com/pulumi/pulumi-aws/pull/4083](https://togithub.com/pulumi/pulumi-aws/pull/4083) ##### ⚠ BREAKING CHANGES - fsx.OpenZfsFileSystem - The `subnetIds` argument now accepts a list instead of a string ##### New Contributors - [@julienp](https://togithub.com/julienp) made their first contribution in [https://github.com/pulumi/pulumi-aws/pull/4108](https://togithub.com/pulumi/pulumi-aws/pull/4108) **Full Changelog**: pulumi/pulumi-aws@v6.41.0...v6.42.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate).  Co-authored-by: lumiere-bot[bot] <98047013+lumiere-bot[bot]@users.noreply.github.com>

flostadler added 8 commits June 24, 2024 12:08

Moving ./upstream to v5.55.0

a343d51

Update patches

1a32865

./scripts/tidy-all.sh

229e9d7

Make scripts/patch_computed_only.sh honor whitespaces

a83db6a

./script/patch_computed_only.sh

e2758da

Add mod mappings for new resources

e2c5edf

Regenerate schema

ab41a4a

Regenerate SDK

3d74d72

flostadler self-assigned this Jun 24, 2024

flostadler commented Jun 24, 2024

View reviewed changes

flostadler requested a review from a team June 24, 2024 11:15

Fix DynamoDB example because upstream introduced additional validation

9bd3763

Previously you could set the TTL attribute's name even though TTL was disabled. This resulted in permadiffs. Upstream introduced added validation in this PR: hashicorp/terraform-provider-aws#37991

t0yv0 reviewed Jun 24, 2024

View reviewed changes

t0yv0 approved these changes Jun 24, 2024

View reviewed changes

t0yv0 mentioned this pull request Jun 24, 2024

PATCH 0019-Change-default-descriptions-to-Managed-by-Pulumi.patch #2746

Open

flostadler merged commit 00ba5ea into master Jun 24, 2024
24 checks passed

flostadler deleted the upstream-v5.55.0 branch June 24, 2024 15:05

pulumi-bot mentioned this pull request Jun 27, 2024

Upgrade terraform-provider-aws to v5.55.0 #4093

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

upstream v5.55.0 #4102

upstream v5.55.0 #4102

flostadler commented Jun 24, 2024 •

edited

Loading

flostadler Jun 24, 2024

flostadler Jun 24, 2024

github-actions bot commented Jun 24, 2024 •

edited

Loading

t0yv0 Jun 24, 2024

flostadler Jun 24, 2024

t0yv0 Jun 24, 2024

t0yv0 left a comment

stevenolen commented Jun 25, 2024

pulumi-bot commented Jun 27, 2024

upstream v5.55.0 #4102

upstream v5.55.0 #4102

Conversation

flostadler commented Jun 24, 2024 • edited Loading

flostadler Jun 24, 2024

Choose a reason for hiding this comment

flostadler Jun 24, 2024

Choose a reason for hiding this comment

github-actions bot commented Jun 24, 2024 • edited Loading

Does the PR have any schema changes?

Resources

Types

New resources:

t0yv0 Jun 24, 2024

Choose a reason for hiding this comment

flostadler Jun 24, 2024

Choose a reason for hiding this comment

t0yv0 Jun 24, 2024

Choose a reason for hiding this comment

t0yv0 left a comment

Choose a reason for hiding this comment

stevenolen commented Jun 25, 2024

pulumi-bot commented Jun 27, 2024

flostadler commented Jun 24, 2024 •

edited

Loading

github-actions bot commented Jun 24, 2024 •

edited

Loading