From 4ab43a6c47306d4d7c6ce64898d824272c5a6c9f Mon Sep 17 00:00:00 2001
From: kyleknap <kyknapp1@gmail.com>
Date: Mon, 29 Jan 2024 20:28:16 -0800
Subject: [PATCH] Make changes specific to v2 for dependency tests

Notable changes between v1 and v2 are:

* The difference in dependency closures
* The difference in where the new test requirement is specified
* Remove running the test on Python3.12 since the codebase does
  not support it yet
* Avoid using the MetaPathFinder provided by importlib.metadata
  when finding distributions to avoid compatibility issues with
  the MetaPathFinder v2 injects
---
 .github/workflows/run-dep-tests.yml |  2 +-
 requirements-test.txt               |  1 +
 tests/dependencies/test_closure.py  | 51 +++++++++++++++++++++++++----
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/run-dep-tests.yml b/.github/workflows/run-dep-tests.yml
index 3ef275a63fe99..a519528095194 100644
--- a/.github/workflows/run-dep-tests.yml
+++ b/.github/workflows/run-dep-tests.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
         os: [ubuntu-latest, macOS-latest, windows-latest]
 
     steps:
diff --git a/requirements-test.txt b/requirements-test.txt
index 6f5fc64d373ba..47a0aff07a3e8 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -5,3 +5,4 @@ coverage==7.0.1
 pytest-cov==4.0.0
 pytest-xdist==3.1.0
 pip-tools==7.0.0
+packaging==23.2
diff --git a/tests/dependencies/test_closure.py b/tests/dependencies/test_closure.py
index 529b7da553e66..c48edd4394f6c 100644
--- a/tests/dependencies/test_closure.py
+++ b/tests/dependencies/test_closure.py
@@ -10,9 +10,12 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
+import fnmatch
 import functools
 import importlib.metadata
 import json
+import os
+import site
 from typing import Dict, Iterator, List, Tuple
 
 import pytest
@@ -42,7 +45,7 @@ def _get_runtime_closure(self) -> "DependencyClosure":
         return closure
 
     def _get_runtime_requirements(self) -> List[Requirement]:
-        req_strings = importlib.metadata.distribution(self.name).requires
+        req_strings = self._get_distribution(self.name).requires
         if req_strings is None:
             return []
         return [Requirement(req_string) for req_string in req_strings]
@@ -60,6 +63,34 @@ def _requirement_applies_to_environment(
             return False
         return True
 
+    def _get_distribution(self, name: str) -> importlib.metadata.Distribution:
+        # For v2, we inject our own MetaPathFinder to handle
+        # botocore/s3transfer import aliases. However for the typical
+        # importlib.metadata.distribution(), it extends the built-in
+        # MetaPathFinder to include its own find_distributions() method
+        # to search for distribution directories. Read more here:
+        # https://docs.python.org/3/library/importlib.metadata.html#extending-the-search-algorithm
+        #
+        # Our MetaPathFinder class does not implement this method, which
+        # causes importlib.metadata.distribution() to not find the "awscli"
+        # package. So instead, this helper method is implemented to locate the
+        # dist-info directories based off our current site-packages
+        # and explicitly provide the directory to avoid needing to use
+        # MetaPathFinders and thus avoid this issue.
+
+        # Packages names may have a "-". These get converted to "_" for
+        # their respective directory names in the site packages directory.
+        snake_case_name = name.replace("-", "_")
+        for sitepackages in site.getsitepackages():
+            for filename in os.listdir(sitepackages):
+                if fnmatch.fnmatch(filename, f"{snake_case_name}-*.dist-info"):
+                    return importlib.metadata.Distribution.at(
+                        os.path.join(sitepackages, filename)
+                    )
+        raise ValueError(
+            f'Could not find .dist-info directory for {self.name}'
+        )
+
 
 class DependencyClosure:
     def __init__(self) -> None:
@@ -106,17 +137,21 @@ def _pformat_closure(self, closure: DependencyClosure) -> str:
 
     def test_expected_runtime_dependencies(self, awscli_package):
         expected_dependencies = {
-            "botocore",
+            "awscrt",
+            "cffi",
             "colorama",
+            "cryptography",
+            "distro",
             "docutils",
             "jmespath",
-            "pyasn1",
+            "prompt-toolkit",
+            "pycparser",
             "python-dateutil",
-            "PyYAML",
-            "rsa",
-            "s3transfer",
+            "ruamel.yaml",
+            "ruamel.yaml.clib",
             "six",
             "urllib3",
+            "wcwidth",
         }
         actual_dependencies = set()
         for _, package in awscli_package.runtime_dependencies.walk():
@@ -128,8 +163,10 @@ def test_expected_runtime_dependencies(self, awscli_package):
 
     def test_expected_unbounded_runtime_dependencies(self, awscli_package):
         expected_unbounded_dependencies = {
-            "pyasn1",  # Transitive dependency from rsa
+            "cffi",  # Transitive dependency from cryptography
+            "pycparser",  # Transitive dependency from cffi
             "six",  # Transitive dependency from python-dateutil
+            "wcwidth",  # Transitive dependency from prompt-toolkit
         }
         all_dependencies = set()
         bounded_dependencies = set()