From 059aedc49ca9350b9bc15bdfcc3c9a6ade4f2ce0 Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Thu, 26 Sep 2024 06:34:51 -0700
Subject: [PATCH] Filter read by given run_id

---
 languages/python/test.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/languages/python/test.py b/languages/python/test.py
index 06bf03c0b8..bf7e31f0ca 100644
--- a/languages/python/test.py
+++ b/languages/python/test.py
@@ -31,6 +31,18 @@ def project_with_run_id(val: [dict]) -> [dict]:
     return [dict(val, name=with_run_id(val["name"])) for val in val]
 
 
+def filter_projects_to_this_run(projects: [ProjectResponse]) -> [ProjectResponse]:
+    if projects is None:
+        return None
+    return [project for project in projects if project.name.endswith(run_id)]
+
+
+def filter_secrets_to_this_run(secrets: [SecretResponse]) -> [SecretResponse]:
+    if secrets is None:
+        return None
+    return [secret for secret in secrets if secret.key.endswith(run_id)]
+
+
 def secret_with_run_id(val: [dict]) -> [dict]:
     return [
         dict(
@@ -100,7 +112,8 @@ def setUpClass(cls):
 
         # Query for projects
         cls.projects_response = cls.client.projects().list(organization_id)
-        cls.projects = getattr(cls.projects_response.data, "data", None)
+        cls.all_projects = getattr(cls.projects_response.data, "data", None)
+        cls.projects = filter_projects_to_this_run(cls.all_projects)
         cls.mutable_projects_response = cls.mutable_client.projects().list(
             organization_id
         )
@@ -109,7 +122,7 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         os.remove(cls.state_path)
-        os.remove(cls.mutable_state_path)
+        os.remove(cls.immutable_state_path)
 
 
 class ReadTests(PythonLanguageTests, unittest.TestCase):
@@ -129,7 +142,8 @@ def setUpClass(cls):
         cls.secrets_response = cls.client.secrets().get_by_ids(
             [secret.id for secret in cls.list_response.data.data]
         )
-        cls.secrets = getattr(cls.secrets_response.data, "data", None)
+        cls.all_secrets = getattr(cls.secrets_response.data, "data", None)
+        cls.secrets = filter_secrets_to_this_run(cls.all_secrets)
         cls.list = getattr(cls.list_response.data, "data", None)
 
     def test_list_response_is_success(self):