Merge branch 'master' into feature/sc-76763-add-follow-authorization-header-option

Author: alexbourret

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
 
+## [Version 1.0.5](https://github.com/dataiku/dss-plugin-api-connect/releases/tag/v1.0.5) - Bugfix release - 2022-03-30
+
+- Fix use of "Next page pagination" with short extraction path
+
 ## [Version 1.0.4](https://github.com/dataiku/dss-plugin-api-connect/releases/tag/v1.0.4) - Bugfix release - 2021-12-14
 
 - Fix use of "Next page pagination" in combination with extraction path

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 Dataiku
+   Copyright 2021-2022 Dataiku
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -7,4 +7,6 @@ Documentation: https://www.dataiku.com/product/plugins/api-connect/
 
 ### Licence
 
+Copyright 2021-2022 Dataiku SAS
+
 This plugin is distributed under the Apache License version 2.0

plugin.json

@@ -1,6 +1,6 @@
 {
     "id": "api-connect",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "meta": {
         "label": "API Connect",
         "description": "Retrieve data from any REST API",

python-lib/pagination.py

@@ -75,7 +75,7 @@ def update_next_page(self, data, response_links=None):
                 self.is_last_batch_empty = True
         else:
             batch_size = 1
-        if self.next_page_key and (len(self.next_page_key) > 1):
+        if self.next_page_key and (len(self.next_page_key) > 0):
             self.next_page_url = self.get_from_path(data, self.next_page_key)
         if self.skip_key:
             self.skip = data.get(self.skip_key)

python-lib/rest_api_client.py

@@ -19,7 +19,6 @@ def template_dict(dictionnary, **kwargs):
             ret[key] = template_dict(ret[key], **kwargs)
         if isinstance(ret[key], str):
             ret[key] = format_template(ret[key], **kwargs)
-            return ret
     return ret
 
 

tests/python/integration/test_scenario.py

@@ -29,3 +29,7 @@ def test_run_api_connect_search_path(user_dss_clients):
 
 def test_run_api_connect_redirection(user_dss_clients):
     dss_scenario.run(user_dss_clients, project_key=TEST_PROJECT_KEY, scenario_id="REDIRECTION")
+
+
+def test_run_api_connect_check_sc_84465(user_dss_clients):
+    dss_scenario.run(user_dss_clients, project_key=TEST_PROJECT_KEY, scenario_id="CHECKSC84465")