From a03428fa5e252e637aa9d4452eba57063f68b316 Mon Sep 17 00:00:00 2001
From: Alina Buzachis <abuzachis@redhat.com>
Date: Tue, 5 Sep 2023 20:10:40 +0200
Subject: [PATCH] Fix typos

Signed-off-by: Alina Buzachis <abuzachis@redhat.com>
---
 plugins/module_utils/ec2.py              |  2 +-
 plugins/modules/ec2_import_image.py      | 22 +++++++++++++---------
 plugins/modules/ec2_import_image_info.py |  5 +++--
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/plugins/module_utils/ec2.py b/plugins/module_utils/ec2.py
index 9126934f1f0..fa02d76bcaa 100644
--- a/plugins/module_utils/ec2.py
+++ b/plugins/module_utils/ec2.py
@@ -315,7 +315,7 @@ def helper_describe_import_image_tasks(client, module, **params):
         module.fail_json_aws(e, msg="Failed to describe the import image")
 
 
-def ensure_result(module, import_image_info):
+def ensure_ec2_import_image_result(module, import_image_info):
     result = {"import_image": {}}
 
     import_image_info["Tags"] = boto3_tag_list_to_ansible_dict(import_image_info["Tags"])
diff --git a/plugins/modules/ec2_import_image.py b/plugins/modules/ec2_import_image.py
index e0e1d66e9ce..3683ee35b9a 100644
--- a/plugins/modules/ec2_import_image.py
+++ b/plugins/modules/ec2_import_image.py
@@ -267,15 +267,15 @@ def absent():
 
     filters = {
         "Filters": [
-            {"Name": "name", "Values": [module.params["task_name"]]}
-            {"Name": "task-state", "Values": ["active"]}
+            {"Name": "name", "Values": [module.params["task_name"]]},
+            {"Name": "task-state", "Values": ["active"]},
         ]
     }
 
     result = {"import_image": {}}
     params = {}
 
-    if module.params.get("cancel_reason")
+    if module.params.get("cancel_reason"):
         params["CancelReason"] = module.params["cancel_reason"]
 
     import_image_info = helper_describe_import_image_tasks(client, module, **filters)
@@ -289,7 +289,7 @@ def absent():
         try:
             import_image_info = client.cancel_import_task(aws_retry=True, **params)
         except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:
-            module.fail_json_aws(e, msg"Failed to import the image")
+            module.fail_json_aws(e, msg="Failed to import the image")
     else:
         module.exit_json(changed=False, msg="The specified import task does not exist or it cannot be cancelled")
 
@@ -334,15 +334,19 @@ def present():
 
     filters = {
         "Filters": [
-            {"Name": "name", "Values": [module.params["task_name"]]}
-            {"Name": "task-state", "Values": ["completed", "active", "deleting"]}
+            {"Name": "name", "Values": [module.params["task_name"]]},
+            {"Name": "task-state", "Values": ["completed", "active", "deleting"]},
         ]
     }
     import_image_info = helper_describe_import_image_tasks(client, module, **filters)
 
     if import_image_info:
         # Import tasks cannot be modified
-        module.exit_json(changed=False, msg="An import task with the specified name already exists", **ensure_ec2_import_image_result(module, result))
+        module.exit_json(
+            changed=False,
+            msg="An import task with the specified name already exists",
+            **ensure_ec2_import_image_result(module, result),
+        )
     else:
         if module.check_mode:
             module.exit_json(changed=True, msg="Would have created the import task if not in check mode")
@@ -351,9 +355,9 @@ def present():
             client.import_image(aws_retry=True, **params)
             import_image_info = helper_describe_import_image_tasks(client, module, **filters)
         except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:
-            module.fail_json_aws(e, msg"Failed to import the image")
+            module.fail_json_aws(e, msg="Failed to import the image")
 
-    module.exit_json(changed=True, **ensure_ec2_import_image_result(module, result))
+    module.exit_json(changed=True, **ensure_ec2_import_image_result(module, import_image_info))
 
 
 def main():
diff --git a/plugins/modules/ec2_import_image_info.py b/plugins/modules/ec2_import_image_info.py
index d42c59bfd8e..e594bed41ca 100644
--- a/plugins/modules/ec2_import_image_info.py
+++ b/plugins/modules/ec2_import_image_info.py
@@ -169,6 +169,7 @@
     pass  # Handled by AnsibleAWSModule
 
 from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule
+from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry
 from ansible_collections.amazon.aws.plugins.module_utils.ec2 import helper_describe_import_image_tasks
 from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ensure_ec2_import_image_result
 
@@ -184,13 +185,13 @@ def main():
     client = module.client("ec2", retry_decorator=AWSRetry.jittered_backoff())
 
     params = {
-        "Filters": smodule.params["filters"],
+        "Filters": module.params["filters"],
         "ImportTaskIds": module.params["import_task_ids"],
     }
 
     import_image_info = helper_describe_import_image_tasks(client, module, **params)
 
-    module.exit_json(import_image=**ensure_ec2_import_image_result(result))
+    module.exit_json(import_image=ensure_ec2_import_image_result(import_image_info))
 
 
 if __name__ == "__main__":