Merge pull request #254 from splitio/FME-10043

[FME-10043] Updated fetch to don't send rbs since when use 1.1 spec

Author: nmayorsplit

synchronizer/worker/split/split.go

@@ -143,7 +143,12 @@ func (s *UpdaterImpl) fetchUntil(fetchOptions *service.FlagRequestParams) (*Upda
 		currentRBSince, _ = s.ruleBasedSegmentStorage.ChangeNumber()
 		before := time.Now()
 		var splitChanges dtos.FFResponse
-		splitChanges, err = s.splitFetcher.Fetch(fetchOptions.WithChangeNumber(currentSince).WithChangeNumberRB(currentRBSince).WithSpecVersion(common.StringRef(s.specVersion)))
+		if s.specVersion == specs.FLAG_V1_3 {
+			splitChanges, err = s.splitFetcher.Fetch(fetchOptions.WithChangeNumber(currentSince).WithChangeNumberRB(currentRBSince).WithSpecVersion(common.StringRef(s.specVersion)))
+		} else {
+			splitChanges, err = s.splitFetcher.Fetch(fetchOptions.WithChangeNumber(currentSince).WithSpecVersion(common.StringRef(s.specVersion)))
+		}
+
 		if err != nil {
 			if httpError, ok := err.(*dtos.HTTPError); ok {
 				if httpError.Code == http.StatusRequestURITooLong {

synchronizer/worker/split/split_test.go

@@ -1008,7 +1008,7 @@ func TestSplitProxyDowngrade(t *testing.T) {
 		largeSegmentStorage := &mocks.MockLargeSegmentStorage{}
 		splitMockFetcher := &fetcherMock.MockSplitFetcher{}
 		splitMockFetcher.On("Fetch", service.MakeFlagRequestParams().WithSpecVersion(common.StringRef(specs.FLAG_V1_3)).WithChangeNumber(-1).WithChangeNumberRB(-1)).Return(nil, &dtos.HTTPError{Code: http.StatusBadRequest}).Once()
-		splitMockFetcher.On("Fetch", service.MakeFlagRequestParams().WithSpecVersion(common.StringRef(specs.FLAG_V1_1)).WithChangeNumber(-1).WithChangeNumberRB(-1)).Return(response, nil).Once()
+		splitMockFetcher.On("Fetch", service.MakeFlagRequestParams().WithSpecVersion(common.StringRef(specs.FLAG_V1_1)).WithChangeNumber(-1)).Return(response, nil).Once()
 		telemetryMockStorage := mocks.MockTelemetryStorage{
 			RecordSuccessfulSyncCall: func(resource int, tm time.Time) {
 				assert.Equal(t, telemetry.SplitSync, resource)