diff --git a/crm/start.go b/crm/start.go index 828e747b1..eb0c28fa6 100644 --- a/crm/start.go +++ b/crm/start.go @@ -29,10 +29,12 @@ func Init() error { if err != nil { return err } + // @todo: profiling as an external service? switch config.db.profiler { case "stdout": db.Profiler = &factory.Database.ProfilerStdout - // @todo: profiling as an external service? + default: + fmt.Println("No database query profiler selected") } // configure resputil options diff --git a/rbac/resources.go b/rbac/resources.go index 251d490f8..6142e9d12 100644 --- a/rbac/resources.go +++ b/rbac/resources.go @@ -22,10 +22,10 @@ type ( Get(resourceID string) (*types.Resource, error) Delete(resourceID string) error - Grant(resourceID string, rolepath string, operations []string) error + Grant(resourceID, rolepath string, operations []string) error GrantMultiple(resourceID string, roles []ResourcesRole) error - CheckAccess(resourceID string, operation string, sessionID string) error + CheckAccess(resourceID, operation, sessionID string) error } ) @@ -37,7 +37,7 @@ const ( resourcesCheckAccess = "/resources/%s/checkAccess?operation=%s&session=%s" ) -func (u *Resources) CheckAccess(resourceID string, operation string, sessionID string) error { +func (u *Resources) CheckAccess(resourceID, operation, sessionID string) error { resp, err := u.Client.Get(fmt.Sprintf(resourcesCheckAccess, resourceID, operation, sessionID)) if err != nil { return errors.Wrap(err, "request failed") @@ -69,7 +69,7 @@ func (u *Resources) Create(resourceID string, operations []string) error { } } -func (u *Resources) Grant(resourceID string, rolepath string, operations []string) error { +func (u *Resources) Grant(resourceID, rolepath string, operations []string) error { body := make([]ResourcesRole, len(operations)) for index, operation := range operations { body[index] = ResourcesRole{rolepath, operation} diff --git a/sam/repository/event_queue.go b/sam/repository/event_queue.go index 09fc8bfce..d7d4e7ad1 100644 --- a/sam/repository/event_queue.go +++ b/sam/repository/event_queue.go @@ -9,7 +9,7 @@ type ( EventQueue interface { EventQueuePull(origin uint64) ([]*types.EventQueueItem, error) EventQueuePush(eqi *types.EventQueueItem) error - EventQueueSync(origin uint64, ID uint64) error + EventQueueSync(origin, id uint64) error } ) @@ -29,7 +29,7 @@ func (r *repository) EventQueuePush(eqi *types.EventQueueItem) error { return r.db().Quiet().Insert("event_queue", eqi) } -func (r *repository) EventQueueSync(origin uint64, ID uint64) error { +func (r *repository) EventQueueSync(origin, id uint64) error { type evqs struct { Origin uint64 `db:"origin"` LastEvent uint64 `db:"rel_last"` @@ -38,7 +38,7 @@ func (r *repository) EventQueueSync(origin uint64, ID uint64) error { // @todo do we even need this? return r.db().Quiet().Replace("event_queue_synced", evqs{ Origin: origin, - LastEvent: ID, + LastEvent: id, }) } diff --git a/sam/service/pubsub.go b/sam/service/pubsub.go index 53b767e13..dface8327 100644 --- a/sam/service/pubsub.go +++ b/sam/service/pubsub.go @@ -107,7 +107,7 @@ func (ps *PubSub) Subscribe(onStart func() error, onMessage func(channel string, } } -func (ps *PubSub) Publish(channel string, payload string) error { +func (ps *PubSub) Publish(channel, payload string) error { // main redis connection conn, err := ps.dial() if err != nil { diff --git a/sam/start.go b/sam/start.go index fc9a59845..aaf7abb58 100644 --- a/sam/start.go +++ b/sam/start.go @@ -30,10 +30,12 @@ func Init() error { if err != nil { return err } + // @todo: profiling as an external service? switch config.db.profiler { case "stdout": db.Profiler = &factory.Database.ProfilerStdout - // @todo: profiling as an external service? + default: + fmt.Println("No database query profiler selected") } // configure resputil options