From fc3e25c2d0d901de597a021807eea921c3b687f2 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Fri, 19 Mar 2021 07:43:58 +0100 Subject: [PATCH] fix: scaleway inventory pagination (#2036) (#2041) * fix: scaleway inventory pagination * add changelog * Update changelogs/fragments/2036-scaleway-inventory.yml Co-authored-by: Felix Fontein Co-authored-by: Antoine Barbare Co-authored-by: Felix Fontein (cherry picked from commit fe61be3e111c4d5111d359fe5f667530c55a858d) Co-authored-by: abarbare --- changelogs/fragments/2036-scaleway-inventory.yml | 3 +++ plugins/module_utils/scaleway.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/2036-scaleway-inventory.yml diff --git a/changelogs/fragments/2036-scaleway-inventory.yml b/changelogs/fragments/2036-scaleway-inventory.yml new file mode 100644 index 0000000000..44161306ac --- /dev/null +++ b/changelogs/fragments/2036-scaleway-inventory.yml @@ -0,0 +1,3 @@ +--- +bugfixes: + - scaleway inventory plugin - fix pagination on scaleway inventory plugin (https://github.com/ansible-collections/community.general/pull/2036). diff --git a/plugins/module_utils/scaleway.py b/plugins/module_utils/scaleway.py index f5107feda2..3c73e92bb8 100644 --- a/plugins/module_utils/scaleway.py +++ b/plugins/module_utils/scaleway.py @@ -39,7 +39,7 @@ class ScalewayException(Exception): R_LINK_HEADER = r'''<[^>]+>;\srel="(first|previous|next|last)" (,<[^>]+>;\srel="(first|previous|next|last)")*''' # Specify a single relation, for iteration and string extraction purposes -R_RELATION = r'<(?P[^>]+)>; rel="(?Pfirst|previous|next|last)"' +R_RELATION = r'[^>]+)>; rel="(?Pfirst|previous|next|last)"' def parse_pagination_link(header):