Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions service/api/http_fetchers.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@ func NewHTTPSplitFetcher(apikey string, cfg conf.AdvancedConfig, logger logging.
}
}

func (f *HTTPSplitFetcher) IsProxy(fetchOptions *service.FlagRequestParams) bool {
_, err := f.fetchRaw("/version", fetchOptions)
if err == nil {
return false
}
httpErr, ok := err.(*dtos.HTTPError)
return ok && httpErr.Code == http.StatusNotFound
}

// Fetch makes an http call to the split backend and returns the list of updated splits
func (f *HTTPSplitFetcher) Fetch(fetchOptions *service.FlagRequestParams) (dtos.FFResponse, error) {
fetchOptions.WithFlagSetsFilter(f.flagSetsFilter).WithSpecVersion(f.specVersion)
Expand Down
64 changes: 64 additions & 0 deletions service/api/http_fetchers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,70 @@ func TestFetchWithPost(t *testing.T) {
assert.Equal(t, 1500, len(result.Keys), "Keys lenght should be 1500. Actual: ", len(result.Keys))
}

func TestIsProxy(t *testing.T) {
logger := logging.NewLogger(&logging.LoggerOptions{})

// Test case 1: Not a proxy (version endpoint returns 200)
ts1 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
assert.Equal(t, "/version", r.URL.Path)
w.WriteHeader(http.StatusOK)
}))
defer ts1.Close()

splitFetcher1 := NewHTTPSplitFetcher(
"",
conf.AdvancedConfig{
EventsURL: ts1.URL,
SdkURL: ts1.URL,
},
logger,
dtos.Metadata{},
).(*HTTPSplitFetcher) // Type assertion to access unexported method

isProxy := splitFetcher1.IsProxy(service.MakeFlagRequestParams())
assert.False(t, isProxy, "Should not be identified as proxy when version endpoint returns 200")

// Test case 2: Is a proxy (version endpoint returns 404)
ts2 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
assert.Equal(t, "/version", r.URL.Path)
w.WriteHeader(http.StatusNotFound)
}))
defer ts2.Close()

splitFetcher2 := NewHTTPSplitFetcher(
"",
conf.AdvancedConfig{
EventsURL: ts2.URL,
SdkURL: ts2.URL,
},
logger,
dtos.Metadata{},
).(*HTTPSplitFetcher) // Type assertion to access unexported method

isProxy = splitFetcher2.IsProxy(service.MakeFlagRequestParams())
assert.True(t, isProxy, "Should be identified as proxy when version endpoint returns 404")

// Test case 3: Not a proxy (version endpoint returns other error code)
ts3 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
assert.Equal(t, "/version", r.URL.Path)
w.WriteHeader(http.StatusInternalServerError)
}))
defer ts3.Close()

splitFetcher3 := NewHTTPSplitFetcher(
"",
conf.AdvancedConfig{
EventsURL: ts3.URL,
SdkURL: ts3.URL,
},
logger,
dtos.Metadata{},
).(*HTTPSplitFetcher) // Type assertion to access unexported method

isProxy = splitFetcher3.IsProxy(service.MakeFlagRequestParams())
assert.False(t, isProxy, "Should not be identified as proxy when version endpoint returns non-404 error")
}

func buildLargeSegmentRFDResponseDTO(url string) dtos.LargeSegmentRFDResponseDTO {
return dtos.LargeSegmentRFDResponseDTO{
NotificationType: "LS_NEW_DEFINITION",
Expand Down
1 change: 1 addition & 0 deletions service/interfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ type AuthClient interface {
// SplitFetcher interface to be implemented by Split Fetchers
type SplitFetcher interface {
Fetch(fetchOptions *FlagRequestParams) (dtos.FFResponse, error)
IsProxy(fetchOptions *FlagRequestParams) bool
}

// SegmentFetcher interface to be implemented by Split Fetchers
Expand Down
4 changes: 4 additions & 0 deletions service/local/splitFetcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -325,4 +325,8 @@ func (s *FileSplitFetcher) Fetch(fetchOptions *service.FlagRequestParams) (dtos.
}, nil
}

func (s *FileSplitFetcher) IsProxy(fetchOptions *service.FlagRequestParams) bool {
return false
}

var _ service.SplitFetcher = &FileSplitFetcher{}
6 changes: 6 additions & 0 deletions service/mocks/split.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,10 @@ func (m *MockSplitFetcher) Fetch(fetchOptions *service.FlagRequestParams) (dtos.
return args.Get(0).(dtos.FFResponse), args.Error(1)
}

// Fetch mock
func (m *MockSplitFetcher) IsProxy(fetchOptions *service.FlagRequestParams) bool {
args := m.Called(fetchOptions)
return args.Get(0).(bool)
}

var _ service.SplitFetcher = (*MockSplitFetcher)(nil)
Loading