From ab5ae79d37a2f747bff9b45452c75c77692a45e0 Mon Sep 17 00:00:00 2001
From: Brian Scholer <1260690+briantist@users.noreply.github.com>
Date: Wed, 3 Nov 2021 09:21:34 -0400
Subject: [PATCH 1/5] remove VAULT_AUTH_METHOD

---
 plugins/doc_fragments/auth.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/plugins/doc_fragments/auth.py b/plugins/doc_fragments/auth.py
index 3c4de1e17..4e4127586 100644
--- a/plugins/doc_fragments/auth.py
+++ b/plugins/doc_fragments/auth.py
@@ -107,12 +107,6 @@ class ModuleDocFragment(object):
     options:
       auth_method:
         env:
-          - name: VAULT_AUTH_METHOD
-            deprecated:
-              why: standardizing environment variables
-              version: 2.0.0
-              collection_name: community.hashi_vault
-              alternatives: ANSIBLE_HASHI_VAULT_AUTH_METHOD
           - name: ANSIBLE_HASHI_VAULT_AUTH_METHOD
             version_added: 0.2.0
         ini:

From 2649f15fd47959c95c69db8a11057b540df65114 Mon Sep 17 00:00:00 2001
From: Brian Scholer <1260690+briantist@users.noreply.github.com>
Date: Wed, 3 Nov 2021 09:22:26 -0400
Subject: [PATCH 2/5] remove deprecated env for token_file and token_path

---
 plugins/doc_fragments/auth.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/plugins/doc_fragments/auth.py b/plugins/doc_fragments/auth.py
index 4e4127586..05904aeb8 100644
--- a/plugins/doc_fragments/auth.py
+++ b/plugins/doc_fragments/auth.py
@@ -125,12 +125,6 @@ class ModuleDocFragment(object):
             version_added: 1.2.0
       token_path:
         env:
-          - name: VAULT_TOKEN_PATH
-            deprecated:
-              why: standardizing environment variables
-              version: 2.0.0
-              collection_name: community.hashi_vault
-              alternatives: ANSIBLE_HASHI_VAULT_TOKEN_PATH
           - name: ANSIBLE_HASHI_VAULT_TOKEN_PATH
             version_added: 0.2.0
         ini:
@@ -142,12 +136,6 @@ class ModuleDocFragment(object):
             version_added: 1.2.0
       token_file:
         env:
-          - name: VAULT_TOKEN_FILE
-            deprecated:
-              why: standardizing environment variables
-              version: 2.0.0
-              collection_name: community.hashi_vault
-              alternatives: ANSIBLE_HASHI_VAULT_TOKEN_FILE
           - name: ANSIBLE_HASHI_VAULT_TOKEN_FILE
             version_added: 0.2.0
         ini:

From d41415022db2239890c24c7d0240bb50597cc4d8 Mon Sep 17 00:00:00 2001
From: Brian Scholer <1260690+briantist@users.noreply.github.com>
Date: Wed, 3 Nov 2021 09:23:22 -0400
Subject: [PATCH 3/5] remove deprecated env for role_id and secret_id

---
 plugins/doc_fragments/auth.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/plugins/doc_fragments/auth.py b/plugins/doc_fragments/auth.py
index 05904aeb8..c21289ef6 100644
--- a/plugins/doc_fragments/auth.py
+++ b/plugins/doc_fragments/auth.py
@@ -171,12 +171,6 @@ class ModuleDocFragment(object):
             version_added: '1.2.0'
       role_id:
         env:
-          - name: VAULT_ROLE_ID
-            deprecated:
-              why: standardizing environment variables
-              version: 2.0.0
-              collection_name: community.hashi_vault
-              alternatives: ANSIBLE_HASHI_VAULT_ROLE_ID
           - name: ANSIBLE_HASHI_VAULT_ROLE_ID
             version_added: 0.2.0
         ini:
@@ -188,12 +182,6 @@ class ModuleDocFragment(object):
             version_added: 1.2.0
       secret_id:
         env:
-          - name: VAULT_SECRET_ID
-            deprecated:
-              why: standardizing environment variables
-              version: 2.0.0
-              collection_name: community.hashi_vault
-              alternatives: ANSIBLE_HASHI_VAULT_SECRET_ID
           - name: ANSIBLE_HASHI_VAULT_SECRET_ID
             version_added: 0.2.0
         vars:

From 9871c922f9d498e08b6396fc39b7937e15a88758 Mon Sep 17 00:00:00 2001
From: Brian Scholer <1260690+briantist@users.noreply.github.com>
Date: Thu, 4 Nov 2021 16:07:16 -0400
Subject: [PATCH 4/5] add changelog fragment for #173

---
 changelogs/fragments/173-deprecated-env-vars.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changelogs/fragments/173-deprecated-env-vars.yml

diff --git a/changelogs/fragments/173-deprecated-env-vars.yml b/changelogs/fragments/173-deprecated-env-vars.yml
new file mode 100644
index 000000000..faa9bc0fa
--- /dev/null
+++ b/changelogs/fragments/173-deprecated-env-vars.yml
@@ -0,0 +1,3 @@
+---
+removed_features:
+  - "community.hashi_vault collections - support for the following deprecated environment variables has been removed: ``VAULT_AUTH_METHOD``, ``VAULT_TOKEN_PATH``, ``VAULT_TOKEN_FILE``, ``VAULT_ROLE_ID``, ``VAULT_SECRET_ID`` (https://github.com/ansible-collections/community.hashi_vault/pull/173)."

From 41a17982b5c51e0b9c2a720b656efdbaaab309c0 Mon Sep 17 00:00:00 2001
From: Brian Scholer <1260690+briantist@users.noreply.github.com>
Date: Thu, 4 Nov 2021 17:39:44 -0400
Subject: [PATCH 5/5] Update changelogs/fragments/173-deprecated-env-vars.yml

---
 changelogs/fragments/173-deprecated-env-vars.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelogs/fragments/173-deprecated-env-vars.yml b/changelogs/fragments/173-deprecated-env-vars.yml
index faa9bc0fa..219a3c09a 100644
--- a/changelogs/fragments/173-deprecated-env-vars.yml
+++ b/changelogs/fragments/173-deprecated-env-vars.yml
@@ -1,3 +1,3 @@
 ---
 removed_features:
-  - "community.hashi_vault collections - support for the following deprecated environment variables has been removed: ``VAULT_AUTH_METHOD``, ``VAULT_TOKEN_PATH``, ``VAULT_TOKEN_FILE``, ``VAULT_ROLE_ID``, ``VAULT_SECRET_ID`` (https://github.com/ansible-collections/community.hashi_vault/pull/173)."
+  - "support for the following deprecated environment variables has been removed: ``VAULT_AUTH_METHOD``, ``VAULT_TOKEN_PATH``, ``VAULT_TOKEN_FILE``, ``VAULT_ROLE_ID``, ``VAULT_SECRET_ID`` (https://github.com/ansible-collections/community.hashi_vault/pull/173)."