mirror of
https://github.com/portainer/portainer.git
synced 2025-08-04 21:35:23 +02:00
resolve conflicts
This commit is contained in:
commit
d191e4f9b9
50 changed files with 950 additions and 182 deletions
|
@ -70,6 +70,21 @@ func NewDatastore(options ...datastoreOption) *datastore {
|
|||
return &d
|
||||
}
|
||||
|
||||
|
||||
type stubSettingsService struct {
|
||||
settings *portainer.Settings
|
||||
}
|
||||
|
||||
func (s *stubSettingsService) Settings() (*portainer.Settings, error) { return s.settings, nil }
|
||||
func (s *stubSettingsService) UpdateSettings(settings *portainer.Settings) error { return nil }
|
||||
|
||||
func WithSettings(settings *portainer.Settings) datastoreOption {
|
||||
return func(d *datastore) {
|
||||
d.settings = &stubSettingsService{settings: settings}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
type stubUserService struct {
|
||||
users []portainer.User
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue