Bump deprecations we forgot to remove in 2.0.0. (#362)

ansible-collections · May 20, 2022 · 7e710f7 · 7e710f7
1 parent 9c7415e
commit 7e710f7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/changelogs/fragments/362-deprecations.yml b/changelogs/fragments/362-deprecations.yml
@@ -0,0 +1,3 @@
+deprecated_features:
+  - "docker_stack - the return values ``out`` and ``err`` that were supposed to be removed in community.docker 2.0.0 will now be removed in version 3.0.0 (https://github.com/ansible-collections/community.docker/pull/362)."
+  - "Various modules - the default of ``tls_hostname`` that was supposed to be removed in community.docker 2.0.0 will now be removed in version 3.0.0 (https://github.com/ansible-collections/community.docker/pull/362)."
diff --git a/plugins/module_utils/common.py b/plugins/module_utils/common.py
@@ -187,10 +187,10 @@ def update_tls_hostname(result, old_behavior=False, deprecate_function=None, use
             result['tls_hostname'] = DEFAULT_TLS_HOSTNAME
             if uses_tls and deprecate_function is not None:
                 deprecate_function(
-                    'The default value "localhost" for tls_hostname is deprecated and will be removed in community.docker 2.0.0.'
+                    'The default value "localhost" for tls_hostname is deprecated and will be removed in community.docker 3.0.0.'
                     ' From then on, docker_host will be used to compute tls_hostname. If you want to keep using "localhost",'
                     ' please set that value explicitly.',
-                    version='2.0.0', collection_name='community.docker')
+                    version='3.0.0', collection_name='community.docker')
             return
 
         # get default machine name from the url

diff --git a/plugins/modules/docker_stack.py b/plugins/modules/docker_stack.py
@@ -78,7 +78,7 @@
   - pyyaml
 
 notes:
-  - Return values I(out) and I(err) have been deprecated and will be removed in community.docker 2.0.0. Use I(stdout) and I(stderr) instead.
+  - Return values I(out) and I(err) have been deprecated and will be removed in community.docker 3.0.0. Use I(stdout) and I(stderr) instead.
 '''
 
 RETURN = '''
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,7 +78,7 @@ @@
       - pyyaml
     notes:
-      - Return values I(out) and I(err) have been deprecated and will be removed in community.docker 2.0.0. Use I(stdout) and I(stderr) instead.
+      - Return values I(out) and I(err) have been deprecated and will be removed in community.docker 3.0.0. Use I(stdout) and I(stderr) instead.
     '''
     RETURN = '''
@@ Expand Down @@