mirror of
https://github.com/fleetdm/fleet
synced 2026-05-24 09:28:54 +00:00
61f635dd44
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #38534 moved `/api/_version_/fleet/hosts/{id:[0-9]+}/activities` endpoint and `MarkActivitiesAsStreamed` to activity bounded context # Checklist for submitter - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. ## Testing - [x] Added/updated automated tests - [x] Where appropriate, [automated tests simulate multiple hosts and test for host isolation](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/reference/patterns-backend.md#unit-testing) (updates to one hosts's records do not affect another) - [x] QA'd all new/changed functionality manually <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Added new endpoint to retrieve host-specific past activities with pagination metadata. * **Refactor** * Refactored activity service architecture and authorization layer to improve data provider integration and activity streaming capabilities. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
62 lines
2.2 KiB
Go
62 lines
2.2 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/fleetdm/fleet/v4/server/activity/api"
|
|
api_http "github.com/fleetdm/fleet/v4/server/activity/api/http"
|
|
eu "github.com/fleetdm/fleet/v4/server/platform/endpointer"
|
|
platform_http "github.com/fleetdm/fleet/v4/server/platform/http"
|
|
"github.com/go-kit/kit/endpoint"
|
|
kithttp "github.com/go-kit/kit/transport/http"
|
|
"github.com/gorilla/mux"
|
|
)
|
|
|
|
// GetRoutes returns a function that registers activity routes on the router.
|
|
func GetRoutes(svc api.Service, authMiddleware endpoint.Middleware) eu.HandlerRoutesFunc {
|
|
return func(r *mux.Router, opts []kithttp.ServerOption) {
|
|
attachFleetAPIRoutes(r, svc, authMiddleware, opts)
|
|
}
|
|
}
|
|
|
|
func attachFleetAPIRoutes(r *mux.Router, svc api.Service, authMiddleware endpoint.Middleware, opts []kithttp.ServerOption) {
|
|
// User-authenticated endpoints
|
|
ue := newUserAuthenticatedEndpointer(svc, authMiddleware, opts, r, apiVersions()...)
|
|
|
|
ue.GET("/api/_version_/fleet/activities", listActivitiesEndpoint, api_http.ListActivitiesRequest{})
|
|
ue.GET("/api/_version_/fleet/hosts/{id:[0-9]+}/activities", listHostPastActivitiesEndpoint, api_http.ListHostPastActivitiesRequest{})
|
|
}
|
|
|
|
func apiVersions() []string {
|
|
return []string{"v1", "latest"}
|
|
}
|
|
|
|
// listActivitiesEndpoint handles GET /api/_version_/fleet/activities
|
|
func listActivitiesEndpoint(ctx context.Context, request any, svc api.Service) platform_http.Errorer {
|
|
req := request.(*api_http.ListActivitiesRequest)
|
|
|
|
activities, meta, err := svc.ListActivities(ctx, req.ListOptions)
|
|
if err != nil {
|
|
return api_http.ListActivitiesResponse{Err: err}
|
|
}
|
|
|
|
return api_http.ListActivitiesResponse{
|
|
Meta: meta,
|
|
Activities: activities,
|
|
}
|
|
}
|
|
|
|
// listHostPastActivitiesEndpoint handles GET /api/_version_/fleet/hosts/{id}/activities
|
|
func listHostPastActivitiesEndpoint(ctx context.Context, request any, svc api.Service) platform_http.Errorer {
|
|
req := request.(*api_http.ListHostPastActivitiesRequest)
|
|
|
|
activities, meta, err := svc.ListHostPastActivities(ctx, req.HostID, req.ListOptions)
|
|
if err != nil {
|
|
return api_http.ListHostPastActivitiesResponse{Err: err}
|
|
}
|
|
|
|
return api_http.ListHostPastActivitiesResponse{
|
|
Meta: meta,
|
|
Activities: activities,
|
|
}
|
|
}
|