Skip to content

Commit 1e992b4

Browse files
committed
refactor(tests, idp): don't pass host, port, db password to idp fixtures
1 parent 1edd9ba commit 1e992b4

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

test/integration/conftest.py

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ def _get_default_connection_args():
4444
}
4545

4646

47+
def _get_default_iam_connection_args():
48+
args = _get_default_connection_args()
49+
del args["host"]
50+
del args["port"]
51+
args["password"] = ""
52+
return args
53+
54+
4755
@pytest.fixture(scope="class")
4856
def db_kwargs():
4957
return _get_default_connection_args()
@@ -75,7 +83,7 @@ def okta_idp():
7583
"app_name": conf.get("okta-idp", "app_name"),
7684
"credentials_provider": conf.get("okta-idp", "credentials_provider"),
7785
}
78-
return {**_get_default_connection_args(), **db_connect}
86+
return {**_get_default_iam_connection_args(), **db_connect}
7987

8088

8189
@pytest.fixture(scope="class")
@@ -88,7 +96,7 @@ def okta_browser_idp():
8896
"credentials_provider": conf.get("okta-browser-idp", "credentials_provider"),
8997
"login_url": conf.get("okta-browser-idp", "login_url"),
9098
}
91-
return {**_get_default_connection_args(), **db_connect}
99+
return {**_get_default_iam_connection_args(), **db_connect}
92100

93101

94102
@pytest.fixture(scope="class")
@@ -103,7 +111,7 @@ def azure_browser_idp():
103111
"client_id": conf.get("azure-browser-idp", "client_id"),
104112
"client_secret": conf.get("azure-browser-idp", "client_secret"),
105113
}
106-
return {**_get_default_connection_args(), **db_connect}
114+
return {**_get_default_iam_connection_args(), **db_connect}
107115

108116

109117
@pytest.fixture(scope="class")
@@ -116,7 +124,7 @@ def jumpcloud_browser_idp():
116124
"credentials_provider": conf.get("jumpcloud-browser-idp", "credentials_provider"),
117125
"login_url": conf.get("jumpcloud-browser-idp", "login_url"),
118126
}
119-
return {**_get_default_connection_args(), **db_connect}
127+
return {**_get_default_iam_connection_args(), **db_connect}
120128

121129

122130
@pytest.fixture(scope="class")
@@ -128,7 +136,7 @@ def ping_browser_idp():
128136
"listen_port": conf.getint("ping-one-idp", "listen_port"),
129137
"idp_response_timeout": conf.getint("ping-one-idp", "idp_response_timeout"),
130138
}
131-
return {**_get_default_connection_args(), **db_connect}
139+
return {**_get_default_iam_connection_args(), **db_connect}
132140

133141

134142
@pytest.fixture(scope="class")
@@ -143,7 +151,7 @@ def azure_idp():
143151
"client_id": conf.get("azure-idp", "client_id"),
144152
"client_secret": conf.get("azure-idp", "client_secret"),
145153
}
146-
return {**_get_default_connection_args(), **db_connect}
154+
return {**_get_default_iam_connection_args(), **db_connect}
147155

148156

149157
@pytest.fixture(scope="class")
@@ -156,7 +164,7 @@ def adfs_idp():
156164
"credentials_provider": conf.get("adfs-idp", "credentials_provider"),
157165
"idp_host": conf.get("adfs-idp", "idp_host"),
158166
}
159-
return {**_get_default_connection_args(), **db_connect}
167+
return {**_get_default_iam_connection_args(), **db_connect}
160168

161169

162170
@pytest.fixture(scope="class")
@@ -169,7 +177,7 @@ def jwt_google_idp():
169177
"web_identity_token": conf.get("jwt-google-idp", "web_identity_token"),
170178
"role_arn": conf.get("jwt-google-idp", "role_arn"),
171179
}
172-
return {**_get_default_connection_args(), **db_connect}
180+
return {**_get_default_iam_connection_args(), **db_connect}
173181

174182

175183
@pytest.fixture(scope="class")
@@ -182,7 +190,7 @@ def jwt_azure_v2_idp():
182190
"web_identity_token": conf.get("jwt-azure-v2-idp", "web_identity_token"),
183191
"role_arn": conf.get("jwt-azure-v2-idp", "role_arn"),
184192
}
185-
return {**_get_default_connection_args(), **db_connect}
193+
return {**_get_default_iam_connection_args(), **db_connect}
186194

187195

188196
@pytest.fixture

0 commit comments

Comments
 (0)