Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

Forward policy resolution (#2733)

Browse source 
* Pass through the resoution for the policy

* Update tests
This commit is contained in:
Tomas Touceda 2021-10-28 10:10:03 -03:00 committed by GitHub
parent 51e35e1ba0
commit 1aea7484d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/service/global_policies.go
View file

@ -37,7 +37,7 @@ func (svc Service) NewGlobalPolicy(ctx context.Context, queryID uint, resolution
return nil, err
}
return svc.ds.NewGlobalPolicy(ctx, queryID, "")
return svc.ds.NewGlobalPolicy(ctx, queryID, resolution)
}
/////////////////////////////////////////////////////////////////////////////////

4
server/service/integration_core_test.go
View file

@ -364,11 +364,13 @@ func (s *integrationTestSuite) TestGlobalPolicies() {
})
require.NoError(t, err)
gpParams := globalPolicyRequest{QueryID: qr.ID}
gpParams := globalPolicyRequest{QueryID: qr.ID, Resolution: "some global resolution"}
gpResp := globalPolicyResponse{}
s.DoJSON("POST", "/api/v1/fleet/global/policies", gpParams, http.StatusOK, &gpResp)
require.NotNil(t, gpResp.Policy)
assert.Equal(t, qr.ID, gpResp.Policy.QueryID)
require.NotNil(t, gpResp.Policy.Resolution)
assert.Equal(t, "some global resolution", *gpResp.Policy.Resolution)
policiesResponse := listGlobalPoliciesResponse{}
s.DoJSON("GET", "/api/v1/fleet/global/policies", nil, http.StatusOK, &policiesResponse)

4
server/service/integration_enterprise_test.go
View file

@ -186,7 +186,7 @@ func (s *integrationEnterpriseTestSuite) TestTeamPolicies() {
qr, err := s.ds.NewQuery(context.Background(), &fleet.Query{Name: "TestQuery2", Description: "Some description", Query: "select * from osquery;", ObserverCanRun: true})
require.NoError(t, err)
tpParams := teamPolicyRequest{QueryID: qr.ID}
tpParams := teamPolicyRequest{QueryID: qr.ID, Resolution: "some team resolution"}
r := teamPolicyResponse{}
s.DoJSON("POST", fmt.Sprintf("/api/v1/fleet/teams/%d/policies", team1.ID), tpParams, http.StatusOK, &r)
@ -195,6 +195,8 @@ func (s *integrationEnterpriseTestSuite) TestTeamPolicies() {
require.Len(t, ts.Policies, 1)
assert.Equal(t, "TestQuery2", ts.Policies[0].QueryName)
assert.Equal(t, qr.ID, ts.Policies[0].QueryID)
require.NotNil(t, ts.Policies[0].Resolution)
assert.Equal(t, "some team resolution", *ts.Policies[0].Resolution)
deletePolicyParams := deleteTeamPoliciesRequest{IDs: []uint{ts.Policies[0].ID}}
deletePolicyResp := deleteTeamPoliciesResponse{}

2
server/service/team_policies.go
View file

@ -26,7 +26,7 @@ func (r teamPolicyResponse) error() error { return r.Err }
func teamPolicyEndpoint(ctx context.Context, request interface{}, svc fleet.Service) (interface{}, error) {
req := request.(*teamPolicyRequest)
resp, err := svc.NewTeamPolicy(ctx, req.TeamID, req.QueryID, "")
resp, err := svc.NewTeamPolicy(ctx, req.TeamID, req.QueryID, req.Resolution)
if err != nil {
return teamPolicyResponse{Err: err}, nil
}