Upstream Patches

This handles the workflow for managing patch files on top of a Terraform provider submodule using a shell script wrapper. You'd reach for it when upgrading a provider breaks existing patches, when you need to amend a patch that's causing a regression, or when rebasing your patch stack onto a new upstream commit. The skill enforces a specific flow: find the owning commit first, use non-interactive rebase over interactive where possible, and always amend existing patches rather than creating new ones unless explicitly asked. It's built around the assumption that agents shouldn't hand-edit patch files or make direct commits to the submodule. The verification checklist and conflict resolution steps are detailed enough to be genuinely useful.

skills.sh installs: 643
GitHub stars: 79
last updated: Aug 21, 2026

View on GitHub

Install

$ npx -y skills add pulumi/agent-skills --skill upstream-patches --agent claude-code

Installs into .claude/skills of the current project.

Files

Upstream Patches

upstream/ is a git submodule pointing to the upstream Terraform provider. patches/ contains patch files applied on top of it. Use ./scripts/upstream.sh to manage patch state.

Default Behavior

If fixing a regression introduced by an existing patch, amend the owning patch commit.
Do not create a new patch unless the user explicitly asks.

Commands Reference

Command	Description
`./scripts/upstream.sh init`	Initialize upstream and apply patches to working directory
`./scripts/upstream.sh init -f`	Destructively discard checkout/rebase state and re-initialize upstream
`./scripts/upstream.sh checkout`	Create branch with patches as commits for editing
`./scripts/upstream.sh rebase -i`	Interactively edit patch commits
`./scripts/upstream.sh rebase -o <commit>`	Rebase patches onto a new upstream commit
`./scripts/upstream.sh check_in`	Write commits back to patches and exit checkout mode