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 to v4.50.0 with submodule patching #2247

Merged
merged 21 commits into from
Jan 23, 2023
Merged

Conversation

danielrbradley
Copy link
Member

@danielrbradley danielrbradley commented Dec 5, 2022

Adjust process to apply replacements in the local submodule checkout. This should make the process a little slicker so we're not committing tooling into the fork.

  • Add script to auto-reset changes between each apply.
  • Add submodule option to ignore dirty worktree - avoid the CI failing.
  • Integrate into makefile
  • Add submodule checkout during the build
  • Add auto-upgrade workflow to attempt rebase & open PR

@danielrbradley danielrbradley marked this pull request as draft January 19, 2023 11:43
- Ignore dirty submodule from git diff to avoid local changes flagging in CI
- Make it a little less noisy
- Allow a default path to be set up for all providers.
- Add init_upstream and update_upstream makefile target.
- Update tf-patcher tool.
- Copy replacements and domains out of the fork.
- Add warning to `update_upstream` target as it's not finished yet.
- Run check as part of `patch_upstream` target.
@danielrbradley danielrbradley marked this pull request as ready for review January 20, 2023 11:00
@danielrbradley danielrbradley changed the title Submodule patching Upgrade to v4.50.0 with submodule patching Jan 20, 2023
Copy link
Contributor

@thomas11 thomas11 left a comment

Choose a reason for hiding this comment

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

The approach LGTM!

Makefile Outdated Show resolved Hide resolved
Makefile Show resolved Hide resolved
Include output so we can see what's happening more clearly.
@github-actions
Copy link

Does the PR have any schema changes?

Found 1 breaking change:
Function "aws:acmpca/getCertificateAuthority:getCertificateAuthority" missing input "revocationConfigurations"

New resources:

  • sesv2/configurationSetEventDestination.ConfigurationSetEventDestination

New functions:

  • lb/getLbs.getLbs

@pulumi pulumi deleted a comment from github-actions bot Jan 20, 2023
@danielrbradley danielrbradley merged commit 5e7adbf into master Jan 23, 2023
@danielrbradley danielrbradley deleted the submodule-patching branch January 23, 2023 08:32
thomas11 added a commit to pulumi/action-test-provider-downstream that referenced this pull request Jan 30, 2023
abhinav added a commit to pulumi/action-test-provider-downstream that referenced this pull request Feb 8, 2023
Clones the downstream repository with `--recurse-submodules`
which will check out all submodules in the repository
after cloning.

This is necessary because pulumi-aws now uses submodules
(pulumi/pulumi-aws#2247).

Resolves pulumi/pulumi#12115
Resolves #15
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.

4 participants