Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename org config method Update to Put for semantic accuracy 

Co-authored-by: Jared Scheib <jared.scheib@gmail.com>
pull/10616/head
Alirie Gray 2018-07-10 15:42:44 -07:00
parent 44ee2dc168
commit 6ec5d171e4
8 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bolt/org_config.go
View File

@ -54,7 +54,7 @@ func (s *OrganizationConfigStore) FindOrCreate(ctx context.Context, orgID string
err := s.get(ctx, tx, orgID, &c) err := s.get(ctx, tx, orgID, &c)
if err == chronograf.ErrOrganizationConfigNotFound { if err == chronograf.ErrOrganizationConfigNotFound {
c = newOrganizationConfig(orgID) c = newOrganizationConfig(orgID)
return s.update(ctx, tx, &c) return s.put(ctx, tx, &c)
} }
return err return err
}) })
@ -65,14 +65,14 @@ func (s *OrganizationConfigStore) FindOrCreate(ctx context.Context, orgID string
return &c, nil return &c, nil
} }
// Update replaces the OrganizationConfig in the store // Put replaces the OrganizationConfig in the store
func (s *OrganizationConfigStore) Update(ctx context.Context, c *chronograf.OrganizationConfig) error { func (s *OrganizationConfigStore) Put(ctx context.Context, c *chronograf.OrganizationConfig) error {
return s.client.db.Update(func(tx *bolt.Tx) error { return s.client.db.Update(func(tx *bolt.Tx) error {
return s.update(ctx, tx, c) return s.put(ctx, tx, c)
}) })
} }
func (s *OrganizationConfigStore) update(ctx context.Context, tx *bolt.Tx, c *chronograf.OrganizationConfig) error { func (s *OrganizationConfigStore) put(ctx context.Context, tx *bolt.Tx, c *chronograf.OrganizationConfig) error {
if c == nil { if c == nil {
return fmt.Errorf("config provided was nil") return fmt.Errorf("config provided was nil")
} }

12
bolt/org_config_test.go
View File

@ -661,7 +661,7 @@ func TestOrganizationConfig_FindOrCreate(t *testing.T) {
s := client.OrganizationConfigStore s := client.OrganizationConfigStore
if tt.addFirst { if tt.addFirst {
if err := s.Update(context.Background(), tt.wants.organizationConfig); err != nil { if err := s.Put(context.Background(), tt.wants.organizationConfig); err != nil {
t.Fatal(err) t.Fatal(err)
} }
} }
@ -686,7 +686,7 @@ func TestOrganizationConfig_FindOrCreate(t *testing.T) {
} }
} }
func TestOrganizationConfig_Update(t *testing.T) { func TestOrganizationConfig_Put(t *testing.T) {
type args struct { type args struct {
organizationConfig *chronograf.OrganizationConfig organizationConfig *chronograf.OrganizationConfig
organizationID string organizationID string
@ -1141,20 +1141,20 @@ func TestOrganizationConfig_Update(t *testing.T) {
defer client.Close() defer client.Close()
s := client.OrganizationConfigStore s := client.OrganizationConfigStore
err = s.Update(context.Background(), tt.args.organizationConfig) err = s.Put(context.Background(), tt.args.organizationConfig)
if (tt.wants.err != nil) != (err != nil) { if (tt.wants.err != nil) != (err != nil) {
t.Errorf("%q. OrganizationConfigStore.Update() error = %v, wantErr %v", tt.name, err, tt.wants.err) t.Errorf("%q. OrganizationConfigStore.Put() error = %v, wantErr %v", tt.name, err, tt.wants.err)
continue continue
} }
got, _ := s.FindOrCreate(context.Background(), tt.args.organizationID) got, _ := s.FindOrCreate(context.Background(), tt.args.organizationID)
if (tt.wants.err != nil) != (err != nil) { if (tt.wants.err != nil) != (err != nil) {
t.Errorf("%q. OrganizationConfigStore.Update() error = %v, wantErr %v", tt.name, err, tt.wants.err) t.Errorf("%q. OrganizationConfigStore.Put() error = %v, wantErr %v", tt.name, err, tt.wants.err)
continue continue
} }
if diff := cmp.Diff(got, tt.wants.organizationConfig); diff != "" { if diff := cmp.Diff(got, tt.wants.organizationConfig); diff != "" {
t.Errorf("%q. OrganizationConfigStore.Update():\n-got/+want\ndiff %s", tt.name, diff) t.Errorf("%q. OrganizationConfigStore.Put():\n-got/+want\ndiff %s", tt.name, diff)
} }
} }
} }

4
chronograf.go
View File

@ -789,8 +789,8 @@ type ColumnEncoding struct {
type OrganizationConfigStore interface { type OrganizationConfigStore interface {
// FindOrCreate gets an existing OrganizationConfig and creates one if none exists // FindOrCreate gets an existing OrganizationConfig and creates one if none exists
FindOrCreate(ctx context.Context, orgID string) (*OrganizationConfig, error) FindOrCreate(ctx context.Context, orgID string) (*OrganizationConfig, error)
// Update updates the whole organization config in the OrganizationConfigStore // Put replaces the whole organization config in the OrganizationConfigStore
Update(context.Context, *OrganizationConfig) error Put(context.Context, *OrganizationConfig) error
} }
// BuildInfo is sent to the usage client to track versions and commits // BuildInfo is sent to the usage client to track versions and commits

6
mocks/org_config.go
View File

@ -10,13 +10,13 @@ var _ chronograf.OrganizationConfigStore = &OrganizationConfigStore{}
type OrganizationConfigStore struct { type OrganizationConfigStore struct {
FindOrCreateF func(ctx context.Context, id string) (*chronograf.OrganizationConfig, error) FindOrCreateF func(ctx context.Context, id string) (*chronograf.OrganizationConfig, error)
UpdateF func(ctx context.Context, target *chronograf.OrganizationConfig) error PutF func(ctx context.Context, c *chronograf.OrganizationConfig) error
} }
func (s *OrganizationConfigStore) FindOrCreate(ctx context.Context, id string) (*chronograf.OrganizationConfig, error) { func (s *OrganizationConfigStore) FindOrCreate(ctx context.Context, id string) (*chronograf.OrganizationConfig, error) {
return s.FindOrCreateF(ctx, id) return s.FindOrCreateF(ctx, id)
} }
func (s *OrganizationConfigStore) Update(ctx context.Context, target *chronograf.OrganizationConfig) error { func (s *OrganizationConfigStore) Put(ctx context.Context, c *chronograf.OrganizationConfig) error {
return s.UpdateF(ctx, target) return s.PutF(ctx, c)
} }

4
noop/org_config.go
View File

@ -16,6 +16,6 @@ func (s *OrganizationConfigStore) FindOrCreate(context.Context, string) (*chrono
return nil, chronograf.ErrOrganizationConfigNotFound return nil, chronograf.ErrOrganizationConfigNotFound
} }
func (s *OrganizationConfigStore) Update(context.Context, *chronograf.OrganizationConfig) error { func (s *OrganizationConfigStore) Put(context.Context, *chronograf.OrganizationConfig) error {
return fmt.Errorf("cannot update conifg") return fmt.Errorf("cannot replace config")
} }

6
organizations/org_config.go
View File

@ -40,12 +40,12 @@ func (s *OrganizationConfigStore) FindOrCreate(ctx context.Context, orgID string
} }
// Update the OrganizationConfig in OrganizationConfigStore. // Put the OrganizationConfig in OrganizationConfigStore.
func (s *OrganizationConfigStore) Update(ctx context.Context, c *chronograf.OrganizationConfig) error { func (s *OrganizationConfigStore) Put(ctx context.Context, c *chronograf.OrganizationConfig) error {
err := validOrganization(ctx) err := validOrganization(ctx)
if err != nil { if err != nil {
return err return err
} }
return s.store.Update(ctx, c) return s.store.Put(ctx, c)
} }

2
server/org_config.go
View File

@ -105,7 +105,7 @@ func (s *Service) ReplaceOrganizationLogViewerConfig(w http.ResponseWriter, r *h
return return
} }
config.LogViewer = logViewerConfig config.LogViewer = logViewerConfig
if err := s.Store.OrganizationConfig(ctx).Update(ctx, config); err != nil { if err := s.Store.OrganizationConfig(ctx).Put(ctx, config); err != nil {
unknownErrorWithMessage(w, err, s.Logger) unknownErrorWithMessage(w, err, s.Logger)
return return
} }

10
server/org_config_test.go
View File

@ -356,7 +356,7 @@ func TestReplaceLogViewerOrganizationConfig(t *testing.T) {
return nil, chronograf.ErrOrganizationConfigNotFound return nil, chronograf.ErrOrganizationConfigNotFound
} }
}, },
UpdateF: func(ctx context.Context, target *chronograf.OrganizationConfig) error { PutF: func(ctx context.Context, target *chronograf.OrganizationConfig) error {
return nil return nil
}, },
}, },
@ -448,7 +448,7 @@ func TestReplaceLogViewerOrganizationConfig(t *testing.T) {
return nil, chronograf.ErrOrganizationConfigNotFound return nil, chronograf.ErrOrganizationConfigNotFound
} }
}, },
UpdateF: func(ctx context.Context, target *chronograf.OrganizationConfig) error { PutF: func(ctx context.Context, target *chronograf.OrganizationConfig) error {
return nil return nil
}, },
}, },
@ -492,7 +492,7 @@ func TestReplaceLogViewerOrganizationConfig(t *testing.T) {
return nil, chronograf.ErrOrganizationConfigNotFound return nil, chronograf.ErrOrganizationConfigNotFound
} }
}, },
UpdateF: func(ctx context.Context, target *chronograf.OrganizationConfig) error { PutF: func(ctx context.Context, target *chronograf.OrganizationConfig) error {
return nil return nil
}, },
}, },
@ -557,7 +557,7 @@ func TestReplaceLogViewerOrganizationConfig(t *testing.T) {
return nil, chronograf.ErrOrganizationConfigNotFound return nil, chronograf.ErrOrganizationConfigNotFound
} }
}, },
UpdateF: func(ctx context.Context, target *chronograf.OrganizationConfig) error { PutF: func(ctx context.Context, target *chronograf.OrganizationConfig) error {
return nil return nil
}, },
}, },
@ -627,7 +627,7 @@ func TestReplaceLogViewerOrganizationConfig(t *testing.T) {
return nil, chronograf.ErrOrganizationConfigNotFound return nil, chronograf.ErrOrganizationConfigNotFound
} }
}, },
UpdateF: func(ctx context.Context, target *chronograf.OrganizationConfig) error { PutF: func(ctx context.Context, target *chronograf.OrganizationConfig) error {
return nil return nil
}, },
}, },