From 43a7cdd7d8d645264e9e0ce8442d56076fc938e3 Mon Sep 17 00:00:00 2001
From: Alina Buzachis <abuzachis@redhat.com>
Date: Tue, 7 Mar 2023 15:13:35 +0100
Subject: [PATCH] Add conditional import

Signed-off-by: Alina Buzachis <abuzachis@redhat.com>
---
 galaxy.yml                      |  4 ++--
 plugins/module_utils/waiters.py | 18 ++++++++++--------
 tests/requirements.yml          |  4 ++--
 tests/sanity/ignore-2.11.txt    | 24 ++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/galaxy.yml b/galaxy.yml
index bf57fb1b..ec2ccdb8 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -10,8 +10,8 @@ description: null
 license_file: LICENSE
 tags: [amazon, cloud, aws]
 dependencies:
-  amazon.aws: '>5.2.0,<=5.3.0'
-  community.aws: '>5.1.0,<=5.2.0'
+  amazon.aws: '>=5.3.0'
+  community.aws: '>=5.3.0'
 repository: https://github.com/ansible-collections/amazon.cloud
 documentation: https://github.com/ansible-collections/amazon.cloud/tree/main/docs
 homepage: https://github.com/ansible-collections/amazon.cloud
diff --git a/plugins/module_utils/waiters.py b/plugins/module_utils/waiters.py
index 4ab0d243..611d4a41 100644
--- a/plugins/module_utils/waiters.py
+++ b/plugins/module_utils/waiters.py
@@ -9,13 +9,15 @@
 except ImportError:
     pass  # caught by HAS_BOTO3
 
-# Will be released in amazon.aws 6.0.0
-# from ansible_collections.amazon.aws.plugins.module_utils.retries import (
-#     RetryingBotoClientWrapper,
-# )
-from ansible_collections.amazon.aws.plugins.module_utils.modules import (
-    _RetryingBotoClientWrapper,
-)
+try:
+    # Will be released in amazon.aws 6.0.0
+    from ansible_collections.amazon.aws.plugins.module_utils.retries import (
+        RetryingBotoClientWrapper,
+    )
+except ImportError:
+    from ansible_collections.amazon.aws.plugins.module_utils.modules import (
+        _RetryingBotoClientWrapper as RetryingBotoClientWrapper,
+    )
 
 
 cloudcontrolapi_data = {
@@ -95,7 +97,7 @@ def cloudcontrolapi_model(name):
 
 
 def get_waiter(client, waiter_name):
-    if isinstance(client, _RetryingBotoClientWrapper):
+    if isinstance(client, RetryingBotoClientWrapper):
         return get_waiter(client.client, waiter_name)
     try:
         return waiters_by_name[(client.__class__.__name__, waiter_name)](client)
diff --git a/tests/requirements.yml b/tests/requirements.yml
index 74270559..b9d80f03 100644
--- a/tests/requirements.yml
+++ b/tests/requirements.yml
@@ -1,5 +1,5 @@
 integration_tests_dependencies:
-- amazon.aws>5.2.0,<=5.3.0
-- community.aws>5.1.0,<=5.2.0
+- amazon.aws
+- community.aws
 - community.crypto
 unit_tests_dependencies: []
diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt
index 6c4d7f2c..95a56269 100644
--- a/tests/sanity/ignore-2.11.txt
+++ b/tests/sanity/ignore-2.11.txt
@@ -14,6 +14,30 @@ plugins/module_utils/utils.py future-import-boilerplate!skip
 plugins/module_utils/utils.py metaclass-boilerplate!skip
 plugins/module_utils/utils.py compile-2.6!skip
 plugins/module_utils/utils.py import-2.6!skip
+plugins/doc_fragments/boto3.py compile-2.7!skip
+plugins/doc_fragments/boto3.py compile-3.5!skip
+plugins/doc_fragments/boto3.py import-2.7!skip
+plugins/doc_fragments/boto3.py import-3.5!skip
+plugins/doc_fragments/boto3.py future-import-boilerplate!skip
+plugins/doc_fragments/boto3.py metaclass-boilerplate!skip
+plugins/doc_fragments/boto3.py compile-2.6!skip
+plugins/doc_fragments/boto3.py import-2.6!skip
+plugins/module_utils/common.py compile-2.7!skip
+plugins/module_utils/common.py compile-3.5!skip
+plugins/module_utils/common.py import-2.7!skip
+plugins/module_utils/common.py import-3.5!skip
+plugins/module_utils/common.py future-import-boilerplate!skip
+plugins/module_utils/common.py metaclass-boilerplate!skip
+plugins/module_utils/common.py compile-2.6!skip
+plugins/module_utils/common.py import-2.6!skip
+plugins/module_utils/waiters.py compile-2.7!skip
+plugins/module_utils/waiters.py compile-3.5!skip
+plugins/module_utils/waiters.py import-2.7!skip
+plugins/module_utils/waiters.py import-3.5!skip
+plugins/module_utils/waiters.py future-import-boilerplate!skip
+plugins/module_utils/waiters.py metaclass-boilerplate!skip
+plugins/module_utils/waiters.py compile-2.6!skip
+plugins/module_utils/waiters.py import-2.6!skip
 plugins/modules/backup_backup_vault.py compile-2.7!skip
 plugins/modules/backup_backup_vault.py compile-3.5!skip
 plugins/modules/backup_backup_vault.py import-2.7!skip