Rename aws_s3 to s3_object for clarity

changelogs/fragments/869-s3_object.yml

@@ -0,0 +1,7 @@
+minor_changes:
+- aws_s3 - The ``aws_s3`` module has been renamed to ``s3_object``
+  (https://github.com/ansible-collections/amazon.aws/pull/869).
+deprecated_features:
+- s3_object - Support for creation and deletion of S3 buckets has been deprecated.  Please use the
+  ``amazon.aws.s3_bucket`` module to create and delete buckets
+  (https://github.com/ansible-collections/amazon.aws/pull/869).

meta/runtime.yml

@@ -4,7 +4,6 @@ action_groups:
   - aws_az_info
   - aws_caller_info
   - aws_s3
-  - aws_s3
   - aws_secret
   - cloudformation
   - cloudformation_info
@@ -48,6 +47,7 @@ action_groups:
   - iam
   - rds
   - s3_bucket
+  - s3_object
 plugin_routing:
   modules:
     aws_az_facts:
@@ -56,6 +56,8 @@ plugin_routing:
         warning_text: >-
           aws_az_facts was renamed in Ansible 2.9 to aws_az_info.
           Please update your tasks.
+    aws_s3:
+      redirect: amazon.aws.s3_object
     ec2:
       deprecation:
         removal_version: 4.0.0

plugins/action/aws_s3.py → plugins/action/s3_object.py

@@ -31,7 +31,7 @@ class ActionModule(ActionBase):
     TRANSFERS_FILES = True
 
     def run(self, tmp=None, task_vars=None):
-        ''' handler for aws_s3 operations '''
+        ''' handler for s3_object operations '''
         self._supports_async = True
 
         if task_vars is None:
@@ -59,7 +59,7 @@ def run(self, tmp=None, task_vars=None):
                         raise AnsibleActionFail(to_text(e))
 
             wrap_async = self._task.async_val and not self._connection.has_native_async
-            # execute the aws_s3 module with the updated args
+            # execute the s3_object module with the updated args
             result = merge_hash(result, self._execute_module(module_args=new_module_args, task_vars=task_vars, wrap_async=wrap_async))
 
             if not wrap_async: