fix: skip auto-named defaults that trigger upstream ConflictsWith - #3457
Merged
Conversation
The dynamic bridge runs `SetAutonaming` against every resource exposed by a wrapped provider, which attaches an `AutoName` default to any property literally called `name`. During Check, `defaults.ApplyDefaultInfoValues` fires that default whenever the user omits `name`, populating it with a generated `<urn-name>-<random>` value before the inputs are forwarded to the upstream provider's `ValidateResourceConfig`. For providers like `aws_cloudwatch_log_group` that expose `name` and `name_prefix` as `Optional + Computed + ConflictsWith: each other`, the injected `name` collides with the user-supplied `name_prefix` and the SDKv2 server returns two "Conflicting configuration arguments" diagnostics. The protocol-level schema does not surface `ConflictsWith`, so the bridge cannot know about the conflict ahead of time. Detect this case after the first `ValidateResourceConfig` call: if a ConflictsWith diagnostic points at an attribute the bridge auto-named, strip the auto-default from the inputs and re-validate once. The cleaned inputs are also returned from Check so the property does not leak into state — the upstream SDK will compute the final `name` from `name_prefix` during plan/apply, matching tofu's behaviour.
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3457 +/- ##
==========================================
+ Coverage 69.82% 69.85% +0.03%
==========================================
Files 347 348 +1
Lines 38011 38083 +72
==========================================
+ Hits 26541 26603 +62
+ Misses 9661 9660 -1
- Partials 1809 1820 +11 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Add TestConflictsWithBothUserSpecified to verify that the auto-defaulted-conflict-stripper does not swallow the upstream ConflictsWith diagnostics when the user explicitly sets both `name` and `name_prefix`. The bridge must still report both SDKv2 "Conflicting configuration arguments" failures so the user can correct their program.
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
No actionable issues found.
Warning
Firewall blocked 1 domain
The following domain was blocked by the firewall during workflow execution:
proxy.golang.org
To allow these domains, add them to the
network.allowedlist in your workflow frontmatter:
network:
allowed:
- defaults
- "proxy.golang.org"See Network Configuration for more information.
Reviewed by Internal Trusted PR Reviewer
To install this agentic workflow, run
gh aw add pulumi-labs/gh-aw-internal/.github/workflows/gh-aw-pr-review.md@8a92f53fac170563f7727cacab2dbedb5d5b9e29
pgavlin
approved these changes
May 26, 2026
| continue | ||
| } | ||
| pk := resource.PropertyKey(tfbridge.TerraformToPulumiNameV2(tfKey, schemaMap, schemaInfos)) | ||
| if _, inUser := inputs[pk]; inUser { |
Contributor
There was a problem hiding this comment.
This doesn't matter for dynamically bridged providers, as they don't have preCheck callbacks, but on regular bridged providers shouldn't we use the checked inputs?
Merged
iwahbe
added a commit
that referenced
this pull request
May 27, 2026
Fixes the bug introduced in #3457 as pointed out by @guineveresaenger: we no longer drop insertions added by `PreCheckCallback`.
Contributor
|
This PR has been shipped in release v3.131.0. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The dynamic bridge runs
SetAutonamingagainst every wrapped provider, which attaches anAutoNamedefault to any property literally calledname. DuringCheck,defaults.ApplyDefaultInfoValuesfires that default whenever the user omitsname, populating it with a generated value before forwarding to the upstream provider'sValidateResourceConfig.For providers like
aws_cloudwatch_log_groupwhosenameandname_prefixareOptional + Computed + ConflictsWith: each other, the injectednamecollides with the user-suppliedname_prefixand SDKv2 returns two "Conflicting configuration arguments" diagnostics. The protocol-level schema doesn't surfaceConflictsWith, so the bridge can't anticipate the conflict.This change detects the case after the first
ValidateResourceConfigcall: if aConflictsWithdiagnostic targets an attribute the bridge auto-named, strip the auto-default from the inputs and re-validate once. The cleaned inputs are also returned fromCheckso the property doesn't leak into state — the upstream SDK will compute the finalnamefromname_prefixduring plan/apply, matching tofu's behavior.Fixes #1095
Test plan
TestConflictsWithNamePrefixOnlyindynamic/conflicting_test.goreproduces the failure and now passes (check + create subtests).pkg/pf/tfbridgeunit tests still pass.