Skip to content

Commit

Permalink
feat(kv): enable reading from URM by user index
Browse files Browse the repository at this point in the history
  • Loading branch information
GeorgeMac committed Apr 6, 2020
1 parent 7bf234a commit 5ba2edb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 20 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
### Features

1. [17490](https://github.com/influxdata/influxdb/pull/17490): `influx config -`, to switch back to previous activated configuration
1. [17618](https://github.com/influxdata/influxdb/pull/17618): Add index for URM by user ID to improve lookup performance

### UI Improvements

Expand Down
11 changes: 3 additions & 8 deletions kv/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func NewService(log *zap.Logger, kv Store, configs ...ServiceConfig) *Service {
id, _ := urm.UserID.Encode()
return id, nil
},
)),
), WithIndexReadPathEnabled),
disableAuthorizationsForMaxPermissions: func(context.Context) bool {
return false
},
Expand Down Expand Up @@ -115,18 +115,13 @@ func NewService(log *zap.Logger, kv Store, configs ...ServiceConfig) *Service {
s.clock = clock.New()
}

if s.Config.URMByUserIndexReadPathEnabled {
WithIndexReadPathEnabled(s.urmByUserIndex)
}

return s
}

// ServiceConfig allows us to configure Services
type ServiceConfig struct {
SessionLength time.Duration
Clock clock.Clock
URMByUserIndexReadPathEnabled bool
SessionLength time.Duration
Clock clock.Clock
}

// AutoMigrationStore is a Store which also describes whether or not
Expand Down
12 changes: 0 additions & 12 deletions kv/urm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,10 @@ func TestBoltUserResourceMappingService(t *testing.T) {
influxdbtesting.UserResourceMappingService(initURMServiceFunc(NewTestBoltStore), t)
}

func TestBoltUserResourceMappingService_WithUserIndex(t *testing.T) {
influxdbtesting.UserResourceMappingService(initURMServiceFunc(NewTestBoltStore, kv.ServiceConfig{
URMByUserIndexReadPathEnabled: true,
}), t)
}

func TestInmemUserResourceMappingService(t *testing.T) {
influxdbtesting.UserResourceMappingService(initURMServiceFunc(NewTestBoltStore), t)
}

func TestInmemUserResourceMappingService_WithUserIndex(t *testing.T) {
influxdbtesting.UserResourceMappingService(initURMServiceFunc(NewTestBoltStore, kv.ServiceConfig{
URMByUserIndexReadPathEnabled: true,
}), t)
}

type userResourceMappingTestFunc func(influxdbtesting.UserResourceFields, *testing.T) (influxdb.UserResourceMappingService, func())

func initURMServiceFunc(storeFn func(*testing.T) (kv.Store, func(), error), confs ...kv.ServiceConfig) userResourceMappingTestFunc {
Expand Down

0 comments on commit 5ba2edb

Please sign in to comment.