Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Fix reading policy after creation for read replicas (#1983)

Browse source
This commit is contained in:
Martin Angers 2021-09-09 16:23:35 -04:00 committed by GitHub
parent d807c0b227
commit d267fb5168
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server/datastore/mysql/policies.go
View file

@ -21,21 +21,23 @@ func (ds *Datastore) NewGlobalPolicy(queryID uint) (*fleet.Policy, error) {
return nil, errors.Wrap(err, "getting last id after inserting policy")
}
return ds.Policy(uint(lastIdInt64))
return policyDB(ds.writer, uint(lastIdInt64))
}
func (ds *Datastore) Policy(id uint) (*fleet.Policy, error) {
return policyDB(ds.reader, id)
}
func policyDB(q sqlx.Queryer, id uint) (*fleet.Policy, error) {
var policy fleet.Policy
err := ds.reader.Get(
&policy,
err := sqlx.Get(q, &policy,
`SELECT
p.*,
q.name as query_name,
(select count(*) from policy_membership where policy_id=p.id and passes=true) as passing_host_count,
(select count(*) from policy_membership where policy_id=p.id and passes=false) as failing_host_count
FROM policies p JOIN queries q ON (p.query_id=q.id) WHERE p.id=?`,
id,
)
id)
if err != nil {
return nil, errors.Wrap(err, "getting policy")
}

4
server/sso/validate_test.go
View file

File diff suppressed because one or more lines are too long