S3 - remove deprecated S3_URL alias

ansible-collections · Jun 30, 2022 · 2f22547 · 2f22547
1 parent 61d2e73
commit 2f22547
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/plugins/modules/s3_bucket.py b/plugins/modules/s3_bucket.py
@@ -48,8 +48,6 @@
       - S3 URL endpoint for usage with DigitalOcean, Ceph, Eucalyptus and FakeS3 etc.
       - Assumes AWS if not specified.
       - For Walrus, use FQDN of the endpoint without scheme nor path.
-      - The S3_URL alias for this option has been deprecated and will be removed
-        in release 5.0.0.
     aliases: [ S3_URL ]
     type: str
   ceph:
@@ -1001,7 +999,7 @@ def main():
         policy=dict(type='json'),
         name=dict(required=True),
         requester_pays=dict(type='bool'),
-        s3_url=dict(aliases=['S3_URL'], deprecated_aliases=[dict(name='S3_URL', version='5.0.0', collection_name='amazon.aws')]),
+        s3_url=dict(),
         state=dict(default='present', choices=['present', 'absent']),
         tags=dict(type='dict', aliases=['resource_tags']),
         purge_tags=dict(type='bool', default=True),

diff --git a/plugins/modules/s3_object.py b/plugins/modules/s3_object.py
@@ -144,8 +144,6 @@
   s3_url:
     description:
       - S3 URL endpoint for usage with Ceph, Eucalyptus and fakes3 etc. Otherwise assumes AWS.
-      - The S3_URL alias for this option has been deprecated and will be removed
-        in release 5.0.0.
     aliases: [ S3_URL ]
     type: str
   dualstack:
@@ -957,7 +955,7 @@ def main():
         overwrite=dict(aliases=['force'], default='different'),
         prefix=dict(default=""),
         retries=dict(aliases=['retry'], type='int', default=0),
-        s3_url=dict(aliases=['S3_URL'], deprecated_aliases=[dict(name='S3_URL', version='5.0.0', collection_name='amazon.aws')]),
+        s3_url=dict(),
         dualstack=dict(default='no', type='bool'),
         rgw=dict(default='no', type='bool'),
         src=dict(type='path'),