Upstream 5.85.0 #5161

corymhall · 2025-02-04T19:10:54Z

Upgrade terraform-provider-aws to v5.85.0

corymhall · 2025-02-04T19:10:56Z

This change is part of the following stack:

Upstream 5.85.0 #5161 ◀

_{Change managed by git-spice.}

corymhall · 2025-02-04T19:19:39Z

patches/0071-Restore-conns-factory-for-SDKv1-Go-clients-used-by-p.patch

@@ -48,8 +48,8 @@ index 57bf4c7c94..09b4279db3 100644
 +		}
 +	}
 +
-+	sp, ok := c.ServicePackages[servicePackageName]
-+	if !ok {
+	sp := c.ServicePackage(ctx, servicePackageName)


c.ServicePackages was changed to a private type with accessor methods.

corymhall · 2025-02-04T19:22:18Z

provider/resources.go

+	prov.Resources["aws_guardduty_member_detector_feature"].ComputeID = func(
+		ctx context.Context, state resource.PropertyMap,
+	) (resource.ID, error) {
+		return attrWithSeparator(state, ",", "detectorId", "accountId", "name"), nil


This resource currently doesn't support import, so I'm not 100% sure this is correct. Based on the Read method it looks like these three are required

https://github.com/hashicorp/terraform-provider-aws/blob/658a64579f91e53276d2a71da00aa43b854d3de7/internal/service/guardduty/member_detector_feature.go?plain=1#L143

Ah yes. The ID allocation is best-effort. Technically new GUID is a valid ID. We've been trying to match ID to import IDs where possible.

corymhall · 2025-02-04T19:22:53Z

provider/resources.go

@@ -4666,6 +4668,8 @@ compatibility shim in favor of the new "name" field.`)
 			"aws_ec2_managed_prefix_list":          {Tok: awsDataSource(ec2Mod, "getManagedPrefixList")},
 			"aws_ec2_transit_gateway_route_tables": {Tok: awsDataSource(ec2Mod, "getTransitGatewayRouteTables")},
 			"aws_ec2_instance_types":               {Tok: awsDataSource(ec2Mod, "getInstanceTypes")},
+			"aws_vpc_ipam":                         {Tok: awsDataSource(ec2Mod, "getVpcIpam")},


This is aws_vpc_*, but everything else we've been putting in aws_ec2 so just following that.

Which module does it show up in the TF documentation site? Alongside which resources? Can we match that for minimum surprise?

Well the problem is that we haven't been matching TF so far. The TF docs site has a separate section for Vpc (which includes a lot more resources that our Vpc docs section) and a separate Vpc IPAM section.

It seems like we've already diverged pretty far from what the TF docs do, but that also might be because they are able to re-organize the resources on the docs site when they want to.

Also, it might be a moot point because I didn't realize we already had a aws_vpc_ipam resource that we put under the ec2 module so I think we need to also put the datasource there as well.

I'd like to maybe clean this up. WDYT? Aliasing may have our back but would like to move these resources into their new home module that matches TF upstream. Perhaps we can take a task into V7 planning to finish this up?

That's a good idea, we should think about how to reorganize these resources for V7. I'll create an issue to track.

t0yv0 · 2025-02-05T16:27:41Z

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

 		lambda.WithEndpointResolverV2(newEndpointResolverV2()),
 		withBaseEndpoint(config[names.AttrEndpoint].(string)),
+ 		withExtraOptions(ctx, p, config),
 +		p.pulumiCustomizeLambdaRetries(cfg),


Anything special going on here?

Looks like they added the withExtraOptions thing in there so I just fixed the rebase to add our customization after.

t0yv0

PATCH changes LGTM. Let me know if need a hand fighting CI.

github-actions · 2025-02-05T17:32:21Z

Does the PR have any schema changes?

Found 2 breaking changes:

Resources

🟢 "aws:ec2/vpcEndpoint:VpcEndpoint": required: "serviceName" property is no longer Required

Types

🟢 "aws:ec2/getLaunchTemplateNetworkInterface:getLaunchTemplateNetworkInterface": required: "connectionTrackingSpecifications" property has changed to Required

New resources:

guardduty/memberDetectorFeature.MemberDetectorFeature
route53domains/domain.Domain
timestreamquery/scheduledQuery.ScheduledQuery
vpclattice/resourceConfiguration.ResourceConfiguration
vpclattice/serviceNetworkResourceAssociation.ServiceNetworkResourceAssociation

New functions:

ec2/getVpcIpam.getVpcIpam
ec2/getVpcIpams.getVpcIpams

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

codecov · 2025-02-05T17:32:35Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 24.54%. Comparing base (585aec0) to head (c35cb24).
Report is 1 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #5161      +/-   ##
==========================================
+ Coverage   24.47%   24.54%   +0.06%     
==========================================
  Files         361      362       +1     
  Lines      144065   144734     +669     
==========================================
+ Hits        35260    35524     +264     
- Misses     108707   109112     +405     
  Partials       98       98

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

pulumi-bot · 2025-02-07T16:30:37Z

This PR has been shipped in release v6.68.0.

corymhall changed the base branch from master to upgrade-pulumi-terraform-bridge-to-v3.102.0-ci February 4, 2025 19:14

github-actions bot force-pushed the upgrade-pulumi-terraform-bridge-to-v3.102.0-ci branch from 3bdc626 to 94c0821 Compare February 4, 2025 19:20

corymhall commented Feb 4, 2025

View reviewed changes

corymhall changed the base branch from upgrade-pulumi-terraform-bridge-to-v3.102.0-ci to upgrade-pulumi-terraform-bridge-to-v3.102.0 February 4, 2025 20:14

corymhall force-pushed the corymhall/upstream-585 branch from 8aea02c to d03c0dd Compare February 4, 2025 20:14

corymhall mentioned this pull request Feb 4, 2025

Upgrade pulumi-terraform-bridge to v3.102.0 #5162

Merged

corymhall marked this pull request as ready for review February 4, 2025 21:01

corymhall requested a review from a team February 4, 2025 21:01

corymhall force-pushed the corymhall/upstream-585 branch from d03c0dd to 09b8261 Compare February 5, 2025 15:13

t0yv0 reviewed Feb 5, 2025

View reviewed changes

t0yv0 approved these changes Feb 5, 2025

View reviewed changes

Base automatically changed from upgrade-pulumi-terraform-bridge-to-v3.102.0 to master February 5, 2025 17:38

corymhall added 6 commits February 5, 2025 12:39

Update patches for v5.85.0

2a379f7

Move upstream to v5.85.0

af194dd

./scripts/tidy-all.sh

8f6a009

make tfgen

a15273a

make build_sdks

3811c79

fixing todos

b96354c

corymhall force-pushed the corymhall/upstream-585 branch from 7b54123 to b96354c Compare February 5, 2025 17:39

Run build again

c35cb24

corymhall merged commit 10b9d3f into master Feb 6, 2025
25 checks passed

corymhall deleted the corymhall/upstream-585 branch February 6, 2025 16:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstream 5.85.0 #5161

Upstream 5.85.0 #5161

corymhall commented Feb 4, 2025 •

edited

Loading

corymhall commented Feb 4, 2025 •

edited

Loading

corymhall Feb 4, 2025

corymhall Feb 4, 2025

t0yv0 Feb 4, 2025

corymhall Feb 4, 2025

t0yv0 Feb 4, 2025

corymhall Feb 5, 2025

t0yv0 Feb 5, 2025

corymhall Feb 5, 2025

corymhall Feb 5, 2025

t0yv0 Feb 5, 2025

corymhall Feb 5, 2025

t0yv0 left a comment

github-actions bot commented Feb 5, 2025 •

edited

Loading

codecov bot commented Feb 5, 2025 •

edited

Loading

pulumi-bot commented Feb 7, 2025

Upstream 5.85.0 #5161

Upstream 5.85.0 #5161

Conversation

corymhall commented Feb 4, 2025 • edited Loading

corymhall commented Feb 4, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

t0yv0 left a comment

Choose a reason for hiding this comment

github-actions bot commented Feb 5, 2025 • edited Loading

Does the PR have any schema changes?

Resources

Types

New resources:

New functions:

codecov bot commented Feb 5, 2025 • edited Loading

Codecov Report

pulumi-bot commented Feb 7, 2025

corymhall commented Feb 4, 2025 •

edited

Loading

corymhall commented Feb 4, 2025 •

edited

Loading

github-actions bot commented Feb 5, 2025 •

edited

Loading

codecov bot commented Feb 5, 2025 •

edited

Loading