Remove more unnecessary references

doc/topics/sdb/index.rst

@@ -101,25 +101,6 @@ To get SDB sub-keys in a state file, use this syntax:
       user1:
         id: sdb.get sdb://users:user1:id
 
-.. warning::
-    The ``vault`` driver previously only supported splitting the path and key with
-    a question mark. This has since been deprecated in favor of using the standard
-    / to split the path and key. The use of the questions mark will still be supported
-    to ensure backwards compatibility, but please use the preferred method using /.
-    The deprecated approach required the full path to where the key is stored,
-    followed by a question mark, followed by the key to be retrieved.  If you were
-    using a profile called ``myvault``, you would use a URI that looks like:
-
-    .. code-block:: bash
-
-        salt-call sdb.get 'sdb://myvault/secret/salt?saltstack'
-
-    Instead of the above please use the preferred URI using / instead:
-
-    .. code-block:: bash
-
-        salt-call sdb.get 'sdb://myvault/secret/salt/saltstack'
-
 Setting a value uses the same URI as would be used to retrieve it, followed
 by the value as another argument.
 

tests/integration/files/conf/master

@@ -99,22 +99,6 @@ discovery: false
 #enable_ssh_minions: True
 #ignore_host_keys: True
 
-# test vault
-# set uses to 0 so the token
-# has unlimited uses available.
-vault:
-  url: http://127.0.0.1:8200
-  auth:
-    method: token
-    token: testsecret
-    uses: 0
-  policies:
-  - salt_minion
-peer_run:
-  .*:
-  - vault.generate_token
-sdbvault:
-  driver: vault
 sdbetcd:
   driver: etcd
   etcd.host: 127.0.0.1

tests/integration/files/conf/minion

@@ -89,14 +89,6 @@ autosign_grains:
 
 # disable discovery for test suite saltstack/salt-jenkins#683
 discovery: false
-sdbvault:
-  driver: vault
-vault:
-  auth:
-    method: token
-    token: testsecret
-  server:
-    url: http://127.0.0.1:8200
 sdbetcd:
   driver: etcd
   etcd.host: 127.0.0.1

tests/pytests/conftest.py

@@ -73,11 +73,6 @@ def sdb_etcd_port():
     return ports.get_unused_localhost_port()
 
 
-@pytest.fixture(scope="session")
-def vault_port():
-    return ports.get_unused_localhost_port()
-
-
 @attr.s(slots=True, frozen=True)
 class ReactorEvent:
     sls_path = attr.ib()
@@ -128,7 +123,6 @@ def salt_master_factory(
     prod_env_pillar_tree_root_dir,
     ext_pillar_file_tree_root_dir,
     sdb_etcd_port,
-    vault_port,
     reactor_event,
     master_id,
     salt_auth_account_1_factory,
@@ -177,11 +171,6 @@ def salt_master_factory(
         "etcd.host": "127.0.0.1",
         "etcd.port": sdb_etcd_port,
     }
-    config_defaults["vault"] = {
-        "url": f"http://127.0.0.1:{vault_port}",
-        "auth": {"method": "token", "token": "testsecret", "uses": 0},
-        "policies": ["testpolicy"],
-    }
 
     # Config settings to test `event_return`
     config_defaults["returner_dirs"] = []
@@ -301,7 +290,7 @@ def salt_master_factory(
 
 
 @pytest.fixture(scope="session")
-def salt_minion_factory(salt_master_factory, salt_minion_id, sdb_etcd_port, vault_port):
+def salt_minion_factory(salt_master_factory, salt_minion_id, sdb_etcd_port):
     with salt.utils.files.fopen(os.path.join(RUNTIME_VARS.CONF_DIR, "minion")) as rfh:
         config_defaults = yaml.deserialize(rfh.read())
     config_defaults["hosts.file"] = os.path.join(RUNTIME_VARS.TMP, "hosts")
@@ -312,11 +301,6 @@ def salt_minion_factory(salt_master_factory, salt_minion_id, sdb_etcd_port, vaul
         "etcd.host": "127.0.0.1",
         "etcd.port": sdb_etcd_port,
     }
-    config_defaults["vault"] = {
-        "url": f"http://127.0.0.1:{vault_port}",
-        "auth": {"method": "token", "token": "testsecret", "uses": 0},
-        "policies": ["testpolicy"],
-    }
 
     config_overrides = {
         "file_roots": salt_master_factory.config["file_roots"].copy(),

tests/pytests/integration/master/test_peer.py

@@ -30,9 +30,7 @@ def peer_salt_master_config(pillar_state_tree):
 
 
 @pytest.fixture(scope="module")
-def peer_salt_master(
-    salt_factories, pillar_state_tree, vault_port, peer_salt_master_config
-):
+def peer_salt_master(salt_factories, pillar_state_tree, peer_salt_master_config):
     factory = salt_factories.salt_master_daemon(
         random_string("peer-comm-master", uppercase=False),
         defaults=peer_salt_master_config,

tests/pytests/unit/utils/test_slack.py

@@ -14,21 +14,7 @@ log = logging.getLogger(__name__)
 
 @pytest.fixture
 def configure_loader_modules():
-    yield {
-        slack: {
-            "__opts__": {
-                "vault": {
-                    "url": "http://127.0.0.1",
-                    "auth": {
-                        "token": "test",
-                        "method": "token",
-                        "uses": 15,
-                        "ttl": 500,
-                    },
-                },
-            },
-        }
-    }
+    yield {slack: {}}
 
 
 def test_query():