Skip to content

Commit 11a6ff0

Browse files
authored
[v17] Backport AutoUpdateBotInstanceReport (#60205)
* MWI: Generate `AutoUpdateBotInstanceReport` resource (#59738) * MWI: Add `tctl` get and delete mappings for `AutoUpdateBotInstanceReport` (#60017) * MWI: Add `teleport_bot_instances` metric (#59774) * MWI: Log on `AutoUpdateBotInstanceReport` generation failure (#60191) * Fix passing lock by value * Allow `machineid.AutoUpdateVersionReporter` to shut down correctly (#60219)
1 parent 9a83fd8 commit 11a6ff0

File tree

38 files changed

+1886
-216
lines changed

38 files changed

+1886
-216
lines changed

api/client/client.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3295,6 +3295,23 @@ func (c *Client) UpsertAutoUpdateAgentReport(ctx context.Context, report *autoup
32953295
return resp, nil
32963296
}
32973297

3298+
// GetAutoUpdateBotInstanceReport gets the singleton auto-update bot report.
3299+
func (c *Client) GetAutoUpdateBotInstanceReport(ctx context.Context) (*autoupdatev1pb.AutoUpdateBotInstanceReport, error) {
3300+
client := autoupdatev1pb.NewAutoUpdateServiceClient(c.conn)
3301+
resp, err := client.GetAutoUpdateBotInstanceReport(ctx, &autoupdatev1pb.GetAutoUpdateBotInstanceReportRequest{})
3302+
if err != nil {
3303+
return nil, trace.Wrap(err)
3304+
}
3305+
return resp, nil
3306+
}
3307+
3308+
// DeleteAutoUpdateBotInstanceReport deletes the singleton auto-update bot instance report.
3309+
func (c *Client) DeleteAutoUpdateBotInstanceReport(ctx context.Context) error {
3310+
client := autoupdatev1pb.NewAutoUpdateServiceClient(c.conn)
3311+
_, err := client.DeleteAutoUpdateBotInstanceReport(ctx, &autoupdatev1pb.DeleteAutoUpdateBotInstanceReportRequest{})
3312+
return trace.Wrap(err)
3313+
}
3314+
32983315
// GetClusterAccessGraphConfig retrieves the Cluster Access Graph configuration from Auth server.
32993316
func (c *Client) GetClusterAccessGraphConfig(ctx context.Context) (*clusterconfigpb.AccessGraphConfig, error) {
33003317
rsp, err := c.ClusterConfigClient().GetClusterAccessGraphConfig(ctx, &clusterconfigpb.GetClusterAccessGraphConfigRequest{})

api/client/events.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ func EventToGRPC(in types.Event) (*proto.Event, error) {
128128
out.Resource = &proto.Event_AutoUpdateAgentReport{
129129
AutoUpdateAgentReport: r,
130130
}
131+
case *autoupdate.AutoUpdateBotInstanceReport:
132+
out.Resource = &proto.Event_AutoUpdateBotInstanceReport{
133+
AutoUpdateBotInstanceReport: r,
134+
}
131135
case *identitycenterv1.Account:
132136
out.Resource = &proto.Event_IdentityCenterAccount{
133137
IdentityCenterAccount: r,
@@ -619,6 +623,9 @@ func EventFromGRPC(in *proto.Event) (*types.Event, error) {
619623
} else if r := in.GetAutoUpdateAgentReport(); r != nil {
620624
out.Resource = types.Resource153ToLegacy(r)
621625
return &out, nil
626+
} else if r := in.GetAutoUpdateBotInstanceReport(); r != nil {
627+
out.Resource = types.Resource153ToLegacy(r)
628+
return &out, nil
622629
} else if r := in.GetUserTask(); r != nil {
623630
out.Resource = types.Resource153ToLegacy(r)
624631
return &out, nil

api/client/proto/event.pb.go

Lines changed: 28 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)