| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent e85de1e commit ec10a57
5 files changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,6 +33,7 @@ | |||
| 33 | 33 | from gitlab.exceptions import * # noqa: F401,F403 | |
| 34 | 34 | ||
| 35 | 35 | warnings.filterwarnings("default", category=DeprecationWarning, module="^gitlab") | |
| 36 | + warnings.filterwarnings("default", category=UserWarning, module="^gitlab") | ||
| 36 | 37 | ||
| 37 | 38 | ||
| 38 | 39 | # NOTE(jlvillal): We are deprecating access to the gitlab.const values which | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -24,6 +24,7 @@ | |||
| 24 | 24 | import requests.utils | |
| 25 | 25 | from requests_toolbelt.multipart.encoder import MultipartEncoder # type: ignore | |
| 26 | 26 | ||
| 27 | + import gitlab | ||
| 27 | 28 | import gitlab.config | |
| 28 | 29 | import gitlab.const | |
| 29 | 30 | import gitlab.exceptions | |
@@ -35,6 +36,12 @@ | |||
| 35 | 36 | "{source!r} to {target!r}" | |
| 36 | 37 | ) | |
| 37 | 38 | ||
| 39 | + # https://docs.gitlab.com/ee/api/#offset-based-pagination | ||
| 40 | + _PAGINATION_URL = ( | ||
| 41 | + f"https://python-gitlab.readthedocs.io/en/v{gitlab.__version__}/" | ||
| 42 | + f"api-usage.html#pagination" | ||
| 43 | + ) | ||
| 44 | + | ||
| 38 | 45 | ||
| 39 | 46 | class Gitlab: | |
| 40 | 47 | """Represents a GitLab server connection. | |
@@ -808,7 +815,7 @@ def http_list( | |||
| 808 | 815 | # In case we want to change the default behavior at some point | |
| 809 | 816 | as_list = True if as_list is None else as_list | |
| 810 | 817 | ||
| 811 | - get_all = kwargs.pop("all", False) | ||
| 818 | + get_all = kwargs.pop("all", None) | ||
| 812 | 819 | url = self._build_url(path) | |
| 813 | 820 | ||
| 814 | 821 | page = kwargs.get("page") | |
@@ -818,7 +825,28 @@ def http_list( | |||
| 818 | 825 | ||
| 819 | 826 | if page or as_list is True: | |
| 820 | 827 | # pagination requested, we return a list | |
| 821 | - return list(GitlabList(self, url, query_data, get_next=False, **kwargs)) | ||
| 828 | + gl_list = GitlabList(self, url, query_data, get_next=False, **kwargs) | ||
| 829 | + items = list(gl_list) | ||
| 830 | + if page is None and get_all is None and gl_list.per_page is not None: | ||
| 831 | + if len(items) >= gl_list.per_page and ( | ||
| 832 | + gl_list.total is None or len(items) < gl_list.total | ||
| 833 | + ): | ||
| 834 | + total_items = "10,000+" if gl_list.total is None else gl_list.total | ||
| 835 | + # Warn the user that they are only going to retrieve `per_page` | ||
| 836 | + # maximum items. This is a common cause of issues filed. | ||
| 837 | + utils.warn( | ||
| 838 | + message=( | ||
| 839 | + f"Calling a `list()` method without specifying `all=True` " | ||
| 840 | + f"or `as_list=False` will return a maximum of " | ||
| 841 | + f"{gl_list.per_page} items. Your query returned " | ||
| 842 | + f"{len(items)} of {total_items} items. See " | ||
| 843 | + f"{_PAGINATION_URL} for more details. If this was done " | ||
| 844 | + f"intentionally, then this warning can be supressed by " | ||
| 845 | + f"adding the argument `all=False` to the `list()` call." | ||
| 846 | + ), | ||
| 847 | + category=UserWarning, | ||
| 848 | + ) | ||
| 849 | + return items | ||
| 822 | 850 | ||
| 823 | 851 | # No pagination, generator requested | |
| 824 | 852 | return GitlabList(self, url, query_data, **kwargs) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,3 +1,5 @@ | |||
| 1 | + import warnings | ||
| 2 | + | ||
| 1 | 3 | import pytest | |
| 2 | 4 | ||
| 3 | 5 | import gitlab | |
@@ -81,13 +83,13 @@ def test_template_dockerfile(gl): | |||
| 81 | 83 | ||
| 82 | 84 | ||
| 83 | 85 | def test_template_gitignore(gl): | |
| 84 | - assert gl.gitignores.list() | ||
| 86 | + assert gl.gitignores.list(all=True) | ||
| 85 | 87 | gitignore = gl.gitignores.get("Node") | |
| 86 | 88 | assert gitignore.content is not None | |
| 87 | 89 | ||
| 88 | 90 | ||
| 89 | 91 | def test_template_gitlabciyml(gl): | |
| 90 | - assert gl.gitlabciymls.list() | ||
| 92 | + assert gl.gitlabciymls.list(all=True) | ||
| 91 | 93 | gitlabciyml = gl.gitlabciymls.get("Nodejs") | |
| 92 | 94 | assert gitlabciyml.content is not None | |
| 93 | 95 | ||
@@ -181,3 +183,48 @@ def test_rate_limits(gl): | |||
| 181 | 183 | settings.throttle_authenticated_api_enabled = False | |
| 182 | 184 | settings.save() | |
| 183 | 185 | [project.delete() for project in projects] | |
| 186 | + | ||
| 187 | + | ||
| 188 | + def test_list_default_warning(gl): | ||
| 189 | + """When there are more than 20 items and use default `list()` then warning is | ||
| 190 | + generated""" | ||
| 191 | + with warnings.catch_warnings(record=True) as caught_warnings: | ||
| 192 | + gl.gitlabciymls.list() | ||
| 193 | + assert len(caught_warnings) == 1 | ||
| 194 | + warning = caught_warnings[0] | ||
| 195 | + assert isinstance(warning.message, UserWarning) | ||
| 196 | + message = str(caught_warnings[0].message) | ||
| 197 | + assert "Calling" in message | ||
| 198 | + assert "return a maximum of" in message | ||
| 199 | + assert "readthedocs" in message | ||
| 200 | + assert __file__ == warning.filename | ||
| 201 | + | ||
| 202 | + | ||
| 203 | + def test_list_page_nowarning(gl): | ||
| 204 | + """Using `page=X` will disable the warning""" | ||
| 205 | + with warnings.catch_warnings(record=True) as caught_warnings: | ||
| 206 | + gl.gitlabciymls.list(page=1) | ||
| 207 | + assert len(caught_warnings) == 0 | ||
| 208 | + | ||
| 209 | + | ||
| 210 | + def test_list_all_false_nowarning(gl): | ||
| 211 | + """Using `all=False` will disable the warning""" | ||
| 212 | + with warnings.catch_warnings(record=True) as caught_warnings: | ||
| 213 | + gl.gitlabciymls.list(all=False) | ||
| 214 | + assert len(caught_warnings) == 0 | ||
| 215 | + | ||
| 216 | + | ||
| 217 | + def test_list_all_true_nowarning(gl): | ||
| 218 | + """Using `all=True` will disable the warning""" | ||
| 219 | + with warnings.catch_warnings(record=True) as caught_warnings: | ||
| 220 | + items = gl.gitlabciymls.list(all=True) | ||
| 221 | + assert len(caught_warnings) == 0 | ||
| 222 | + assert len(items) > 20 | ||
| 223 | + | ||
| 224 | + | ||
| 225 | + def test_list_as_list_false_nowarning(gl): | ||
| 226 | + """Using `as_list=False` will disable the warning""" | ||
| 227 | + with warnings.catch_warnings(record=True) as caught_warnings: | ||
| 228 | + items = gl.gitlabciymls.list(as_list=False) | ||
| 229 | + assert len(caught_warnings) == 0 | ||
| 230 | + assert len(list(items)) > 20 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,7 +14,7 @@ services: | |||
| 14 | 14 | GITLAB_ROOT_PASSWORD: 5iveL!fe | |
| 15 | 15 | GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN: registration-token | |
| 16 | 16 | GITLAB_OMNIBUS_CONFIG: | | |
| 17 | - external_url 'http://127.0.0.1:8080' | ||
| 17 | + external_url 'http://localhost:8080' | ||
| 18 | 18 | registry['enable'] = false | |
| 19 | 19 | nginx['redirect_http_to_https'] = false | |
| 20 | 20 | nginx['listen_port'] = 80 | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,3 +1,6 @@ | |||
| 1 | + import copy | ||
| 2 | + import warnings | ||
| 3 | + | ||
| 1 | 4 | import pytest | |
| 2 | 5 | import requests | |
| 3 | 6 | import responses | |
@@ -329,20 +332,115 @@ def test_list_request(gl): | |||
| 329 | 332 | match=MATCH_EMPTY_QUERY_PARAMS, | |
| 330 | 333 | ) | |
| 331 | 334 | ||
| 332 | - result = gl.http_list("/projects", as_list=True) | ||
| 335 | + with warnings.catch_warnings(record=True) as caught_warnings: | ||
| 336 | + result = gl.http_list("/projects", as_list=True) | ||
| 337 | + assert len(caught_warnings) == 0 | ||
| 333 | 338 | assert isinstance(result, list) | |
| 334 | 339 | assert len(result) == 1 | |
| 335 | 340 | ||
| 336 | 341 | result = gl.http_list("/projects", as_list=False) | |
| 337 | 342 | assert isinstance(result, GitlabList) | |
| 338 | - assert len(result) == 1 | ||
| 343 | + assert len(list(result)) == 1 | ||
| 339 | 344 | ||
| 340 | 345 | result = gl.http_list("/projects", all=True) | |
| 341 | 346 | assert isinstance(result, list) | |
| 342 | 347 | assert len(result) == 1 | |
| 343 | 348 | assert responses.assert_call_count(url, 3) is True | |
| 344 | 349 | ||
| 345 | 350 | ||
| 351 | + large_list_response = { | ||
| 352 | + "method": responses.GET, | ||
| 353 | + "url": "http://localhost/api/v4/projects", | ||
| 354 | + "json": [ | ||
| 355 | + {"name": "project01"}, | ||
| 356 | + {"name": "project02"}, | ||
| 357 | + {"name": "project03"}, | ||
| 358 | + {"name": "project04"}, | ||
| 359 | + {"name": "project05"}, | ||
| 360 | + {"name": "project06"}, | ||
| 361 | + {"name": "project07"}, | ||
| 362 | + {"name": "project08"}, | ||
| 363 | + {"name": "project09"}, | ||
| 364 | + {"name": "project10"}, | ||
| 365 | + {"name": "project11"}, | ||
| 366 | + {"name": "project12"}, | ||
| 367 | + {"name": "project13"}, | ||
| 368 | + {"name": "project14"}, | ||
| 369 | + {"name": "project15"}, | ||
| 370 | + {"name": "project16"}, | ||
| 371 | + {"name": "project17"}, | ||
| 372 | + {"name": "project18"}, | ||
| 373 | + {"name": "project19"}, | ||
| 374 | + {"name": "project20"}, | ||
| 375 | + ], | ||
| 376 | + "headers": {"X-Total": "30", "x-per-page": "20"}, | ||
| 377 | + "status": 200, | ||
| 378 | + "match": MATCH_EMPTY_QUERY_PARAMS, | ||
| 379 | + } | ||
| 380 | + | ||
| 381 | + | ||
| 382 | + @responses.activate | ||
| 383 | + def test_list_request_pagination_warning(gl): | ||
| 384 | + responses.add(**large_list_response) | ||
| 385 | + | ||
| 386 | + with warnings.catch_warnings(record=True) as caught_warnings: | ||
| 387 | + result = gl.http_list("/projects", as_list=True) | ||
| 388 | + assert len(caught_warnings) == 1 | ||
| 389 | + warning = caught_warnings[0] | ||
| 390 | + assert isinstance(warning.message, UserWarning) | ||
| 391 | + message = str(warning.message) | ||
| 392 | + assert "Calling a `list()` method" in message | ||
| 393 | + assert "python-gitlab.readthedocs.io" in message | ||
| 394 | + assert __file__ == warning.filename | ||
| 395 | + assert isinstance(result, list) | ||
| 396 | + assert len(result) == 20 | ||
| 397 | + assert len(responses.calls) == 1 | ||
| 398 | + | ||
| 399 | + | ||
| 400 | + @responses.activate | ||
| 401 | + def test_list_request_as_list_false_nowarning(gl): | ||
| 402 | + responses.add(**large_list_response) | ||
| 403 | + with warnings.catch_warnings(record=True) as caught_warnings: | ||
| 404 | + result = gl.http_list("/projects", as_list=False) | ||
| 405 | + assert len(caught_warnings) == 0 | ||
| 406 | + assert isinstance(result, GitlabList) | ||
| 407 | + assert len(list(result)) == 20 | ||
| 408 | + assert len(responses.calls) == 1 | ||
| 409 | + | ||
| 410 | + | ||
| 411 | + @responses.activate | ||
| 412 | + def test_list_request_all_true_nowarning(gl): | ||
| 413 | + responses.add(**large_list_response) | ||
| 414 | + with warnings.catch_warnings(record=True) as caught_warnings: | ||
| 415 | + result = gl.http_list("/projects", all=True) | ||
| 416 | + assert len(caught_warnings) == 0 | ||
| 417 | + assert isinstance(result, list) | ||
| 418 | + assert len(result) == 20 | ||
| 419 | + assert len(responses.calls) == 1 | ||
| 420 | + | ||
| 421 | + | ||
| 422 | + @responses.activate | ||
| 423 | + def test_list_request_all_false_nowarning(gl): | ||
| 424 | + responses.add(**large_list_response) | ||
| 425 | + with warnings.catch_warnings(record=True) as caught_warnings: | ||
| 426 | + result = gl.http_list("/projects", all=False) | ||
| 427 | + assert len(caught_warnings) == 0 | ||
| 428 | + assert isinstance(result, list) | ||
| 429 | + assert len(result) == 20 | ||
| 430 | + assert len(responses.calls) == 1 | ||
| 431 | + | ||
| 432 | + | ||
| 433 | + @responses.activate | ||
| 434 | + def test_list_request_page_nowarning(gl): | ||
| 435 | + response_dict = copy.deepcopy(large_list_response) | ||
| 436 | + response_dict["match"] = [responses.matchers.query_param_matcher({"page": "1"})] | ||
| 437 | + responses.add(**response_dict) | ||
| 438 | + with warnings.catch_warnings(record=True) as caught_warnings: | ||
| 439 | + gl.http_list("/projects", page=1) | ||
| 440 | + assert len(caught_warnings) == 0 | ||
| 441 | + assert len(responses.calls) == 1 | ||
| 442 | + | ||
| 443 | + | ||
| 346 | 444 | @responses.activate | |
| 347 | 445 | def test_list_request_404(gl): | |
| 348 | 446 | url = "http://localhost/api/v4/not_there" | |
| Back | FazBrowse Home | New Git URL |
0 commit comments