Skip to content

Unblock SDK gen with required properties edits #3600

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.

Sign up for GitHub

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

Merged
thomas11 merged 3 commits into from
Sep 30, 2024
Merged

Unblock SDK gen with required properties edits #3600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43fd898
Add two more required property edits for conflicting types
thomas11 Sep 30, 2024
fbf5aab
Update spec and regenerate
thomas11 Sep 30, 2024
43afaef
Add section to playbook for this kind of conflict
thomas11 Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
257 changes: 182 additions & 75 deletions azure-provider-versions/provider_list.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion azure-rest-api-specs
Open in desktop
Submodule azure-rest-api-specs updated 1402 files
7 changes: 7 additions & 0 deletions playbooks/Resolving-api-merge-conflicts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ approaches to resolve them depending on the source of the conflict:
## Example PR

[Fix nightly upgrade due to incompatible refs · pulumi-azure-native/2961](https://github.com/pulumi/pulumi-azure-native/pull/2961) is an example PR for one of these fixes


## Particular case "incompatible type T for resource R: required properties do not match: only required in A/B: p1, ..."

This happens when the API spec defines a type in different places, with and without some required properties.

The standard workaround is to add an exception to `genTypeSpec` in `types.go`. There are some already to copy.
Loading