upstream v5.49.0 #3936

flostadler · 2024-05-14T09:37:56Z

Moving ./upstream to v5.49.0
Update patches

This includes quite a bit of changes to the patches because upstream added new constants for some names (e.g. description, arn, etc.) and replaced magic strings with those.
It also adds a new AWS service (DataZone) to the provider

Closes #3919

github-actions · 2024-05-14T12:03:18Z

Does the PR have any schema changes?

Found 12 breaking changes:

Functions

"aws:resourceexplorer/search:Search": inputs:
- 🟡 "resourceCounts" missing input "resourceCounts"
- 🟡 "resources" missing input "resources"

Types

"aws:resourceexplorer/SearchResource:SearchResource":
- 🟡 properties: "resourceProperties" missing
- 🟢 required: "properties" property has changed to Required
"aws:resourceexplorer/SearchResourceCount:SearchResourceCount":
- 🟡 properties: "completed" missing
- required:
  - 🟢 "complete" property has changed to Required
  - 🟢 "completed" property is no longer Required
🔴 "aws:resourceexplorer/SearchResourceResourceProperty:SearchResourceResourceProperty" missing
"aws:securitylake/SubscriberNotificationConfigurationHttpsNotificationConfiguration:SubscriberNotificationConfigurationHttpsNotificationConfiguration": required:
- 🟢 "endpoint" property has changed to Required
- 🟢 "targetRoleArn" property has changed to Required
🟢 "aws:securitylake/SubscriberSourceAwsLogSourceResource:SubscriberSourceAwsLogSourceResource": required: "sourceName" property has changed to Required
🟢 "aws:securitylake/SubscriberSourceCustomLogSourceResource:SubscriberSourceCustomLogSourceResource": required: "sourceName" property has changed to Required

New resources:

bedrock/agentDataSource.AgentDataSource
datazone/domain.Domain
datazone/environmentBlueprintConfiguration.EnvironmentBlueprintConfiguration

New functions:

datazone/getEnvironmentBlueprint.getEnvironmentBlueprint

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

flostadler · 2024-05-14T17:55:48Z

The breaking changes related to the resourceexplorer search datasource where caused by fixes to the schema here: https://github.com/hashicorp/terraform-provider-aws/pull/36778/files#diff-63480c99cde041537557b51dcf0c68613d404536259e267580e29feab619bdf0L40

The previous TF schema had mismatches with the underlying AWS API schema; rendering this datasource almost unusable. Here's an excerpt from the PR:

This PR is to fix various functional issues with the aws_resourceexplorer2_search data source, including:

Panic due to mismatched attributes between Terraform and AWS type/schema - see [Bug]: aws_resourceexplorer2_search panic hashicorp/terraform-provider-aws#36720

Various attributes not set by auto flattening due to mismatched attributes between Terraform and AWS type/schema

Data source state is not persisted at all

view_arn argument not used in the AWS API call

I'd argue that those are not breaking changes in reality because the data source wasn't really usable ("Data source state is not persisted at all"...)

t0yv0 · 2024-05-14T18:17:32Z

patches/0004-De-deprecate-bucket_object.patch

 --- a/internal/service/s3/bucket_object.go
 +++ b/internal/service/s3/bucket_object.go
 @@ -68,7 +68,7 @@ func resourceBucketObject() *schema.Resource {
 				Computed: true,
 			},
- 			"bucket": {
+ 			names.AttrBucket: {
 -				Deprecated:   "Use the aws_s3_object resource instead",
 +				// FORK: Stack72 removed the deprecation warning as it was misleading for Pulumi users


This is a good find, relevant to some S3 revisiting work that I'm doing, going to log that.

t0yv0 · 2024-05-14T18:23:23Z

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

 --- a/names/data/names_data.csv
 +++ b/names/data/names_data.csv
 @@ -218,7 +218,7 @@ kinesis-video-media,kinesisvideomedia,kinesisvideomedia,kinesisvideomedia,,kines
 kinesis-video-signaling,kinesisvideosignaling,kinesisvideosignalingchannels,kinesisvideosignaling,,kinesisvideosignaling,,kinesisvideosignalingchannels,KinesisVideoSignaling,KinesisVideoSignalingChannels,,1,,,aws_kinesisvideosignaling_,,kinesisvideosignaling_,Kinesis Video Signaling,Amazon,,x,,,,,Kinesis Video Signaling,,,
- kms,kms,kms,kms,,kms,,,KMS,KMS,,1,,,aws_kms_,,kms_,KMS (Key Management),AWS,,,,,,,KMS,ListKeys,,
+ kms,kms,kms,kms,,kms,,,KMS,KMS,,,2,,aws_kms_,,kms_,KMS (Key Management),AWS,,,,,,,KMS,ListKeys,,


The CSV diff is a bit hard to read, did this change OK? This CSV drives some code-generator but we don't fully check that changes to the CSV keep the generated code consistent. I recently had to make some quick edits in there.

This was changed upstream here: hashicorp/terraform-provider-aws@8a2d87d

How would I confirm whether this had any negative effects?

I did some digging and the data in the CSV follows the format documented here: https://github.com/hashicorp/terraform-provider-aws/blob/main/names/README.md?plain=1#L34

What changed here was index 12, which indicates whether AWS SDKv2 is used or not. If SDK v2 is used, the value needs to be set to 2. And that value was set to 2 now because they switched KMS over to use SDKv2: https://github.com/hashicorp/terraform-provider-aws/blame/main/internal/service/kms/service_package_gen.go#L132

So this change is fine.

t0yv0 · 2024-05-14T18:24:41Z

patches/0045-securitylake_subscriber-tags_all-patch.patch

 			},
 			names.AttrID:      framework.IDAttribute(),
 			names.AttrTags:    tftags.TagsAttribute(),
 -			names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
 +			names.AttrTagsAll: tftags.TagsAttribute(),
 		},
 		Blocks: map[string]schema.Block{
- 			"source": schema.ListNestedBlock{
+ 			"source": schema.SetNestedBlock{


Curious is this new? Is it Set or List? I thought this patch is only interested in patching up tftags.TagsAttribute()

This was recently changed in upstream: https://github.com/hashicorp/terraform-provider-aws/blame/main/internal/service/securitylake/subscriber.go#L105

It's not part of the changes in this patch, just the surrounding code

I got confused by the placement of +/- in the diff display. Looked like a change in the patch.

t0yv0 · 2024-05-14T18:26:37Z

provider/resources.go

@@ -108,6 +108,7 @@ const (
 	dataexchangeMod             = "DataExchange"             // Data exchange
 	datapipelineMod             = "DataPipeline"             // Data Pipeline
 	datasyncMod                 = "DataSync"                 // DataSync
+	datazoneMod				    = "DataZone"                 // DataZone


Is this gofmt'd right? Looks a bit odd.

🤦 Didn't commit after go fmt'ing

flostadler · 2024-05-14T18:27:29Z

The rest of the breaking changes are bug fixes, so a minor upgrade on our end should be good here:

aws:securitylake/SubscriberNotificationConfigurationHttpsNotificationConfiguration:SubscriberNotificationConfigurationHttpsNotificationConfiguration": required:
🟢 "endpoint" property has changed to Required
🟢 "targetRoleArn" property has changed to Required
=> endpoint and targetRoleArn not being required was a bug hashicorp/terraform-provider-aws#37332
🟢 "aws:securitylake/SubscriberSourceAwsLogSourceResource:SubscriberSourceAwsLogSourceResource": required: "sourceName" property has changed to Required => Source name not being required was a bug hashicorp/terraform-provider-aws#36268
🟢 "aws:securitylake/SubscriberSourceCustomLogSourceResource:SubscriberSourceCustomLogSourceResource": required: "sourceName" property has changed to Required => Source name not being required was a bug hashicorp/terraform-provider-aws#36268

t0yv0

Got some questions on patch edits to confirm but generally LGTM! 🙇 thanks for taking this, a fair bit of work that is necessary.

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.35.0` -> `6.36.0`](https://renovatebot.com/diffs/npm/@pulumi%2faws/6.35.0/6.36.0) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>pulumi/pulumi-aws (@pulumi/aws)</summary> ### [`v6.36.0`](https://togithub.com/pulumi/pulumi-aws/releases/tag/v6.36.0) [Compare Source](https://togithub.com/pulumi/pulumi-aws/compare/v6.35.0...v6.36.0) ##### What's Changed - upstream v5.49.0 by [@flostadler](https://togithub.com/flostadler) in [https://github.com/pulumi/pulumi-aws/pull/3936](https://togithub.com/pulumi/pulumi-aws/pull/3936) - fix: sns topic creation fails in non-standard partitions by [@corymhall](https://togithub.com/corymhall) in [https://github.com/pulumi/pulumi-aws/pull/3932](https://togithub.com/pulumi/pulumi-aws/pull/3932) - fix: wafv2 permanent diff issues ([#3880](https://togithub.com/pulumi/pulumi-aws/issues/3880) [#3306](https://togithub.com/pulumi/pulumi-aws/issues/3306) [#3190](https://togithub.com/pulumi/pulumi-aws/issues/3190) [#3454](https://togithub.com/pulumi/pulumi-aws/issues/3454)) - Enroll aws_wafv2\_rule_group in PlanResourceChange by [@flostadler](https://togithub.com/flostadler) in [https://github.com/pulumi/pulumi-aws/pull/3948](https://togithub.com/pulumi/pulumi-aws/pull/3948) - Upgrade pulumi-terraform-bridge to v3.82.0 by [@flostadler](https://togithub.com/flostadler) in [https://github.com/pulumi/pulumi-aws/pull/3929](https://togithub.com/pulumi/pulumi-aws/pull/3929) - Dependencies: terraform converter v1.0.17 by [@t0yv0](https://togithub.com/t0yv0) in [https://github.com/pulumi/pulumi-aws/pull/3923](https://togithub.com/pulumi/pulumi-aws/pull/3923) **Full Changelog**: pulumi/pulumi-aws@v6.35.0...v6.36.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.35.0` -> `6.36.0`](https://renovatebot.com/diffs/npm/@pulumi%2faws/6.35.0/6.36.0) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>pulumi/pulumi-aws (@pulumi/aws)</summary> ### [`v6.36.0`](https://togithub.com/pulumi/pulumi-aws/releases/tag/v6.36.0) [Compare Source](https://togithub.com/pulumi/pulumi-aws/compare/v6.35.0...v6.36.0) ##### What's Changed - upstream v5.49.0 by [@flostadler](https://togithub.com/flostadler) in [https://github.com/pulumi/pulumi-aws/pull/3936](https://togithub.com/pulumi/pulumi-aws/pull/3936) - fix: sns topic creation fails in non-standard partitions by [@corymhall](https://togithub.com/corymhall) in [https://github.com/pulumi/pulumi-aws/pull/3932](https://togithub.com/pulumi/pulumi-aws/pull/3932) - fix: wafv2 permanent diff issues ([#3880](https://togithub.com/pulumi/pulumi-aws/issues/3880) [#3306](https://togithub.com/pulumi/pulumi-aws/issues/3306) [#3190](https://togithub.com/pulumi/pulumi-aws/issues/3190) [#3454](https://togithub.com/pulumi/pulumi-aws/issues/3454)) - Enroll aws_wafv2\_rule_group in PlanResourceChange by [@flostadler](https://togithub.com/flostadler) in [https://github.com/pulumi/pulumi-aws/pull/3948](https://togithub.com/pulumi/pulumi-aws/pull/3948) - Upgrade pulumi-terraform-bridge to v3.82.0 by [@flostadler](https://togithub.com/flostadler) in [https://github.com/pulumi/pulumi-aws/pull/3929](https://togithub.com/pulumi/pulumi-aws/pull/3929) - Dependencies: terraform converter v1.0.17 by [@t0yv0](https://togithub.com/t0yv0) in [https://github.com/pulumi/pulumi-aws/pull/3923](https://togithub.com/pulumi/pulumi-aws/pull/3923) **Full Changelog**: pulumi/pulumi-aws@v6.35.0...v6.36.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 marked this pull request as draft May 14, 2024 09:38

flostadler self-assigned this May 14, 2024

flostadler added 2 commits May 14, 2024 12:20

Moving ./upstream to v5.49.0

613f3c0

Update patches

9c328c6

flostadler force-pushed the upstream-v5.49.0 branch from a6afd9a to 9c328c6 Compare May 14, 2024 10:21

flostadler added 3 commits May 14, 2024 12:28

go mod tidy

c8d778c

Fix tags_all Computed for aws_datazone_domain

80442b5

Add datazone module prefix

3f58a10

flostadler added 2 commits May 14, 2024 14:13

make tfgen

a2631bd

make build_sdks

dd04274

flostadler requested a review from a team May 14, 2024 12:49

flostadler marked this pull request as ready for review May 14, 2024 12:50

flostadler requested review from t0yv0 and corymhall May 14, 2024 12:51

flostadler added 2 commits May 14, 2024 17:59

Merge branch 'master' into upstream-v5.49.0

54f1756

re-apply patches

612e141

t0yv0 reviewed May 14, 2024

View reviewed changes

t0yv0 self-requested a review May 14, 2024 18:27

t0yv0 approved these changes May 14, 2024

View reviewed changes

gofmt

91acc72

flostadler merged commit 7f5ae1c into master May 15, 2024
23 checks passed

flostadler deleted the upstream-v5.49.0 branch May 15, 2024 13:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

upstream v5.49.0 #3936

upstream v5.49.0 #3936

flostadler commented May 14, 2024 •

edited

Loading

github-actions bot commented May 14, 2024 •

edited

Loading

flostadler commented May 14, 2024 •

edited

Loading

t0yv0 May 14, 2024

t0yv0 May 14, 2024

flostadler May 14, 2024

flostadler May 15, 2024 •

edited

Loading

t0yv0 May 14, 2024

flostadler May 14, 2024

t0yv0 May 15, 2024

t0yv0 May 14, 2024

flostadler May 14, 2024

flostadler commented May 14, 2024

t0yv0 left a comment

upstream v5.49.0 #3936

upstream v5.49.0 #3936

Conversation

flostadler commented May 14, 2024 • edited Loading

github-actions bot commented May 14, 2024 • edited Loading

Does the PR have any schema changes?

Functions

Types

New resources:

New functions:

flostadler commented May 14, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

flostadler May 15, 2024 • 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

flostadler commented May 14, 2024

t0yv0 left a comment

Choose a reason for hiding this comment

flostadler commented May 14, 2024 •

edited

Loading

github-actions bot commented May 14, 2024 •

edited

Loading

flostadler commented May 14, 2024 •

edited

Loading

flostadler May 15, 2024 •

edited

Loading