From 7f47096bc417878c53c97ca6622352f2b9153ee2 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Thu, 28 Aug 2025 10:50:41 +0200 Subject: [PATCH] move action schemas out of experimental flag --- internal/command/jsonformat/plan_test.go | 2 +- internal/command/jsonprovider/provider.go | 3 +-- internal/command/jsonprovider/provider_test.go | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/command/jsonformat/plan_test.go b/internal/command/jsonformat/plan_test.go index a0f59eaea12c..e47b63c89f12 100644 --- a/internal/command/jsonformat/plan_test.go +++ b/internal/command/jsonformat/plan_test.go @@ -8544,7 +8544,7 @@ func TestResourceChange_actions(t *testing.T) { }, }, } - jsonschemas := jsonprovider.MarshalForRenderer(fullSchema, true) + jsonschemas := jsonprovider.MarshalForRenderer(fullSchema, false) diffs := precomputeDiffs(Plan{ ResourceChanges: []jsonplan.ResourceChange{defaultResourceChange}, ActionInvocations: tc.actionInvocations, diff --git a/internal/command/jsonprovider/provider.go b/internal/command/jsonprovider/provider.go index dbf31c757b33..0ebb76f82b91 100644 --- a/internal/command/jsonprovider/provider.go +++ b/internal/command/jsonprovider/provider.go @@ -68,6 +68,7 @@ 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 { @@ -83,8 +84,6 @@ func marshalProvider(tps providers.ProviderSchema, includeExperimentalSchemas bo } } p.ListResourceSchemas = marshalSchemas(listSchemas) - - p.ActionSchemas = marshalActionSchemas(tps.Actions) } return p diff --git a/internal/command/jsonprovider/provider_test.go b/internal/command/jsonprovider/provider_test.go index c1de1ebb6570..879c479b7f24 100644 --- a/internal/command/jsonprovider/provider_test.go +++ b/internal/command/jsonprovider/provider_test.go @@ -33,6 +33,7 @@ func TestMarshalProvider(t *testing.T) { DataSourceSchemas: map[string]*Schema{}, EphemeralResourceSchemas: map[string]*Schema{}, ResourceIdentitySchemas: map[string]*IdentitySchema{}, + ActionSchemas: map[string]*ActionSchema{}, }, }, { @@ -212,6 +213,7 @@ func TestMarshalProvider(t *testing.T) { }, }, ResourceIdentitySchemas: map[string]*IdentitySchema{}, + ActionSchemas: map[string]*ActionSchema{}, }, }, {