Skip to content

Commit 1bf4e40

Browse files
authored
Fix demoted user cannot execute metal-db health check. (#543)
* Fix demoted user cannot execute metal-db health check. * Use ctx.
1 parent 6028f51 commit 1bf4e40

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

cmd/metal-api/internal/datastore/health.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (rs *RethinkStore) Check(ctx context.Context) (rest.HealthResult, error) {
4040
return returnStatus(err)
4141
}
4242

43-
cursor, err := r.DB("rethinkdb").Table("server_status").Field("process").Field("version").Run(rs.session)
43+
cursor, err := r.DB("rethinkdb").Table("server_status").Field("process").Field("version").Run(rs.session, r.RunOpts{Context: ctx})
4444
if err != nil {
4545
return returnStatus(err)
4646
}

cmd/metal-api/internal/datastore/rethinkdb.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,10 @@ func (rs *RethinkStore) initializeTables(opts r.TableCreateOpts) error {
140140
if err != nil {
141141
return err
142142
}
143+
_, err = r.DB("rethinkdb").Grant(DemotedUser, map[string]interface{}{"read": true}).RunWrite(rs.session)
144+
if err != nil {
145+
return err
146+
}
143147

144148
// integer pools
145149
err = rs.GetVRFPool().initIntegerPool(rs.log)

0 commit comments

Comments
 (0)