Simplify PF attr obj shim

[VenelinMartinov]

We seem to represent list-nested objects in the shim layer differently depending on if it is an attr or block.
The attribute one seems overly complicated: list: {element: schema: element: resource} vs list: element: resource for blocks.

This is an attempt at simplifying it - not fully tested yet.

[VenelinMartinov]

The failing tests even expects this:

pulumi-terraform-bridge/pf/internal/schemashim/custom_type_test.go

Line 113 in 81c9d61

assert.Truef(t, isPseudoResource, "expected shim.Elem() to be of type shim.Resource, encoding an object type")

It says it asserts on type .Resource but actually asserts on .Schema

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 56.44%. Comparing base (19697fa) to head (8322504).

❗ There is a different number of reports uploaded between BASE (19697fa) and HEAD (8322504). Click for more details.

HEAD has 43 uploads less than BASE

Flag	BASE (19697fa)	HEAD (8322504)
	64	21

Additional details and impacted files

@@                          Coverage Diff                           @@
##           vvm/tfgen_name_override_bug_repro    #2232       +/-   ##
======================================================================
- Coverage                              67.48%   56.44%   -11.05%     
======================================================================
  Files                                    325      305       -20     
  Lines                                  41633    40393     -1240     
======================================================================
- Hits                                   28096    22798     -5298     
- Misses                                 11957    15927     +3970     
- Partials                                1580     1668       +88     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[iwahbe]

It looks like this change is correct. I'm extremely surprised there are not runtime implications to this.

[VenelinMartinov]

I believe we must have been already handling both as both are present. I'll sit on this for a bit

[t0yv0]

Assert on next line interestingly said it expects Resource, but the cast is casting to shim.Schema.

[t0yv0]

This may be a better encoding, but this is pretty error-prone, I wonder if we could complement this with some tests taking this for a spin end to end. Specifically, for tfgen layer and runtime handling:

• is the Pulumi schema generated for these resources what we expect?
• can the bridged provider actually push data through and have it decoded in the PF Create method to match the shape expected by PF

[t0yv0]

Also sounds like an update on the Elem() doc comment is needed here for this case.

[VenelinMartinov]

Yeah, some end-to-end tests are certainly needed - thanks for the suggestions on what to focus on!

I'll also revisit the Elem docs.

[t0yv0]

I expect there is a big encoding bug here somewhere.

Map-nested attributes Map<string,{"x":string}> and single-nested blocks {"x":string} don't have enough in shim.Schema to distinguish them:

https://developer.hashicorp.com/terraform/plugin/framework/handling-data/attributes/map-nested

But they might clobber each other in the shim.Schema representation with Type=TypeMap, Elem()=Resource.

Also in SDKv2 TypeMap, Elem()=Resource means a degenerate case of Map<string,string>. Ideally we cover all these cases and get this right.

[VenelinMartinov]

Also in SDKv2 TypeMap, Elem()=Resource

This is invalid in SDKv2 - only lists and sets can have an Elem Resource

[t0yv0]

IT is admitted though, and valid, per doc in Elem() and https://github.com/hashicorp/terraform-plugin-sdk/blob/main/helper/schema/core_schema_test.go#L220

[VenelinMartinov]

Yup that's true: https://github.com/hashicorp/terraform-plugin-sdk/blob/7e463e46c45e26d5406fe7ff3f497a47122253ea/helper/schema/core_schema.go#L84

[VenelinMartinov]

Wondering if any providers actually use this - I doubt it works well

[t0yv0]

We have to make it an error though, or else to make the schema Map<string,string>, since it's a possibility.

[VenelinMartinov]

Yeah, absolutely, great point about Map nested Resource elems in SDKv2

[t0yv0]

AS time permits, could we rebase on #2456 and have another peek at the interesting bits with the generated Pulumi Schema side-by-side? Could be a good learning experience. Thanks!

[VenelinMartinov]

This change is part of the following stack:

• move providerbuilder to pkg/pf/internal #2804
  • Add pb.Provider.ToProviderInfo test helper method #2805
    • repro for 2803 #2806
      • Simplify PF attr obj shim #2232 ◀

_{Change managed by git-spice.}