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

Upgrade upstream to v5.17.0 #2817

Merged
merged 1 commit into from
Sep 18, 2023
Merged

Conversation

t0yv0
Copy link
Member

@t0yv0 t0yv0 commented Sep 18, 2023

Fixes #2812
Fixes #2806

We could not use upgrade-provider for this operation because there was a conflict between upstream changes editing a go.sum and one of our patches doing the same, so the patch did not apply cleanly. Resolved manually by rebating upstream and rebuilding the patch set.

The new upstream version targeted here is 5.17.0.

On top of the upstream upgrade, this PR updates dependencies from pulumi-terraform-bridge to propagate bugfixes:

  • github.com/pulumi/pulumi-terraform-bridge/pf v0.16.1
  • github.com/pulumi/pulumi-terraform-bridge/v3 v3.60.0

@t0yv0 t0yv0 requested review from iwahbe, lukehoban and a team September 18, 2023 16:38
@t0yv0 t0yv0 changed the title Upgrade upstream and bridge dependencies Upgrade upstream to v5.17.0 Sep 18, 2023
@github-actions
Copy link

Does the PR have any schema changes?

Does the PR have any schema changes?

Looking good! No breaking changes found.
No new resources/functions.

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

@t0yv0 t0yv0 merged commit 8a12083 into master Sep 18, 2023
19 checks passed
@t0yv0 t0yv0 deleted the upgrade-terraform-provider-aws-to-v5.17.0 branch September 18, 2023 20:50
t0yv0 added a commit that referenced this pull request Sep 27, 2023
Unfortunately
8a12083
did not really happen as the commit didn't include ./upstream and
patches changes due to human error.

I've reopened 5.17.0 upgrade ticket. The provider actually remains on
5.16.2 right now.

For the same reasons of go.sum conflict as in
#2817 upgrade-provider
continues unable to process these upgrades. I've started the process
manually here again for v5.16.2..v5.18.0.

Unfortunately we have a new problem here, upstream no longer compiles:

```
go build -v all                                                 
github.com/hashicorp/terraform-provider-aws/internal/service/s3legacy
# github.com/hashicorp/terraform-provider-aws/internal/service/s3legacy
internal/service/s3legacy/bucket_legacy.go:1425:35: meta.(*conns.AWSClient).S3ConnURICleaningDisabled undefined (type *conns.AWSClient has no field or method S3ConnURICleaningDisabled)
```

We will need another patch here to carefully test deletion on the S3
bucket legacy.

When complete it would be fixing:

- #2812
- #2822
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants