Skip to content
This repository has been archived by the owner on Feb 28, 2019. It is now read-only.

Commit

Permalink
function no longer referes to bulk endpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
Jake Skelcy committed Apr 9, 2018
1 parent 6d1884e commit c89c310
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion service/r2/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ func fetchRollupRuleHistory(s *service, r *http.Request) (data interface{}, err
return models.NewRollupRuleSnapshots(hist), nil
}

func bulkUpdateRuleSet(s *service, r *http.Request) (data interface{}, err error) {
func updateRuleSet(s *service, r *http.Request) (data interface{}, err error) {
vars := mux.Vars(r)
var req updateRuleSetRequest
if err := parseRequest(&req, r.Body); err != nil {
Expand Down
16 changes: 8 additions & 8 deletions service/r2/routes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func TestRulesetUpdateRuleSet(t *testing.T) {
}).Return(newRuleSet(namespaceID, 2), nil)

service := newTestService(storeMock)
resp, err := bulkUpdateRuleSet(service, req)
resp, err := updateRuleSet(service, req)
require.NoError(t, err)
typedResp := resp.(models.RuleSet)
require.Equal(t, typedResp.Version, 2)
Expand Down Expand Up @@ -267,7 +267,7 @@ func TestRulesetUpdateRuleSetVersionMismatch(t *testing.T) {
storeMock.EXPECT().FetchRuleSet(namespaceID).Return(newRuleSet(namespaceID, 4), nil)

service := newTestService(storeMock)
_, err = bulkUpdateRuleSet(service, req)
_, err = updateRuleSet(service, req)
require.Error(t, err)
require.IsType(t, NewConflictError(""), err)
}
Expand Down Expand Up @@ -295,7 +295,7 @@ func TestRulesetUpdateRuleSetKVFetchFailure(t *testing.T) {
storeMock := store.NewMockStore(ctrl)
storeMock.EXPECT().FetchRuleSet(namespaceID).Return(nil, NewInternalError("KV error"))
service := newTestService(storeMock)
_, err = bulkUpdateRuleSet(service, req)
_, err = updateRuleSet(service, req)
require.Error(t, err)
require.IsType(t, NewInternalError(""), err)
}
Expand Down Expand Up @@ -325,7 +325,7 @@ func TestRulesetUpdateRuleSetKVUpdateFailure(t *testing.T) {
storeMock.EXPECT().UpdateRuleSet(gomock.Any()).Return(nil, NewInternalError("KV error"))

service := newTestService(storeMock)
_, err = bulkUpdateRuleSet(service, req)
_, err = updateRuleSet(service, req)
require.Error(t, err)
require.IsType(t, NewInternalError(""), err)
}
Expand Down Expand Up @@ -367,7 +367,7 @@ func TestRulesetUpdateRuleSetBadInput(t *testing.T) {
storeMock.EXPECT().FetchRuleSet(namespaceID).Return(newRuleSet(namespaceID, 1), nil).Times(1)

service := newTestService(storeMock)
_, err = bulkUpdateRuleSet(service, req)
_, err = updateRuleSet(service, req)
require.Error(t, err)
require.IsType(t, NewBadInputError(""), err)
}
Expand Down Expand Up @@ -452,7 +452,7 @@ func TestApplyChangesToRuleSetNoChanges(t *testing.T) {
)

service := newTestService(nil)
_, err = bulkUpdateRuleSet(service, req)
_, err = updateRuleSet(service, req)
require.Error(t, err)
require.IsType(t, NewBadInputError(""), err)
}
Expand Down Expand Up @@ -488,7 +488,7 @@ func TestRulesetUpdateRuleSetMappingRuleMissingOp(t *testing.T) {
storeMock.EXPECT().FetchRuleSet(namespaceID).Return(newRuleSet(namespaceID, 1), nil).Times(1)

service := newTestService(storeMock)
_, err = bulkUpdateRuleSet(service, req)
_, err = updateRuleSet(service, req)
require.Error(t, err)
require.IsType(t, NewBadInputError(""), err)
}
Expand Down Expand Up @@ -524,7 +524,7 @@ func TestRulesetUpdateRuleSetRollupRuleMissingOp(t *testing.T) {
storeMock.EXPECT().FetchRuleSet(namespaceID).Return(newRuleSet(namespaceID, 1), nil).Times(1)

service := newTestService(storeMock)
_, err = bulkUpdateRuleSet(service, req)
_, err = updateRuleSet(service, req)
require.Error(t, err)
require.IsType(t, NewBadInputError(""), err)
}
Expand Down
10 changes: 5 additions & 5 deletions service/r2/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func NewService(
store store.Store,
iOpts instrument.Options,
clockOpts clock.Options,
rulePropigationDelay time.Duration,
rulePropagationDelay time.Duration,
) mservice.Service {
return &service{
rootPrefix: rootPrefix,
Expand All @@ -159,7 +159,7 @@ func NewService(
logger: iOpts.Logger(),
nowFn: clockOpts.NowFn(),
metrics: newServiceMetrics(iOpts.MetricsScope(), iOpts.MetricsSamplingRate()),
updateHelper: rules.NewRuleSetUpdateHelper(rulePropigationDelay),
updateHelper: rules.NewRuleSetUpdateHelper(rulePropagationDelay),
}
}

Expand All @@ -178,7 +178,7 @@ func (s *service) RegisterHandlers(router *mux.Router) error {
{route: route{path: namespacePrefix, method: http.MethodGet}, handler: s.fetchNamespace},
{route: route{path: namespacePrefix, method: http.MethodDelete}, handler: s.deleteNamespace},
{route: route{path: validateRuleSetPath, method: http.MethodPost}, handler: s.validateNamespace},
{route: route{path: updateRuleSetPath, method: http.MethodPost}, handler: s.bulkUpdateRuleSet},
{route: route{path: updateRuleSetPath, method: http.MethodPost}, handler: s.updateRuleSet},

// Mapping Rule actions.
{route: route{path: mappingRuleRoot, method: http.MethodPost}, handler: s.createMappingRule},
Expand Down Expand Up @@ -369,8 +369,8 @@ func (s *service) fetchRollupRuleHistory(w http.ResponseWriter, r *http.Request)
return s.sendResponse(w, http.StatusOK, data)
}

func (s *service) bulkUpdateRuleSet(w http.ResponseWriter, r *http.Request) error {
data, err := s.handleRoute(bulkUpdateRuleSet, r, s.metrics.bulkUpdateRuleSet)
func (s *service) updateRuleSet(w http.ResponseWriter, r *http.Request) error {
data, err := s.handleRoute(updateRuleSet, r, s.metrics.bulkUpdateRuleSet)
if err != nil {
return err
}
Expand Down

0 comments on commit c89c310

Please sign in to comment.