empayre/fleet
14
0
Fork 0
mirror of https://github.com/empayre/fleet.git synced 2024-11-06 17:05:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

A simpler attempt at using the payload pattern for scheduled queries (#1210)

Browse Source
This commit is contained in:
Mike Arpaia 2017-02-13 14:31:22 -07:00 committed by GitHub
parent 6dc56ad5f0
commit a3589892c3
6 changed files with 63 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/kolide/scheduled_queries.go
View File

@ -17,7 +17,7 @@ type ScheduledQueryService interface {
GetScheduledQueriesInPack(ctx context.Context, id uint, opts ListOptions) (queries []*ScheduledQuery, err error)
ScheduleQuery(ctx context.Context, sq *ScheduledQuery) (query *ScheduledQuery, err error)
DeleteScheduledQuery(ctx context.Context, id uint) (err error)
ModifyScheduledQuery(ctx context.Context, sq *ScheduledQuery) (query *ScheduledQuery, err error)
ModifyScheduledQuery(ctx context.Context, id uint, p ScheduledQueryPayload) (query *ScheduledQuery, err error)
}
type ScheduledQuery struct {
@ -35,3 +35,14 @@ type ScheduledQuery struct {
Version *string `json:"version"`
Shard *uint `json:"shard"`
}
type ScheduledQueryPayload struct {
PackID *uint `json:"pack_id"`
QueryID *uint `json:"query_id"`
Interval *uint `json:"interval"`
Snapshot *bool `json:"snapshot"`
Removed *bool `json:"removed"`
Platform *string `json:"platform"`
Version *string `json:"version"`
Shard *uint `json:"shard"`
}

7
server/service/endpoint_scheduled_queries.go
View File

@ -127,7 +127,7 @@ func makeScheduleQueryEndpoint(svc kolide.Service) endpoint.Endpoint {
type modifyScheduledQueryRequest struct {
ID uint
payload *kolide.ScheduledQuery
payload kolide.ScheduledQueryPayload
}
type modifyScheduledQueryResponse struct {
@ -141,10 +141,7 @@ func makeModifyScheduledQueryEndpoint(svc kolide.Service) endpoint.Endpoint {
return func(ctx context.Context, request interface{}) (interface{}, error) {
req := request.(modifyScheduledQueryRequest)
sq := req.payload
sq.ID = req.ID
sq, err := svc.ModifyScheduledQuery(ctx, sq)
sq, err := svc.ModifyScheduledQuery(ctx, req.ID, req.payload)
if err != nil {
return modifyScheduledQueryResponse{Err: err}, nil
}

4
server/service/logging_scheduled_queries.go
View File

@ -78,7 +78,7 @@ func (mw loggingMiddleware) DeleteScheduledQuery(ctx context.Context, id uint) e
return err
}
func (mw loggingMiddleware) ModifyScheduledQuery(ctx context.Context, sq *kolide.ScheduledQuery) (*kolide.ScheduledQuery, error) {
func (mw loggingMiddleware) ModifyScheduledQuery(ctx context.Context, id uint, p kolide.ScheduledQueryPayload) (*kolide.ScheduledQuery, error) {
var (
query *kolide.ScheduledQuery
err error
@ -92,6 +92,6 @@ func (mw loggingMiddleware) ModifyScheduledQuery(ctx context.Context, sq *kolide
)
}(time.Now())
query, err = mw.Service.ModifyScheduledQuery(ctx, sq)
query, err = mw.Service.ModifyScheduledQuery(ctx, id, p)
return query, err
}

40
server/service/service_scheduled_queries.go
View File

@ -2,6 +2,7 @@ package service
import (
"github.com/kolide/kolide/server/kolide"
"github.com/pkg/errors"
"golang.org/x/net/context"
)
@ -17,7 +18,44 @@ func (svc service) ScheduleQuery(ctx context.Context, sq *kolide.ScheduledQuery)
return svc.ds.NewScheduledQuery(sq)
}
func (svc service) ModifyScheduledQuery(ctx context.Context, sq *kolide.ScheduledQuery) (*kolide.ScheduledQuery, error) {
func (svc service) ModifyScheduledQuery(ctx context.Context, id uint, p kolide.ScheduledQueryPayload) (*kolide.ScheduledQuery, error) {
sq, err := svc.GetScheduledQuery(ctx, id)
if err != nil {
return nil, errors.Wrap(err, "getting scheduled query to modify")
}
if p.PackID != nil {
sq.PackID = *p.PackID
}
if p.QueryID != nil {
sq.QueryID = *p.QueryID
}
if p.Interval != nil {
sq.Interval = *p.Interval
}
if p.Snapshot != nil {
sq.Snapshot = p.Snapshot
}
if p.Removed != nil {
sq.Removed = p.Removed
}
if p.Platform != nil {
sq.Platform = p.Platform
}
if p.Version != nil {
sq.Version = p.Version
}
if p.Shard != nil {
sq.Shard = p.Shard
}
return svc.ds.SaveScheduledQuery(sq)
}

7
server/service/service_scheduled_queries_test.go
View File

@ -71,8 +71,11 @@ func TestModifyScheduledQuery(t *testing.T) {
require.Nil(t, err)
assert.Equal(t, uint(60), query.Interval)
query.Interval = uint(120)
query, err = svc.ModifyScheduledQuery(ctx, query)
interval := uint(120)
queryPayload := kolide.ScheduledQueryPayload{
Interval: &interval,
}
query, err = svc.ModifyScheduledQuery(ctx, sq1.ID, queryPayload)
assert.Equal(t, uint(120), query.Interval)
queryVerify, err := svc.GetScheduledQuery(ctx, sq1.ID)

6
server/service/transport_scheduled_queries_test.go
View File

@ -48,10 +48,10 @@ func TestDecodeModifyScheduledQueryRequest(t *testing.T) {
params := r.(modifyScheduledQueryRequest)
assert.Equal(t, uint(1), params.ID)
assert.Equal(t, uint(5), params.payload.PackID)
assert.Equal(t, uint(6), params.payload.QueryID)
assert.Equal(t, uint(5), *params.payload.PackID)
assert.Equal(t, uint(6), *params.payload.QueryID)
assert.Equal(t, true, *params.payload.Removed)
assert.Equal(t, uint(60), params.payload.Interval)
assert.Equal(t, uint(60), *params.payload.Interval)
assert.Equal(t, uint(1), *params.payload.Shard)
}).Methods("PATCH")