Skip to content

Commit 032f947

Browse files
authored
Merge pull request #252 from splitio/developmentRC
Development rc
2 parents 8516786 + ea02dab commit 032f947

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

splitio/api/auth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def authenticate(self):
4040
try:
4141
response = self._client.get(
4242
'auth',
43-
'/auth',
43+
'/v2/auth',
4444
self._apikey,
4545
extra_headers=self._metadata
4646
)

splitio/client/factory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ def _build_redis_factory(api_key, cfg):
390390
}
391391
data_sampling = cfg.get('dataSampling', DEFAULT_DATA_SAMPLING)
392392
if data_sampling < _MIN_DEFAULT_DATA_SAMPLING_ALLOWED:
393-
_LOGGER.warning("dataSampling cannot be less than %f, defaulting to minimum",
393+
_LOGGER.warning("dataSampling cannot be less than %.2f, defaulting to minimum",
394394
_MIN_DEFAULT_DATA_SAMPLING_ALLOWED)
395395
data_sampling = _MIN_DEFAULT_DATA_SAMPLING_ALLOWED
396396
recorder = PipelinedRecorder(

tests/api/test_auth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def test_auth(self, mocker):
2929
call_made = httpclient.get.mock_calls[0]
3030

3131
# validate positional arguments
32-
assert call_made[1] == ('auth', '/auth', 'some_api_key')
32+
assert call_made[1] == ('auth', '/v2/auth', 'some_api_key')
3333

3434
# validate key-value args (headers)
3535
assert call_made[2]['extra_headers'] == {

tests/helpers/mockserver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ def do_GET(self): #pylint:disable=invalid-name
220220
self._handle_split_changes()
221221
elif self.path.startswith('/api/segmentChanges'):
222222
self._handle_segment_changes()
223-
elif self.path.startswith('/api/auth'):
223+
elif self.path.startswith('/api/v2/auth'):
224224
self._handle_auth()
225225
else:
226226
self.send_response(404)

tests/integration/test_streaming_e2e.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ def test_happiness(self):
148148
# Auth
149149
req = split_backend_requests.get()
150150
assert req.method == 'GET'
151-
assert req.path == '/api/auth'
151+
assert req.path == '/api/v2/auth'
152152
assert req.headers['authorization'] == 'Bearer some_apikey'
153153

154154
# SyncAll after streaming connected
@@ -355,7 +355,7 @@ def test_occupancy_flicker(self):
355355
# Auth
356356
req = split_backend_requests.get()
357357
assert req.method == 'GET'
358-
assert req.path == '/api/auth'
358+
assert req.path == '/api/v2/auth'
359359
assert req.headers['authorization'] == 'Bearer some_apikey'
360360

361361
# SyncAll after streaming connected
@@ -535,7 +535,7 @@ def test_start_without_occupancy(self):
535535
# Auth
536536
req = split_backend_requests.get()
537537
assert req.method == 'GET'
538-
assert req.path == '/api/auth'
538+
assert req.path == '/api/v2/auth'
539539
assert req.headers['authorization'] == 'Bearer some_apikey'
540540

541541
# SyncAll after streaming connected
@@ -725,7 +725,7 @@ def test_streaming_status_changes(self):
725725
# Auth
726726
req = split_backend_requests.get()
727727
assert req.method == 'GET'
728-
assert req.path == '/api/auth'
728+
assert req.path == '/api/v2/auth'
729729
assert req.headers['authorization'] == 'Bearer some_apikey'
730730

731731
# SyncAll after streaming connected
@@ -952,7 +952,7 @@ def test_server_closes_connection(self):
952952
# Auth
953953
req = split_backend_requests.get()
954954
assert req.method == 'GET'
955-
assert req.path == '/api/auth'
955+
assert req.path == '/api/v2/auth'
956956
assert req.headers['authorization'] == 'Bearer some_apikey'
957957

958958
# SyncAll after streaming connected
@@ -982,7 +982,7 @@ def test_server_closes_connection(self):
982982
# Auth after connection breaks
983983
req = split_backend_requests.get()
984984
assert req.method == 'GET'
985-
assert req.path == '/api/auth'
985+
assert req.path == '/api/v2/auth'
986986
assert req.headers['authorization'] == 'Bearer some_apikey'
987987

988988
# SyncAll after streaming connected again
@@ -1189,7 +1189,7 @@ def test_ably_errors_handling(self):
11891189
# Auth
11901190
req = split_backend_requests.get()
11911191
assert req.method == 'GET'
1192-
assert req.path == '/api/auth'
1192+
assert req.path == '/api/v2/auth'
11931193
assert req.headers['authorization'] == 'Bearer some_apikey'
11941194

11951195
# SyncAll after streaming connected
@@ -1213,7 +1213,7 @@ def test_ably_errors_handling(self):
12131213
# Auth again
12141214
req = split_backend_requests.get()
12151215
assert req.method == 'GET'
1216-
assert req.path == '/api/auth'
1216+
assert req.path == '/api/v2/auth'
12171217
assert req.headers['authorization'] == 'Bearer some_apikey'
12181218

12191219
# SyncAll after push is up

0 commit comments

Comments
 (0)