upstream/terraform
1
0
Fork 0
mirror of https://github.com/hashicorp/terraform.git synced 2026-05-28 04:03:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Exclude nested config block from list resource schemas (#37495)

Browse source 
* Exclude nested config block from list resource schemas

* Guard action schemas by experimental flag

* Fix tests
This commit is contained in:
Daniel Banck 2025-08-26 19:17:27 +02:00 committed by GitHub
parent f14baf178d
commit 2463f864dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 45 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/command/jsonformat/plan_test.go
View file

@ -8544,7 +8544,7 @@ func TestResourceChange_actions(t *testing.T) {
},
},
}
jsonschemas := jsonprovider.MarshalForRenderer(fullSchema, false)
jsonschemas := jsonprovider.MarshalForRenderer(fullSchema, true)
diffs := precomputeDiffs(Plan{
ResourceChanges: []jsonplan.ResourceChange{defaultResourceChange},
ActionInvocations: tc.actionInvocations,

16
internal/command/jsonprovider/provider.go
View file

@ -68,11 +68,23 @@ func marshalProvider(tps providers.ProviderSchema, includeExperimentalSchemas bo
EphemeralResourceSchemas: marshalSchemas(tps.EphemeralResourceTypes),
Functions: jsonfunction.MarshalProviderFunctions(tps.Functions),
ResourceIdentitySchemas: marshalIdentitySchemas(tps.ResourceTypes),
ActionSchemas: marshalActionSchemas(tps.Actions),
}
if includeExperimentalSchemas {
p.ListResourceSchemas = marshalSchemas(tps.ListResourceTypes)
// List resource schemas are nested under a "config" block, so we need to
// extract that block to get the actual provider schema for the list resource.
// When getting the provider schemas, Terraform adds this extra level to
// better match the actual configuration structure.
listSchemas := make(map[string]providers.Schema, len(tps.ListResourceTypes))
for k, v := range tps.ListResourceTypes {
listSchemas[k] = providers.Schema{
Body: &v.Body.BlockTypes["config"].Block,
Version: v.Version,
}
}
p.ListResourceSchemas = marshalSchemas(listSchemas)
p.ActionSchemas = marshalActionSchemas(tps.Actions)
}
return p

36
internal/command/jsonprovider/provider_test.go
View file

@ -33,7 +33,6 @@ func TestMarshalProvider(t *testing.T) {
DataSourceSchemas: map[string]*Schema{},
EphemeralResourceSchemas: map[string]*Schema{},
ResourceIdentitySchemas: map[string]*IdentitySchema{},
ActionSchemas: map[string]*ActionSchema{},
},
},
{
@ -213,7 +212,6 @@ func TestMarshalProvider(t *testing.T) {
},
},
ResourceIdentitySchemas: map[string]*IdentitySchema{},
ActionSchemas: map[string]*ActionSchema{},
},
},
{
@ -223,8 +221,21 @@ func TestMarshalProvider(t *testing.T) {
Version: 1,
Body: &configschema.Block{
Attributes: map[string]*configschema.Attribute{
"filter": {Type: cty.String, Optional: true},
"items": {Type: cty.List(cty.String), Required: true},
"data": {
Type: cty.DynamicPseudoType,
Computed: true,
},
},
BlockTypes: map[string]*configschema.NestedBlock{
"config": {
Block: configschema.Block{
Attributes: map[string]*configschema.Attribute{
"filter": {Type: cty.String, Optional: true},
"items": {Type: cty.List(cty.String), Required: true},
},
},
Nesting: configschema.NestingSingle,
},
},
},
},
@ -483,8 +494,21 @@ func testProvider() providers.ProviderSchema {
Version: 1,
Body: &configschema.Block{
Attributes: map[string]*configschema.Attribute{
"filter": {Type: cty.String, Optional: true},
"items": {Type: cty.List(cty.String), Required: true},
"data": {
Type: cty.DynamicPseudoType,
Computed: true,
},
},
BlockTypes: map[string]*configschema.NestedBlock{
"config": {
Block: configschema.Block{
Attributes: map[string]*configschema.Attribute{
"filter": {Type: cty.String, Optional: true},
"items": {Type: cty.List(cty.String), Required: true},
},
},
Nesting: configschema.NestingSingle,
},
},
},
},