From 29b2405b8499ff18ad6079df58002148e976d751 Mon Sep 17 00:00:00 2001
From: Brian Coca <bcoca@users.noreply.github.com>
Date: Wed, 3 Jan 2024 12:35:03 -0500
Subject: [PATCH] Revert "Fix older external connection plugins without
 _sub_plugin declaration (#79372)" (#82473)

This reverts commit ef1e01aa8b919ef8a9478c5c488bcd3a708ff517.

broken tests
---
 .../79372-fix-older-connection-plugins.yml    |  2 -
 lib/ansible/executor/task_executor.py         |  2 +-
 test/units/executor/test_task_executor.py     | 85 +------------------
 3 files changed, 2 insertions(+), 87 deletions(-)
 delete mode 100644 changelogs/fragments/79372-fix-older-connection-plugins.yml

diff --git a/changelogs/fragments/79372-fix-older-connection-plugins.yml b/changelogs/fragments/79372-fix-older-connection-plugins.yml
deleted file mode 100644
index b455843f1df..00000000000
--- a/changelogs/fragments/79372-fix-older-connection-plugins.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - Fix check for missing _sub_plugin attribute in older connection plugins (https://github.com/ansible/ansible/pull/79372)
diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py
index 1211f4e53b1..5b3e5326b6e 100644
--- a/lib/ansible/executor/task_executor.py
+++ b/lib/ansible/executor/task_executor.py
@@ -1085,7 +1085,7 @@ class TaskExecutor:
 
         # deals with networking sub_plugins (network_cli/httpapi/netconf)
         sub = getattr(self._connection, '_sub_plugin', None)
-        if sub and sub.get('type') != 'external':
+        if sub is not None and sub.get('type') != 'external':
             plugin_type = get_plugin_class(sub.get("obj"))
             varnames.extend(self._set_plugin_options(plugin_type, variables, templar, task_keys))
         sub_conn = getattr(self._connection, 'ssh_type_conn', None)
diff --git a/test/units/executor/test_task_executor.py b/test/units/executor/test_task_executor.py
index 806869285ed..f562bfa5253 100644
--- a/test/units/executor/test_task_executor.py
+++ b/test/units/executor/test_task_executor.py
@@ -26,12 +26,11 @@ from ansible.executor.task_executor import TaskExecutor, remove_omit
 from ansible.plugins.loader import action_loader, lookup_loader
 from ansible.parsing.yaml.objects import AnsibleUnicode
 from ansible.utils.unsafe_proxy import AnsibleUnsafeText, AnsibleUnsafeBytes
-from ansible.playbook.play_context import PlayContext
-from ansible.playbook.task import Task
 
 from collections import namedtuple
 from units.mock.loader import DictDataLoader
 
+
 get_with_context_result = namedtuple('get_with_context_result', ['object', 'plugin_load_context'])
 
 
@@ -502,85 +501,3 @@ class TestTaskExecutor(unittest.TestCase):
         }
 
         self.assertEqual(remove_omit(data, omit_token), expected)
-
-    def test_task_executor_legacy_network_plugin(self):
-        fake_loader = DictDataLoader({})
-
-        mock_host = MagicMock()
-        mock_task = MagicMock(Task)
-        mock_task.evaluate_conditional_with_result.return_value = (True, None)
-        mock_task.no_log = False
-        mock_task.check_mode = False
-        mock_task.diff = False
-        mock_task.become = False
-        mock_task.action = "foo"
-        mock_task._uuid = "1234"
-        mock_play_context = MagicMock(PlayContext)
-        mock_play_context.shell = 'sh'
-        mock_action = MagicMock()
-        mock_queue = MagicMock()
-
-        mock_vm = MagicMock()
-        mock_vm.get_delegated_vars_and_hostname.return_value = {}, None
-
-        mock_shared_loader = MagicMock()
-        mock_connection_loader = MagicMock()
-        mock_shared_loader.connection_loader = mock_connection_loader
-        # mock_shared_loader.lookup_loader = lookup_loader
-        new_stdin = None
-        job_vars = dict(omit="XXXXXXXXXXXXXXXXXXX")
-
-        te = TaskExecutor(
-            host=mock_host,
-            task=mock_task,
-            job_vars=job_vars,
-            play_context=mock_play_context,
-            new_stdin=new_stdin,
-            loader=fake_loader,
-            shared_loader_obj=mock_shared_loader,
-            final_q=mock_queue,
-            variable_manager=mock_vm,
-        )
-
-        from ansible.plugins.connection import NetworkConnectionBase
-
-        class LegacyPlugin(NetworkConnectionBase):
-
-            def __init__(self, play_context):
-                super(LegacyPlugin, self).__init__(play_context=mock_play_context)
-
-                # does not set _sub_plugin attribute to something else than '{}'
-                self._load_name = "LegacyPlugin"
-
-                self._shell = MagicMock()
-
-            def _connect(self):
-                pass
-
-            @property
-            def transport(self):
-                pass
-
-            def set_options(self, task_keys=None, var_options=None, direct=None):
-                pass
-
-            def get_option_and_origin(self, option, hostvars=None):
-                if option == 'persistent_log_messages':
-                    return ('fromini', False)
-                elif option == 'persistent_command_timeout':
-                    return ('fromini', 10)
-                elif option == 'environment':
-                    return ('fromini', [])
-                elif option == 'plugin_type':
-                    return ('fromini', 'connection')
-                return super().get_option_and_origin(option, hostvars)
-
-        mock_legacy_connection = LegacyPlugin(play_context=mock_play_context)
-        te._get_connection = MagicMock(return_value=mock_legacy_connection)
-
-        mock_action.run.return_value = dict(ansible_facts=dict())
-        try:
-            res = te._execute()
-            self.assertIsNotNone(res)
-        except NotImplementedError:    # ignore 'an AnsibleCollectionFinder has not been
-            pass                         # installed in this process