Skip to content

Generate Resource Config: set state in proto req #37895

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+85 −2
Open

Generate Resource Config: set state in proto req #37895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab421a9
marshal state and set in the proto req for generate resource config
stephybun Nov 13, 2025
22bc18c
changelog
stephybun Nov 13, 2025
5d99e2e
set state in the proto req for generate resource config in plugin6
stephybun Nov 13, 2025
bb0aaee
add GRPC tests for GenerateResourceConfig
stephybun Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/v1.15/BUG FIXES-20251113-152843.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
kind: BUG FIXES
body: Set state information in the proto request for the `GenerateResourceConfig` RPC
time: 2025-11-13T15:28:43.489677+01:00
custom:
Issue: "37895"
Copy link
Member

@jbardin jbardin Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since this is backported to 1.14, we don't need the changelog entry for 1.15

8 changes: 7 additions & 1 deletion internal/plugin/grpc_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,9 +940,15 @@ func (p *GRPCProvider) GenerateResourceConfig(r providers.GenerateResourceConfig
return resp
}

mp, err := msgpack.Marshal(r.State, resSchema.Body.ImpliedType())
if err != nil {
resp.Diagnostics = resp.Diagnostics.Append(err)
return resp
}

protoReq := &proto.GenerateResourceConfig_Request{
TypeName: r.TypeName,
State: nil,
State: &proto.DynamicValue{Msgpack: mp},
}

protoResp, err := p.client.GenerateResourceConfig(p.ctx, protoReq)
Expand Down
33 changes: 33 additions & 0 deletions internal/plugin/grpc_provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,3 +2102,36 @@ func TestGRPCProvider_ListResource_Limit(t *testing.T) {
t.Fatalf("Expected 2 events, got %d", len(results))
}
}

func TestGRPCProvider_GenerateResourceConfig(t *testing.T) {
client := mockProviderClient(t)
p := &GRPCProvider{
client: client,
}
client.EXPECT().GenerateResourceConfig(
gomock.Any(),
gomock.Cond[any](func(x any) bool {
req := x.(*proto.GenerateResourceConfig_Request)
if req.TypeName != "resource" {
return false
}
if req.State == nil {
t.Log("GenerateResourceConfig state is nil")
return false
}
return true
}),
).Return(&proto.GenerateResourceConfig_Response{
Config: &proto.DynamicValue{
Msgpack: []byte("\x81\xa4attr\xa3bar"),
},
}, nil)
resp := p.GenerateResourceConfig(providers.GenerateResourceConfigRequest{
TypeName: "resource",
State: cty.ObjectVal(map[string]cty.Value{
"computed": cty.StringVal("computed"),
"attr": cty.StringVal("foo"),
}),
})
checkDiags(t, resp.Diagnostics)
}
8 changes: 7 additions & 1 deletion internal/plugin6/grpc_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,9 +945,15 @@ func (p *GRPCProvider) GenerateResourceConfig(r providers.GenerateResourceConfig
return resp
}

mp, err := msgpack.Marshal(r.State, resSchema.Body.ImpliedType())
if err != nil {
resp.Diagnostics = resp.Diagnostics.Append(err)
return resp
}

protoReq := &proto6.GenerateResourceConfig_Request{
TypeName: r.TypeName,
State: nil,
State: &proto6.DynamicValue{Msgpack: mp},
}

protoResp, err := p.client.GenerateResourceConfig(p.ctx, protoReq)
Expand Down
33 changes: 33 additions & 0 deletions internal/plugin6/grpc_provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3366,3 +3366,36 @@ func TestGRPCProvider_WriteStateBytes(t *testing.T) {
}
})
}

func TestGRPCProvider_GenerateResourceConfig(t *testing.T) {
client := mockProviderClient(t)
p := &GRPCProvider{
client: client,
}
client.EXPECT().GenerateResourceConfig(
gomock.Any(),
gomock.Cond[any](func(x any) bool {
req := x.(*proto.GenerateResourceConfig_Request)
if req.TypeName != "resource" {
return false
}
if req.State == nil {
t.Log("GenerateResourceConfig state is nil")
return false
}
return true
}),
).Return(&proto.GenerateResourceConfig_Response{
Config: &proto.DynamicValue{
Msgpack: []byte("\x81\xa4attr\xa3bar"),
},
}, nil)
resp := p.GenerateResourceConfig(providers.GenerateResourceConfigRequest{
TypeName: "resource",
State: cty.ObjectVal(map[string]cty.Value{
"computed": cty.StringVal("computed"),
"attr": cty.StringVal("foo"),
}),
})
checkDiags(t, resp.Diagnostics)
}