Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream v5.73.0 #4674

Merged
merged 29 commits into from
Oct 29, 2024
Merged

Upstream v5.73.0 #4674

merged 29 commits into from
Oct 29, 2024

Conversation

t0yv0
Copy link
Member

@t0yv0 t0yv0 commented Oct 26, 2024

Upgrade upstream provider to v5.73.0.

New resources:

imagebuilder/lifecyclePolicy.LifecyclePolicy
resiliencehub/resiliencyPolicy.ResiliencyPolicy
sagemaker/hub.Hub
sagemaker/mlflowTrackingServer.MlflowTrackingServer

New functions:

ssm/getPatchBaselines.getPatchBaselines

Fixes: #4665

New patches are taken to compensate for upstream partially removing Go SDKV1, so that Pulumi-only resources such as aws.s3.Bucket continue to work as expected.

Base automatically changed from upstream-v5.72.1 to master October 28, 2024 18:13
Copy link

github-actions bot commented Oct 28, 2024

Does the PR have any schema changes?

Found 1 breaking change:

Types

  • 🟡 "aws:route53/ProfilesAssociationTimeouts:ProfilesAssociationTimeouts": properties: "read" missing

New resources:

  • imagebuilder/lifecyclePolicy.LifecyclePolicy
  • resiliencehub/resiliencyPolicy.ResiliencyPolicy
  • sagemaker/hub.Hub
  • sagemaker/mlflowTrackingServer.MlflowTrackingServer

New functions:

  • ssm/getPatchBaselines.getPatchBaselines

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

- tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
)

-// Find JSON diff functions in the json.go file.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you know what is going on with this change?

-
return nil
}
+ // Pulumi handles tags differently for Plugin Framework.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@corymhall yes so as part of this PR I endeavored to minimize subsequent patch conflicts for us. What we want to do is to make this function a no-op. The function keeps changing. If we do this as we did before by deleting the code, the changes generate more conflicts. With this new method we just short-circuit it to nil right upfront, but let the rest of the code drift upstream. I think this is better.

@t0yv0 t0yv0 requested a review from corymhall October 28, 2024 20:09
@t0yv0
Copy link
Member Author

t0yv0 commented Oct 28, 2024

panic: interface conversion: interface {} is nil, not *session.Session

Tests pointing out that reverse-engineering AWS SDKv1 removal need to go a bit deeper, working this out.

@t0yv0 t0yv0 requested a review from flostadler October 29, 2024 00:33
@t0yv0
Copy link
Member Author

t0yv0 commented Oct 29, 2024

ecr/credentials_data_source is maintained by patches and might be affected, need to verify.

@flostadler
Copy link
Contributor

@t0yv0 I've added a test for the ECR getCredentials function

@t0yv0 t0yv0 marked this pull request as ready for review October 29, 2024 13:26
@t0yv0 t0yv0 requested a review from flostadler October 29, 2024 13:27
Copy link
Contributor

@flostadler flostadler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! This upstream change was one hell of a beast

@t0yv0 t0yv0 merged commit b1d1cd1 into master Oct 29, 2024
33 checks passed
@t0yv0 t0yv0 deleted the upstream-v5.73.0 branch October 29, 2024 15:57
@pulumi-bot
Copy link
Contributor

This PR has been shipped in release v6.57.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade terraform-provider-aws to v5.73.0
4 participants